This list is closed, nobody may subscribe to it.
2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <dai...@us...> - 2017-07-15 01:07:00
|
Revision: 7809 http://sourceforge.net/p/web-erp/reponame/7809 Author: daintree Date: 2017-07-15 01:06:57 +0000 (Sat, 15 Jul 2017) Log Message: ----------- Added script to remove all purchase order back orders Modified Paths: -------------- trunk/CounterSales.php trunk/ReorderLevel.php trunk/doc/Change.log trunk/includes/MainMenuLinksArray.php trunk/sql/mysql/upgrade4.14.1-4.14.2.sql Added Paths: ----------- trunk/Z_RemovePurchaseBackOrders.php Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2017-07-10 01:33:03 UTC (rev 7808) +++ trunk/CounterSales.php 2017-07-15 01:06:57 UTC (rev 7809) @@ -2053,10 +2053,14 @@ echo '<br /><div class="centre">'; if ($_SESSION['InvoicePortraitFormat']==0){ - echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; + echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True" />'; + + //echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />'; } else { - echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; + //echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">' . _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />'; + echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True" />'; } + echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Sale') . '</a></div>'; } Modified: trunk/ReorderLevel.php =================================================================== --- trunk/ReorderLevel.php 2017-07-10 01:33:03 UTC (rev 7808) +++ trunk/ReorderLevel.php 2017-07-15 01:06:57 UTC (rev 7809) @@ -109,17 +109,6 @@ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width, $Right_Margin,$CategoryDescription); } - $OnOrderSQL = "SELECT SUM(quantityord-quantityrecd) AS quantityonorder - FROM purchorders - LEFT JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - WHERE purchorders.status != 'Cancelled' - AND purchorders.status != 'Rejected' - AND purchorders.status != 'Pending' - AND purchorderdetails.itemcode='".$myrow['stockid']."' - AND purchorders.intostocklocation='".$myrow['loccode']."'"; - $OnOrderResult = DB_query($OnOrderSQL); - $OnOrderRow = DB_fetch_array($OnOrderResult); // Print if stock for part in other locations $sql2 = "SELECT locstock.quantity, Added: trunk/Z_RemovePurchaseBackOrders.php =================================================================== --- trunk/Z_RemovePurchaseBackOrders.php (rev 0) +++ trunk/Z_RemovePurchaseBackOrders.php 2017-07-15 01:06:57 UTC (rev 7809) @@ -0,0 +1,25 @@ +<?php + +/* $Id: Z_RemovePurchaseBackOrders.php 7751 2017-04-13 16:34:26Z rchacon $*/ + +include('includes/session.php'); +$Title=_('Remove Purchase Order Back Orders'); +include('includes/header.php'); + +echo "<form method='post' action='" . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . "'>"; +echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + +echo '<br /> + <div class="centre">' . _('This will alter all purchase orders where the quantity required is more than the quantity delivered - where some has been delivered already. The quantity ordered will be reduced to the same as the quantity already delivered - removing all back orders') . '<br /><input type="submit" name="RemovePOBackOrders" value="' . _('Remove Purchase Back Orders') .'" /> + </div></form>'; + +if (isset($_POST['RemovePOBackOrders'])){ + DB_query('UPDATE purchorderdetails + SET quantityord=quantityrecd + WHERE quantityrecd>0 AND quantityord > quantityrecd + AND deliverydate < CURRENT_DATE();'); + prnMsg(_('Updated all purchase orders to remove back orders'),'success'); +} + +include('includes/footer.php'); +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-07-10 01:33:03 UTC (rev 7808) +++ trunk/doc/Change.log 2017-07-15 01:06:57 UTC (rev 7809) @@ -1,6 +1,7 @@ webERP Change Log -10/07/17 Exson: Fixed the wrong price bug and GP not updated correctly in SelectOrderItems.php. Report by Robert from MHHK forum. +15/7/17 Phil: Utility script to remove all purchase back orders +10/07/17 Exson: Fixed the wrong price bug and GP not updated correctly in SelectOrderItems.php. Report by Robert from MHHK forum. 08/07/17 PaulT: reportwriter/admin/forms area, fix tag name in four files: <image> to <img> 04/07/17 PaulT: DefineImportBankTransClass.php - Remove extra ( 30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. @@ -15,7 +16,7 @@ 2017-06-20 4.14 release -19/06/17 Exson: Add menu.css to make the main menu workable in header.php. +19/06/17 Exson: Add menu.css to make the main menu workable in header.php. 19/06/17 Exson: Fixed the variable not existed error (Reported by Tim). Add a feature to add favorite script under main menu which idea originated from Tim's Kwamoja project. 19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. 19/06/17 Exson: Make these classes defined php 7 compliant and keep php4 backwards compatibility. Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2017-07-10 01:33:03 UTC (rev 7808) +++ trunk/includes/MainMenuLinksArray.php 2017-07-15 01:06:57 UTC (rev 7809) @@ -622,7 +622,8 @@ _('Create new company template SQL file and submit to webERP'), _('Re-calculate brought forward amounts in GL'), _('Re-Post all GL transactions from a specified period'), - _('Purge all old prices')); + _('Purge all old prices'), + _('Remove all purchase back orders')); $MenuItems['Utilities']['Maintenance']['URL'] = array( '/Z_poAdmin.php', '/Z_MakeNewCompany.php', @@ -635,5 +636,6 @@ '/Z_CreateCompanyTemplateFile.php', '/Z_UpdateChartDetailsBFwd.php', '/Z_RePostGLFromPeriod.php', - '/Z_DeleteOldPrices.php'); + '/Z_DeleteOldPrices.php', + '/Z_RemovePurchaseBackOrders.php'); ?> Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql =================================================================== --- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-07-10 01:33:03 UTC (rev 7808) +++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-07-15 01:06:57 UTC (rev 7809) @@ -1,5 +1,5 @@ ALTER table supptrans ADD chequeno varchar(16) NOT NULL DEFAULT ''; ALTER table supptrans ADD void tinyint(1) NOT NULL DEFAULT 0; ALTER table banktrans ADD chequeno varchar(16) NOT NULL DEFAULT ''; +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders'); - |
From: <ex...@us...> - 2017-07-10 01:33:05
|
Revision: 7808 http://sourceforge.net/p/web-erp/reponame/7808 Author: exsonqu Date: 2017-07-10 01:33:03 +0000 (Mon, 10 Jul 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-07-10 01:31:55 UTC (rev 7807) +++ trunk/doc/Change.log 2017-07-10 01:33:03 UTC (rev 7808) @@ -1,5 +1,6 @@ webERP Change Log +10/07/17 Exson: Fixed the wrong price bug and GP not updated correctly in SelectOrderItems.php. Report by Robert from MHHK forum. 08/07/17 PaulT: reportwriter/admin/forms area, fix tag name in four files: <image> to <img> 04/07/17 PaulT: DefineImportBankTransClass.php - Remove extra ( 30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. |
From: <ex...@us...> - 2017-07-10 01:31:57
|
Revision: 7807 http://sourceforge.net/p/web-erp/reponame/7807 Author: exsonqu Date: 2017-07-10 01:31:55 +0000 (Mon, 10 Jul 2017) Log Message: ----------- 10/07/17 Exson: Fixed the wrong price bug and GP not updated correctly in SelectOrderItems.php. Report by Robert from MHHK forum. Modified Paths: -------------- trunk/SelectOrderItems.php Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2017-07-08 05:22:08 UTC (rev 7806) +++ trunk/SelectOrderItems.php 2017-07-10 01:31:55 UTC (rev 7807) @@ -1052,15 +1052,19 @@ if (ABS($OrderLine->Price - filter_number_format($_POST['Price_' . $OrderLine->LineNumber]))>0.01){ /*There is a new price being input for the line item */ - $Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]); - if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error - $_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100); + if (isset($_POST['Discount_' . $OrderLine->LineNumber]) AND is_numeric(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))) { + if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error + $_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100); + } else { + $_POST['GPPercent_' . $OrderLine->LineNumber] = 0; + } } else { - $_POST['GPPercent_' . $OrderLine->LineNumber] = 0; + $_POST['GPPercent_' . $OrderLine->LineNumber] = ($Price - $OrderLine->StandardCost*$ExRate)*100/$Price; } - } elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) { + + } elseif (isset($_POST['GPPercent_'.$OrderLine->LineNumber]) AND ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) { /* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */ @@ -1070,8 +1074,17 @@ $Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100)); } else { $Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]); + if (isset($_POST['Discount_' . $OrderLine->LineNumber]) AND is_numeric(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))) { + if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error + $_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100); + } else { + $_POST['GPPercent_' . $OrderLine->LineNumber] = 0; + } + } else { + $_POST['GPPercent_' . $OrderLine->LineNumber] = ($Price - $OrderLine->StandardCost*$ExRate)*100/$Price; + } } - $DiscountPercentage = filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]); + $DiscountPercentage = isset($_POST['Discount_' . $OrderLine->LineNumber])?filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]):0; if ($_SESSION['AllowOrderLineItemNarrative'] == 1) { $Narrative = $_POST['Narrative_' . $OrderLine->LineNumber]; } else { |
From: <tu...@us...> - 2017-07-08 05:22:11
|
Revision: 7806 http://sourceforge.net/p/web-erp/reponame/7806 Author: turbopt Date: 2017-07-08 05:22:08 +0000 (Sat, 08 Jul 2017) Log Message: ----------- reportwriter/admin/forms area, fix tag name in four files: <image> to <img> Modified Paths: -------------- trunk/doc/Change.log trunk/reportwriter/admin/forms/ReportsFieldSetup.html trunk/reportwriter/admin/forms/TplFrmData.html trunk/reportwriter/admin/forms/TplFrmTBlk.html trunk/reportwriter/admin/forms/TplFrmTbl.html Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-07-04 15:55:17 UTC (rev 7805) +++ trunk/doc/Change.log 2017-07-08 05:22:08 UTC (rev 7806) @@ -1,5 +1,6 @@ webERP Change Log +08/07/17 PaulT: reportwriter/admin/forms area, fix tag name in four files: <image> to <img> 04/07/17 PaulT: DefineImportBankTransClass.php - Remove extra ( 30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. Modified: trunk/reportwriter/admin/forms/ReportsFieldSetup.html =================================================================== --- trunk/reportwriter/admin/forms/ReportsFieldSetup.html 2017-07-04 15:55:17 UTC (rev 7805) +++ trunk/reportwriter/admin/forms/ReportsFieldSetup.html 2017-07-08 05:22:08 UTC (rev 7806) @@ -111,7 +111,7 @@ <?php if ($Type<>'frm') { ?> <td> <input type="text" name="FieldName" id="FieldName" value="<?php echo $FieldListings['defaults']['fieldname']; ?>" size="30"> - <image name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" + <img name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" onMouseOver="handleOver(); return true;" onMouseOut="handleOut(); return true;" onclick="JavaScript:menuActivate('FieldName', 'combodiv', 'combosel')"> <div id="combodiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000" onmouseover="javascript:oOverMenu='combodiv';" Modified: trunk/reportwriter/admin/forms/TplFrmData.html =================================================================== --- trunk/reportwriter/admin/forms/TplFrmData.html 2017-07-04 15:55:17 UTC (rev 7805) +++ trunk/reportwriter/admin/forms/TplFrmData.html 2017-07-08 05:22:08 UTC (rev 7806) @@ -93,7 +93,7 @@ <tr> <td id="field_list" align="center" colspan="2"> <input type="text" name="DataField" id="DataField" value="<?php echo $Params['DataField']; ?>" size="30"> - <image name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" + <img name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" onMouseOver="handleOver(); return true;" onMouseOut="handleOut(); return true;" onclick="JavaScript:menuActivate('DataField', 'combodiv', 'combosel')"> <div id="combodiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000" onmouseover="javascript:oOverMenu='combodiv';" Modified: trunk/reportwriter/admin/forms/TplFrmTBlk.html =================================================================== --- trunk/reportwriter/admin/forms/TplFrmTBlk.html 2017-07-04 15:55:17 UTC (rev 7805) +++ trunk/reportwriter/admin/forms/TplFrmTBlk.html 2017-07-08 05:22:08 UTC (rev 7806) @@ -105,7 +105,7 @@ <?php } // end if ?></div></td> <td> <input type="text" name="TblField" id="TblField" value="<?php echo $Params['TblField']; ?>" size="30"> - <image name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" + <img name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" onMouseOver="handleOver(); return true;" onMouseOut="handleOut(); return true;" onclick="JavaScript:menuActivate('TblField', 'combodiv', 'combosel')"> <div id="combodiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000" onmouseover="javascript:oOverMenu='combodiv';" Modified: trunk/reportwriter/admin/forms/TplFrmTbl.html =================================================================== --- trunk/reportwriter/admin/forms/TplFrmTbl.html 2017-07-04 15:55:17 UTC (rev 7805) +++ trunk/reportwriter/admin/forms/TplFrmTbl.html 2017-07-08 05:22:08 UTC (rev 7806) @@ -176,7 +176,7 @@ <?php } // end if ?></div></td> <td colspan="2"> <input type="text" name="TblField" id="TblField" value="<?php echo $Params['TblField']; ?>" size="30"> - <image name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" + <img name="imgName" src="../images/pull_down_inactive.gif" height="20" width="19" onMouseOver="handleOver(); return true;" onMouseOut="handleOut(); return true;" onclick="JavaScript:menuActivate('TblField', 'combodiv', 'combosel')"> <div id="combodiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000" onmouseover="javascript:oOverMenu='combodiv';" |
From: <tu...@us...> - 2017-07-04 15:55:20
|
Revision: 7805 http://sourceforge.net/p/web-erp/reponame/7805 Author: turbopt Date: 2017-07-04 15:55:17 +0000 (Tue, 04 Jul 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log trunk/includes/DefineImportBankTransClass.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-07-04 07:05:09 UTC (rev 7804) +++ trunk/doc/Change.log 2017-07-04 15:55:17 UTC (rev 7805) @@ -1,5 +1,6 @@ webERP Change Log +04/07/17 PaulT: DefineImportBankTransClass.php - Remove extra ( 30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. 2017-06-26 4.14.1 release Modified: trunk/includes/DefineImportBankTransClass.php =================================================================== --- trunk/includes/DefineImportBankTransClass.php 2017-07-04 07:05:09 UTC (rev 7804) +++ trunk/includes/DefineImportBankTransClass.php 2017-07-04 15:55:17 UTC (rev 7805) @@ -60,7 +60,7 @@ $this->BankTransID = 0; } function BankTrans($ValueDate, $Amount) { - self::__construct(($ValueDate, $Amount); + self::__construct($ValueDate, $Amount); } function Add_To_GLAnalysis($Amount, $Narrative, $GLCode, $GLAccountName, $Tag){ |
From: <ex...@us...> - 2017-07-04 07:05:12
|
Revision: 7804 http://sourceforge.net/p/web-erp/reponame/7804 Author: exsonqu Date: 2017-07-04 07:05:09 +0000 (Tue, 04 Jul 2017) Log Message: ----------- 14/07/17 Exson: Fixed RecurringSalesOrdersProcess.php main menu failure bug. Port Tim's suppliers allocation at payment stage and fixed the cheque no has not stored bug in Payments.php Modified Paths: -------------- trunk/Payments.php trunk/RecurringSalesOrdersProcess.php trunk/javascripts/MiscFunctions.js Added Paths: ----------- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql Modified: trunk/Payments.php =================================================================== --- trunk/Payments.php 2017-06-29 23:47:49 UTC (rev 7803) +++ trunk/Payments.php 2017-07-04 07:05:09 UTC (rev 7804) @@ -3,7 +3,6 @@ /* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */ include('includes/DefinePaymentClass.php'); - include('includes/session.php'); $Title = _('Payment Entry'); if(isset($_GET['SupplierID'])) { @@ -163,6 +162,27 @@ } if(isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!='') { $_SESSION['PaymentDetail'.$identifier]->Paymenttype = $_POST['Paymenttype']; + //lets validate the paymenttype here + $sql = "SELECT usepreprintedstationery + FROM paymentmethods + WHERE paymentname='" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "'"; + $result = DB_query($sql); + $myrow = DB_fetch_row($result); + if ($myrow[0] == 1) { + if (empty($_POST['ChequeNum'])) { + prnMsg(_('The cheque number should not be empty'),'warn'); + $Errors[] = 'ChequeNum'; + } else { + $cheqsql = "SELECT count(chequeno) FROM supptrans WHERE chequeno='" . $_POST['ChequeNum'] . "'"; + $ErrMsg = _('Failed to retrieve cheque number data'); + $cheqresult = DB_query($cheqsql,$ErrMsg); + $cheqrow = DB_fetch_row($cheqresult); + if ($cheqrow[0]>0) { + prnMsg(_('The cheque has already been used'),'warn'); + $Errors[] = 'ChequeNum'; + } + } + } } if(isset($_POST['Currency']) AND $_POST['Currency']!='') { @@ -258,7 +278,7 @@ } -if(isset($_POST['CommitBatch'])) { +if(isset($_POST['CommitBatch']) AND empty($Errors)) { /* once the GL analysis of the payment is entered (if the Creditors_GLLink is active), process all the data in the session cookie into the DB creating a banktrans record for @@ -319,7 +339,42 @@ AND (!isset($_POST['PaymentCancelled'])) AND ($myrow[0] == 1)) { // it is a supplier payment by cheque and haven't printed yet so print cheque + //check the cheque number + if (empty($_POST['ChequeNum'])) { + prnMsg(_('There are no Check Number input'),'error'); + include('includes/footer.inc'); + exit; + } elseif (!is_numeric($_POST['ChequeNum'])){//check if this cheque no has been used + prnMsg(_('The cheque no should be numeric'),'error'); + include('includes/footer.inc'); + exit; + } else { + $cheqsql = "SELECT count(chequeno) FROM supptrans WHERE chequeno='" . $_POST['ChequeNum'] . "'"; + $ErrMsg = _('Failed to retrieve cheque number data'); + $cheqresult = DB_query($cheqsql,$ErrMsg); + $cheqrow = DB_fetch_row($cheqresult); + if ($cheqrow[0]>0) { + prnMsg(_('The cheque has already been used'),'error'); + include('includes/footer.inc'); + exit; + } + } + //store the paid array here; + $PaidArray = array(); + foreach ($_POST as $name=>$Value) { + if (substr($name, 0, 4) == 'paid' AND $Value>0) { + $PaidArray[substr($name, 4)] = $Value; + } + } + if (!empty($PaidArray)) { + $PaidJ = base64_encode(serialize($PaidArray)); + $PaidInput = '<input type="hidden" name="PaidArray" value="' . $PaidJ . '" />'; + } else { + $PaidInput = ''; + } + + echo '<br /> <a href="' . $RootPath . '/PrintCheque.php?ChequeNum=' . $_POST['ChequeNum'] . '&identifier=' . $identifier . '">' . _('Print Cheque using pre-printed stationery') . '</a> <br /> @@ -330,7 +385,10 @@ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo _('Has the cheque been printed') . '? <br /> - <br /> + <br />' + . $PaidInput . ' + <input type="hidden" name="BankTransRef" value="' . $_POST['BankTransRef'] . '" /> + <input type="hidden" name="ChequeNum" value="' . $_POST['ChequeNum'] . '" /> <input type="hidden" name="CommitBatch" value="' . $_POST['CommitBatch'] . '" /> <input type="hidden" name="BankAccount" value="' . $_POST['BankAccount'] . '" /> <input type="submit" name="ChequePrinted" value="' . _('Yes / Continue') . '" /> @@ -416,6 +474,12 @@ /*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */ $TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate; } + if ($_SESSION['PaymentDetail' . $identifier]->Currency == $TrfToBankCurrCode) { + $ExRate = 1; + $TrfToBankExRate = $_SESSION['PaymentDetail' . $identifier]->ExRate; + } else { + $ExRate = ($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate)/$TrfFromBankExRate; + } /*Consider an example functional currency NZD @@ -460,8 +524,8 @@ $ReceiptTransNo . "', 2,'" . $PaymentItem->GLCode . "','" . - '@' . $TransNo . ' ' . _('Act Transfer From ') . $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" . - (($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfToBankExRate). "','" . + '@' . $TransNo . ' ' . _('Act Transfer From') .' '. $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" . + $ExRate . "','" . $TrfToBankExRate . "','" . FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "','" . @@ -473,7 +537,20 @@ $result = DB_query($SQL,$ErrMsg,$DbgMsg,true); } } - } else { + } else { + + /* Get an array of suuptans id fields that were paid */ + if (!isset($_POST['PaidArray'])) { + $PaidArray = array(); + foreach ($_POST as $name=>$Value) { + if (substr($name, 0, 4) == 'paid' AND $Value>0) { + $PaidArray[substr($name, 4)] = $Value; + } + } + } else { + $PaidArray = unserialize(base64_decode($_POST['PaidArray'])); + } + /*Its a supplier payment type 22 */ $CreditorTotal = (($_SESSION['PaymentDetail'.$identifier]->Discount + $_SESSION['PaymentDetail'.$identifier]->Amount)/$_SESSION['PaymentDetail'.$identifier]->ExRate)/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate; @@ -490,7 +567,8 @@ suppreference, rate, ovamount, - transtext + transtext, + chequeno ) VALUES ('" . $TransNo . "', 22,'" . @@ -501,11 +579,48 @@ ($_SESSION['PaymentDetail'.$identifier]->FunctionalExRate * $_SESSION['PaymentDetail'.$identifier]->ExRate) . "','" . (-$_SESSION['PaymentDetail'.$identifier]->Amount-$_SESSION['PaymentDetail'.$identifier]->Discount) . "','" . $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext . - "')"; + "', + '" . $_POST['ChequeNum'] . "')"; $ErrMsg = _('Cannot insert a payment transaction against the supplier because'); $DbgMsg = _('Cannot insert a payment transaction against the supplier using the SQL'); $result = DB_query($SQL, $ErrMsg, $DbgMsg, true); + $SQL = "SELECT id FROM supptrans WHERE transno='" . $TransNo . "' AND type=22"; + $Result = DB_query($SQL,'','',true); + $MyRow = DB_fetch_array($Result); + $PaymentID = $MyRow['id']; + if (sizeof($PaidArray) > 0) { + foreach ($PaidArray as $PaidID=>$PaidAmount) { + /* Firstly subtract from the payment the amount of the invoice */ + $SQL = "UPDATE supptrans SET alloc=alloc-" . $PaidAmount . " WHERE id='" . $PaymentID . "'"; + $ErrMsg = _('Cannot update an allocation against the supplier because'); + $DbgMsg = _('Cannot update an allocation against the supplier using the SQL'); + $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true); + /* Then add theamount of the invoice to the invoice allocation */ + $SQL = "UPDATE supptrans SET alloc=alloc+" . $PaidAmount . " WHERE id='" . $PaidID . "'"; + $ErrMsg = _('Cannot update an allocation against the supplier because'); + $DbgMsg = _('Cannot update an allocation against the supplier using the SQL'); + $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true); + /* Finally update the supplier allocations table */ + $SQL = "INSERT INTO suppallocs (amt, + datealloc, + transid_allocfrom, + transid_allocto + ) VALUES ( + '" . $PaidAmount . "', + '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "', + '" . $PaymentID . "', + '" . $PaidID . "' + )"; + $ErrMsg = _('Cannot update an allocation against the supplier because'); + $DbgMsg = _('Cannot update an allocation against the supplier using the SQL'); + $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true); + } + } + + + + /*Update the supplier master with the date and amount of the last payment made */ $SQL = "UPDATE suppliers SET lastpaiddate = '" . FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "', @@ -607,7 +722,8 @@ transdate, banktranstype, amount, - currcode + currcode, + chequeno ) VALUES ('" . $TransNo . "','" . $TransType . "','" . @@ -618,7 +734,8 @@ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "','" . -$_SESSION['PaymentDetail'.$identifier]->Amount . "','" . - $_SESSION['PaymentDetail'.$identifier]->Currency . + $_SESSION['PaymentDetail'.$identifier]->Currency . "','" . + $_POST['ChequeNum'] . "')"; $ErrMsg = _('Cannot insert a bank transaction because'); $DbgMsg = _('Cannot insert a bank transaction using the SQL'); @@ -640,6 +757,7 @@ unset($_POST['supptrans_transtext']); unset($_POST['Amount']); unset($_POST['Discount']); + unset($_POST['FunctionalExRate']); unset($_SESSION['PaymentDetail'.$identifier]->GLItems); unset($_SESSION['PaymentDetail'.$identifier]->SupplierID); unset($_SESSION['PaymentDetail'.$identifier]); @@ -677,10 +795,11 @@ $_POST['Narrative'] = $_SESSION['PaymentDetail'.$identifier]->Narrative; } elseif(isset($_POST['Process']) AND !$BankAccountEmpty) { //user hit submit a new GL Analysis line into the payment + if (!empty($_POST['Cheque'])) { + $ChequeNoSQL="SELECT transno FROM supptrans WHERE chequeno='" . $_POST['Cheque'] ."'"; + $ChequeNoResult=DB_query($ChequeNoSQL); + } - $ChequeNoSQL="SELECT account FROM gltrans WHERE chequeno='" . $_POST['Cheque'] ."'"; - $ChequeNoResult=DB_query($ChequeNoSQL); - if(is_numeric($_POST['GLManualCode'])) { $SQL = "SELECT accountname @@ -692,7 +811,7 @@ if(DB_num_rows($Result)==0) { prnMsg( _('The manual GL code entered does not exist in the database') . ' - ' . _('so this GL analysis item could not be added'),'warn'); unset($_POST['GLManualCode']); - } elseif(DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!='') { + } elseif(isset($ChequeNoResult) AND DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!='') { prnMsg( _('The Cheque/Voucher number has already been used') . ' - ' . _('This GL analysis item could not be added'),'error'); } else { $myrow = DB_fetch_array($Result); @@ -794,7 +913,7 @@ <br /> <table class="selection"> <tr> - <th colspan="2"><h3>' . _('Payment'); + <th colspan="4"><h3>' . _('Payment'); if($_SESSION['PaymentDetail'.$identifier]->SupplierID!='') { echo ' ' . _('to') . ' ' . $_SESSION['PaymentDetail'.$identifier]->SuppName; @@ -900,11 +1019,11 @@ } if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['PaymentDetail'.$identifier]->Currency AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) { if (isset($SuggestedExRate) AND ($_POST['ExRate'] == 1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail' . $identifier]->Account)) { - $_POST['ExRate'] = locale_number_format($SuggestedExRate,8); + $_POST['ExRate'] = locale_number_format($SuggestedExRate,12); } if(isset($SuggestedExRate)) { - $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>'; + $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,12) . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>'; } else { $SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->Currency; } @@ -951,9 +1070,15 @@ if(!isset($_POST['ChequeNum'])) { $_POST['ChequeNum']=''; } +if (!empty($Errors)) { + $ErrClass = 'class="error"'; +} else { + $ErrClass = ''; +} + echo '<tr> <td>' . _('Cheque Number') . ':</td> - <td><input maxlength="8" name="ChequeNum" size="10" type="text" value="' . $_POST['ChequeNum'] . '" /> ' . _('(if using pre-printed stationery)') . '</td> + <td><input maxlength="8" name="ChequeNum" size="10" type="text" value="' . $_POST['ChequeNum'] . '" ' . $ErrClass . ' /> ' . _('(if using pre-printed stationery)') . '</td> </tr>'; // Info to be inserted on `banktrans`.`ref` varchar(50): @@ -969,9 +1094,12 @@ if(!isset($_POST['Narrative'])) { $_POST['Narrative'] = ''; } +if (!isset($_POST['Currency'])) { + $_POST['Currency'] = ''; +} echo '<tr> <td>', _('Narrative'), ':</td> - <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> ', _('Narrative in general ledger transactions'), '</td> + <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> ', _('Narrative on General Ledger Account Inquiry'), '</td> </tr>'; echo '<tr> @@ -1176,7 +1304,53 @@ <tr> <th colspan="2"><h3>', _('Supplier Transactions Payment Entry'), '</h3></th> </tr>'; + echo '</table>'; + $SQL = "SELECT systypes.typename, + supptrans.id, + supptrans.transno, + supptrans.suppreference, + supptrans.trandate, + supptrans.ovamount+supptrans.ovgst+supptrans.diffonexch-supptrans.alloc AS amount + FROM supptrans + INNER JOIN systypes + ON systypes.typeid=supptrans.type + WHERE settled=0 AND (systypes.typeid=20 OR systypes.typeid=21 OR (systypes.typeid=22 AND (supptrans.ovamount+supptrans.ovgst+supptrans.diffonexch-supptrans.alloc)>0)) + AND supplierno='" . $_SESSION['PaymentDetail'.$identifier]->SupplierID . "' + AND (supptrans.ovamount+supptrans.ovgst+supptrans.diffonexch-supptrans.alloc)<>0"; + $Result = DB_query($SQL); + echo '<table class="selection"> + <tr> + <th class="Ascending">' . _('Date') . '</th> + <th class="Ascending">' . _('Transaction Type') . '</th> + <th class="Ascending">' . _('Transaction Number') . '</th> + <th class="Ascending">' . _('Reference') . '</th> + <th class="Ascending">' . _('Amount') . '</th> + <th class="Ascending">' . _('This time to pay') . '</th> + </tr>'; + $ids = ''; + while ($myrow = DB_fetch_array($Result)) { + $ids .= $i>0?';' . $myrow['id']:$myrow['id']; + if (!isset($_POST['paid'.$myrow['id']])) { + $_POST['paid'.$myrow['id']] = 0; + } + echo '<tr> + <td>' . ConvertSQLDate($myrow['trandate']) . '</td> + <td>' . $myrow['typename'] . '</td> + <td>' . $myrow['transno'] . '</td> + <td>' . $myrow['suppreference'] . '</td> + <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td> + <td><input onclick="AddAmount(this,'.$myrow['id'].');" type="checkbox" name="check'.$myrow['id'] . '" value="' . $myrow['amount'] . '" />' . _('Pay') . '</td> + <td><input type="text" class="number" id="'.$myrow['id'].'" name="paid'.$myrow['id'].'" value="'.$_POST['paid'.$myrow['id']].'" /> + <input type="hidden" name="remainamt'.$myrow['id'] .'" value="'.$myrow['amount'].'" /> + </td> + </tr>'; + $i++; + }//end of while loop; + echo '</table>'; + echo '<p>' . _('Total Input Amount').':<input type="text" id="ttl" value="0" readonly>' .' <input type="button" data-ids="' . $ids . '" value="' . _('Update') . '" onclick="update1(\''.$ids.'\')" id="update" /></p>'; + echo '<table class="selection">'; + // If the script was called with a SupplierID, it allows to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext: // Info to be inserted on `gltrans`.`narrative` varchar(200): if(!isset($_POST['gltrans_narrative'])) { @@ -1206,7 +1380,7 @@ echo '<tr> <td>', _('Amount of Payment'), ' ', $_SESSION['PaymentDetail'.$identifier]->Currency, ':</td> - <td><input class="number" maxlength="12" name="Amount" size="13" type="text" value="', $_SESSION['PaymentDetail'.$identifier]->Amount, '" /></td> + <td><input class="number" maxlength="12" id="Amount" name="Amount" size="13" type="text" value="', $_SESSION['PaymentDetail'.$identifier]->Amount, '" /></td> </tr>'; /* if(isset($_SESSION['PaymentDetail'.$identifier]->SupplierID)) {//included in a if with same condition.*/ /*So it is a supplier payment so show the discount entry item */ @@ -1219,7 +1393,7 @@ echo '<input type="hidden" name="Discount" value="0" />'; }*/ echo '</table><br />'; - echo '<div class="centre"><input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" /></div>'; + echo '<div class="centre"><input type="submit" name="CommitBatch" onClick=payVerify("Amount","ttl") value="' . _('Accept and Process Payment') . '" /></div>'; } echo '</div>'; echo '</form>'; Modified: trunk/RecurringSalesOrdersProcess.php =================================================================== --- trunk/RecurringSalesOrdersProcess.php 2017-06-29 23:47:49 UTC (rev 7803) +++ trunk/RecurringSalesOrdersProcess.php 2017-07-04 07:05:09 UTC (rev 7804) @@ -2,7 +2,7 @@ /* $Id$*/ /*need to allow this script to run from Cron or windows scheduler */ -$AllowAnyone = true; +//$AllowAnyone = true; /* Get this puppy to run from cron (cd webERP && php -f RecurringSalesOrdersProcess.php "weberpdemo") or direct URL (RecurringSalesOrdersProcess.php?Database=weberpdemo) */ if (isset($_GET['Database'])) { Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2017-06-29 23:47:49 UTC (rev 7803) +++ trunk/javascripts/MiscFunctions.js 2017-07-04 07:05:09 UTC (rev 7804) @@ -399,4 +399,28 @@ if(d) document.getElementById(d).required=""; } } +function update1(s) { + var ss=s.split(';'); + var sss=ss.map((a)=>document.getElementById(a).value); + var ttl = sss.reduce((a,b)=>parseFloat(a)+parseFloat(b)); + document.getElementById('ttl').value = ttl; +} +function payVerify(b,a) { + var s=document.getElementById('update'); + var s=s.getAttribute('data-ids'); + update1(s); + var cs=document.getElementById('Amount').getAttribute('class'); + if (parseFloat(document.getElementById(b).value) < parseFloat(parseFloat(document.getElementById(a).value))){ + if (cs.indexOf('error') == -1) { + document.getElementById('Amount').className="error" + ' ' + cs; + } + event.preventDefault(); + } else { + if (cs.indexOf('error') != -1) { + document.getElementById('Amount').className="number"; + } + return true; + } +} + window.onload=initial; Added: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql =================================================================== --- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql (rev 0) +++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-07-04 07:05:09 UTC (rev 7804) @@ -0,0 +1,5 @@ +ALTER table supptrans ADD chequeno varchar(16) NOT NULL DEFAULT ''; +ALTER table supptrans ADD void tinyint(1) NOT NULL DEFAULT 0; +ALTER table banktrans ADD chequeno varchar(16) NOT NULL DEFAULT ''; + + |
From: <ex...@us...> - 2017-06-29 23:47:52
|
Revision: 7803 http://sourceforge.net/p/web-erp/reponame/7803 Author: exsonqu Date: 2017-06-29 23:47:49 +0000 (Thu, 29 Jun 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-29 23:45:44 UTC (rev 7802) +++ trunk/doc/Change.log 2017-06-29 23:47:49 UTC (rev 7803) @@ -1,5 +1,9 @@ webERP Change Log +30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. + +2017-06-26 4.14.1 release + 25/06/22 RChacon: Merge css/WEBootstrap/css/custom.css into css/WEBootstrap/default.css to preserve bootstrap as original. 24/06/22 RChacon: Add style sections for device rendering width ranges for no responsive themes. 23/06/22 RChacon: Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy. |
From: <ex...@us...> - 2017-06-29 23:45:47
|
Revision: 7802 http://sourceforge.net/p/web-erp/reponame/7802 Author: exsonqu Date: 2017-06-29 23:45:44 +0000 (Thu, 29 Jun 2017) Log Message: ----------- 30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php. Modified Paths: -------------- trunk/SupplierInvoice.php Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2017-06-26 05:15:21 UTC (rev 7801) +++ trunk/SupplierInvoice.php 2017-06-29 23:45:44 UTC (rev 7802) @@ -452,6 +452,7 @@ grns.qtyrecd, grns.quantityinv, grns.stdcostunit, + grns.supplierref, purchorderdetails.glcode, purchorderdetails.shiptref, purchorderdetails.jobref, @@ -490,7 +491,8 @@ $myrow['assetid'], 0, $myrow['decimalplaces'], - $myrow['grnbatch']); + $myrow['grnbatch'], + $myrow['supplierref']); } } //end if the order has no controlled items on it } //only allow auto receiving of all lines if the PO is authorised |
From: <ex...@us...> - 2017-06-26 05:15:24
|
Revision: 7801 http://sourceforge.net/p/web-erp/reponame/7801 Author: exsonqu Date: 2017-06-26 05:15:21 +0000 (Mon, 26 Jun 2017) Log Message: ----------- 26/06/17 Exson:4.14.1 rollup Modified Paths: -------------- trunk/GLAccounts.php trunk/UpgradeDatabase.php trunk/includes/ConnectDB.inc Added Paths: ----------- trunk/sql/mysql/upgrade4.14-4.14.1.sql Modified: trunk/GLAccounts.php =================================================================== --- trunk/GLAccounts.php 2017-06-26 05:03:16 UTC (rev 7800) +++ trunk/GLAccounts.php 2017-06-26 05:15:21 UTC (rev 7801) @@ -319,7 +319,7 @@ $Result = DB_query($Sql, $ErrMsg); $k = 1;// Row colour counter. - while ($MyRow = DB_fech_array($Result)) { + while ($MyRow = DB_fetch_array($Result)) { if($k == 1) { echo '<tr class="OddTableRows">'; $k = 0; Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2017-06-26 05:03:16 UTC (rev 7800) +++ trunk/UpgradeDatabase.php 2017-06-26 05:15:21 UTC (rev 7801) @@ -198,6 +198,8 @@ $SQLScripts[] = './sql/mysql/upgrade4.13-4.13.1.sql'; case '4.13.1': $SQLScripts[] = './sql/mysql/upgrade4.13.1-4.14.sql'; + case '4.14': + $SQLScripts[] = './sql/mysql/upgrade4.14-4.14.1.sql'; break; } //end switch Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2017-06-26 05:03:16 UTC (rev 7800) +++ trunk/includes/ConnectDB.inc 2017-06-26 05:15:21 UTC (rev 7801) @@ -4,7 +4,7 @@ * this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run * if VersionNumber is < $Version then the DB update script is run */ -$Version='4.14'; //must update manually every time there is a DB change +$Version='4.14.1'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); if (!isset($_SESSION['DatabaseName'])){ Added: trunk/sql/mysql/upgrade4.14-4.14.1.sql =================================================================== --- trunk/sql/mysql/upgrade4.14-4.14.1.sql (rev 0) +++ trunk/sql/mysql/upgrade4.14-4.14.1.sql 2017-06-26 05:15:21 UTC (rev 7801) @@ -0,0 +1 @@ +UPDATE config SET confvalue='4.14.1' WHERE confname='VersionNumber'; |
From: <ex...@us...> - 2017-06-26 05:03:18
|
Revision: 7800 http://sourceforge.net/p/web-erp/reponame/7800 Author: exsonqu Date: 2017-06-26 05:03:16 +0000 (Mon, 26 Jun 2017) Log Message: ----------- 26/06/17 Exson: Fix the bug of cannot upgrade to 4.14 version. Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/includes/GetConfig.php trunk/sql/mysql/upgrade4.13.1-4.14.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2017-06-26 04:53:33 UTC (rev 7799) +++ trunk/UpgradeDatabase.php 2017-06-26 05:03:16 UTC (rev 7800) @@ -196,7 +196,7 @@ $SQLScripts[] = './sql/mysql/upgrade4.12.3-4.13.sql'; case '4.13': $SQLScripts[] = './sql/mysql/upgrade4.13-4.13.1.sql'; - case '4.14': + case '4.13.1': $SQLScripts[] = './sql/mysql/upgrade4.13.1-4.14.sql'; break; Modified: trunk/includes/GetConfig.php =================================================================== --- trunk/includes/GetConfig.php 2017-06-26 04:53:33 UTC (rev 7799) +++ trunk/includes/GetConfig.php 2017-06-26 05:03:16 UTC (rev 7800) @@ -120,14 +120,6 @@ $sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'"; $result = DB_query($sql,'','',false,false); - if (DB_error_no()!=0) { - $result = DB_query("CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '', - caption varchar(50) NOT NULL DEFAULT '', - href varchar(200) NOT NULL DEFAULT '#', - PRIMARY KEY (userid,caption)) - Engine=InnoDB DEFAULT CHARSET=utf8"); - $result = DB_query($sql); - } if (DB_num_rows($result)>0) { while ($myrow = DB_fetch_array($result)) { $_SESSION['Favourites'][$myrow['href']] = $myrow['caption']; Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql =================================================================== --- trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-06-26 04:53:33 UTC (rev 7799) +++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-06-26 05:03:16 UTC (rev 7800) @@ -13,6 +13,10 @@ INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcReportExpense.php', '15', ''); -- Convert prices to use non- SQL mode specific end date we will have a year 10000 problem but its a way off!: UPDATE prices SET enddate='9999-12-31' WHERE enddate='0000-00-00'; +CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '', + caption varchar(50) NOT NULL DEFAULT '', + href varchar(200) NOT NULL DEFAULT '#', + PRIMARY KEY (userid,caption)) Engine=InnoDB DEFAULT CHARSET=utf8; -- Update version number: UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber'; |
From: <rc...@us...> - 2017-06-26 04:53:35
|
Revision: 7799 http://sourceforge.net/p/web-erp/reponame/7799 Author: rchacon Date: 2017-06-26 04:53:33 +0000 (Mon, 26 Jun 2017) Log Message: ----------- Merge css/WEBootstrap/css/custom.css into css/WEBootstrap/default.css to preserve bootstrap as original. Modified Paths: -------------- trunk/css/WEBootstrap/default.css trunk/doc/Change.log Removed Paths: ------------- trunk/css/WEBootstrap/css/custom.css Deleted: trunk/css/WEBootstrap/css/custom.css =================================================================== --- trunk/css/WEBootstrap/css/custom.css 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/css/WEBootstrap/css/custom.css 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,45 +0,0 @@ - - - -/*** HEADER - QUICK MENU ***/ - -#QuickMenuDiv{ - float:right; /* to the right side */ - z-index: 10; - margin-right: 1.05%; -} -#QuickMenuDiv ul{ - list-style:none; /* hide the bullets */ - margin:0; - padding:0; - - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3'); -} -#QuickMenuDiv li{ - display:inline-block; /* items are inline */ - height:38px; -} -/* make sidebar nav vertical */ -@media (min-width: 1098px) { - .sidebar-nav .navbar .navbar-collapse { - padding: 0; - max-height: none; - } - .sidebar-nav .navbar ul { - float: none; - display: block; - } - .sidebar-nav .navbar li { - float: none; - display: block; - } - .sidebar-nav .navbar li a { - padding-top: 12px; - padding-bottom: 12px; - } -} \ No newline at end of file Modified: trunk/css/WEBootstrap/default.css =================================================================== --- trunk/css/WEBootstrap/default.css 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/css/WEBootstrap/default.css 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,4 +1,4 @@ -/* $Id: default.css 7166 2016-09-07 21:18:59Z giankocr $*/ +/* $Id:default.css 7166 2016-09-07 21:18:59Z giankocr $*/ /* WEBootstrap theme by giankocr. */ /* WEBootstrap is a bootstrap theme design for WebERP. */ /* Design guidelines: @@ -15,36 +15,34 @@ /*** Default Styles ***/ @import url(http://fonts.googleapis.com/css?family=Raleway); -@import url('css/custom.css'); @import url('css/bootstrap.css'); @import url('css/bootstrap-theme.css'); p.good { - font-weight:bold; - color:#28b095; + font-weight:bold; + color:#28b095; } p.bad { - font-weight:bold; - color:rgb(203, 90, 174); + font-weight:bold; + color:rgb(203, 90, 174); } table { - background-color:white; - margin:0 auto; - width:100%; - /*border-collapse: collapse;*/ - border:thin outset #B3B3B3; + background-color:white; + margin:0 auto; + width:100%; + /*border-collapse:collapse;*/ + border:thin outset #B3B3B3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow:1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } table.selection { - } th { border-bottom:thin solid #B3B3B3; @@ -53,10 +51,10 @@ text-align:center; } th.ascending { - cursor:s-resize; + cursor:s-resize; } th.descending { - cursor:n-resize; + cursor:n-resize; } th:after { content:""; @@ -78,41 +76,41 @@ visibility:visible; } td { - padding:2px 4px; + color:#575757; + padding:2px 4px; text-align:left; - color:#575757; } td.select { background-color:#eee; } td table { - background: #eee; + background:#eee; } /* table tr:first-child th:first-child, table tr:first-child td:first-child { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius:4px; + border-top-left-radius: 4px; } table tr:first-child th:last-child, table tr:first-child td:last-child { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius:4px; + border-top-right-radius: 4px; } table tr:last-child td:first-child { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius:4px; + border-bottom-left-radius: 4px; } table tr:last-child td:last-child { - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius:4px; + border-bottom-right-radius: 4px; } */ div.centre { - margin:0 auto; - text-align:center; + margin:0 auto; + text-align:center; } input { } @@ -120,17 +118,17 @@ border-width:0px; background-color:transparent; } -input:hover{ +input:hover { } select { font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; border:thin solid #C3C3C3; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - padding:4px 8px; - cursor: pointer; + -webkit-border-radius:4px; + -moz-border-radius:4px; + border-radius:4px; + padding:4px 8px; + cursor:pointer; } input.inputerror, input.error, select.error, select.selecterror, label.error { color:red; @@ -137,48 +135,48 @@ border:2px solid red; } input[type='text'], input[type='tel'], input[type='password'], input[type='email'] { - border:thin solid #C3C3C3; - padding:4px 8px; + border:thin solid #C3C3C3; + padding:4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; } input:required, select:required, textarea:required { background-color:#e2f5ff; } input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus { - outline:none; - border-color:#2380CD; + outline:none; + border-color:#2380CD; - -moz-box-shadow: 0px 0px 5px #55B1EA; - -webkit-box-shadow: 0px 0px 5px #55B1EA; - box-shadow: 0px 0px 5px #55B1EA; + -moz-box-shadow: 0px 0px 5px #55B1EA; + -webkit-box-shadow:0px 0px 5px #55B1EA; + box-shadow: 0px 0px 5px #55B1EA; } input[type='submit'], button { - background-color:#34a7e8; - border:thin outset #1992DA; - padding:6px 24px; - vertical-align:middle; - font-weight:bold; - color:#FFFFFF; - cursor: pointer; + background-color:#34a7e8; + border:thin outset #1992DA; + color:#FFFFFF; + cursor:pointer; + font-weight:bold; + padding:6px 24px; + vertical-align:middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 1px #64BEF1 inset; - -webkit-box-shadow: 1px 1px 1px #64BEF1 inset; - box-shadow: 1px 1px 1px #64BEF1 inset; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 1px #64BEF1 inset; + -webkit-box-shadow:1px 1px 1px #64BEF1 inset; + box-shadow: 1px 1px 1px #64BEF1 inset; } -textarea{ - border:thin solid #C3C3C3; - padding:4px 8px; +textarea { + border:thin solid #C3C3C3; + padding:4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; } .EvenTableRows { background-color:white; @@ -215,37 +213,36 @@ } /*** Calendar picker ***/ -#calendar{ - +#calendar { } .dpTbl { border:1px solid #C3C3C3; - -moz-box-shadow: 0px 0px 8px #999999; - -webkit-box-shadow: 0px 0px 8px #999999; - box-shadow: 0px 0px 8px #999999; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); + -moz-box-shadow: 0px 0px 8px #999999; + -webkit-box-shadow:0px 0px 8px #999999; + box-shadow: 0px 0px 8px #999999; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); } .dpTD { - border: 0; + border:0; width:25px; text-align:right; cursor:pointer; } .dpTbl button { - padding: 4px 12px; + padding:4px 12px; } .dpDayHighlight { - border: 0; + border:0; width:20px; - background-color: yellow; + background-color:yellow; text-align:right; cursor:pointer; } .dpTDHover { - border: 0; + border:0; width:20px; - background-color: #E1E1E1; + background-color:#E1E1E1; text-align:right; cursor:pointer; } @@ -252,64 +249,64 @@ /* Table type is used for UI tables type 1 */ .table1 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; + background:#eee; + border:0px 0px 2px 2px #222 solid; + margin:0 auto; + width:90%; } /* Table type is used for UI tables type 2 */ .table2 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; + background:#eee; + border:0px 0px 2px 2px #222 solid; + margin:0 auto; + width:90%; } .tableheader { - font-weight: normal; - background-color: #777C59; + background-color:#777C59; + font-weight:normal; } .notavailable { + color:#555555; + font-style:italic; font-weight:lighter; - font-style:italic; - color:#555555; } .label { + color:#575757; + font-size:120%; + font-style:normal; font-weight:bold; - font-style:normal; - font-size:120%; - color: #575757; } .table_index { - background-color: #F1FFDD; + background-color:#F1FFDD; } .header { - background-image: url(""); - background-repeat: no-repeat; - background-attachment: fixed; - border: none; - margin: 0px; - padding: 0px; - background-color: #fddbdb; + background-attachment:fixed; + background-color:#fddbdb; + background-image:url(""); + background-repeat:no-repeat; + border:none; + margin:0px; + padding:0px; } input.inputerror { - background-color: #fddbdb; + background-color:#fddbdb; } textarea.texterror { - background-color: #fddbdb; + background-color:#fddbdb; } select.selecterror { - background-color: #fddbdb; + background-color:#fddbdb; } .OsRow { - background-color: #234567; + background-color:#234567; color:white; } /*** CANVAS ***/ -#CanvasDiv{ +#CanvasDiv { background:#F1F1F1; margin:0; } @@ -318,78 +315,91 @@ #HeaderDiv { /* - overflow:hidden; REQUIRED: height according to items contained */ + overflow:hidden; REQUIRED:height according to items contained */ color:#333333; font-weight:bold; padding-left:3px; - height: 44px; + height:44px; } -#HeaderWrapDiv{ +#HeaderWrapDiv { } /*** HEADER - APP INFO ***/ -#AppInfoDiv{ - font-family: Raleway, sans-serif; - float:left; /* REQUIRED: to the left */ - +#AppInfoDiv { + float:left; /* REQUIRED:to the left */ + font-family:Raleway, sans-serif; } -#AppInfoDiv img{ - +#AppInfoDiv img { vertical-align:middle; /* center image and text vertically */ } -#AppInfoCompanyDiv{ - display:table-cell; /* REQUIRED: as a cell */ +#AppInfoCompanyDiv { + display:table-cell; /* REQUIRED:as a cell */ } -#AppInfoUserDiv{ - display:table-cell; /* REQUIRED: as a cell */ +#AppInfoUserDiv { + display:table-cell; /* REQUIRED:as a cell */ } -#AppInfoUserDiv a{ - text-decoration:none; +#AppInfoUserDiv a { color:#333333; font-weight:bold; + text-decoration:none; } -#AppInfoUserDiv a:hover{ +#AppInfoUserDiv a:hover { text-decoration:none; } -#AppInfoModuleDiv{ +#AppInfoModuleDiv { } /*** HEADER - QUICK MENU ***/ #QuickMenuDiv { - border-bottom: 3px solid #47c9af; - font-family: Raleway, sans-serif; - line-height: 1; - width: auto; + border-bottom:3px solid #47c9af; + float:right; /* to the right side */ + font-family:Raleway, sans-serif; + line-height:1; + margin-right:1.05%; + width:auto; + z-index: 10; } #QuickMenuDiv ul { + list-style:none; /* hide the bullets */ + margin:0; + padding:0; + + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3'); } #QuickMenuDiv li { + display:inline-block; /* items are inline */ + height:38px; } /*** links as buttons!!! clicking anywhere in the button will activate - the link!!! ***HJ***/ + the link!!! ***HJ***/ #QuickMenuDiv li a { - border: 0; - color: #444444; - display: block; - font-size: 25px; - font-weight: 400; - line-height: 1; - list-style: none; - margin: 0; - margin-right: -4px; - padding: 0; - padding: 10px; - position: relative; - text-decoration: none; - z-index: 2; - -webkit-transition: all .2s ease; - -moz-transition: all .2s ease; - -o-transition: all .2s ease; - transition: all .2s ease; + border:0; + color:#444444; + display:block; + font-size:25px; + font-weight:400; + line-height:1; + list-style:none; + margin:0; + margin-right:-4px; + padding:0; + padding:10px; + position:relative; + text-decoration:none; + z-index:2; + -webkit-transition:all .2s ease; + -moz-transition:all .2s ease; + -o-transition:all .2s ease; + transition:all .2s ease; } #QuickMenuDiv li:first-child a { } @@ -405,7 +415,7 @@ } /*** BODY ***/ -#BodyWrapDiv{ +#BodyWrapDiv { margin-left:-20px; } #BodyDiv { @@ -412,8 +422,8 @@ background:#F1F1F1; clear:right; /* REQUIRED */ color:black; - font-family: Raleway, sans-serif; - min-height: 440px; + font-family:Raleway, sans-serif; + min-height:440px; overflow:hidden; /* REQUIRED */ padding:5px; text-align:center; @@ -423,95 +433,98 @@ margin-bottom:10px; width:auto; /* automatic width */ - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } #BodyDiv table.selection { - background-color:white; - border:thin outset #D2D2D2; - padding:5px 0 0 10px; - position: center fixed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + background-color:white; + border:thin outset #D2D2D2; + padding:5px 0 0 10px; + position:center fixed; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } /*** BODY - MAIN MENU ***/ -@media (min-width: 998px) { - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } +@media (min-width:998px) { + .navbar-collapse.collapse { + display:block !important; + height:auto !important; + padding-bottom:0; + overflow:visible !important; + } } #MainMenuDiv { - font-family:Raleway, sans-serif; - margin-top:5px; + font-family:Raleway, sans-serif; + margin-top:5px; } #MainMenuDiv ul { - list-style:none; /* REQUIRED: hide bullets */ - padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ + list-style:none; /* REQUIRED:hide bullets */ + padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */ margin:0; } -#MainMenuDiv li{ +#MainMenuDiv li { list-style:none; /* REQUIRED */ padding:0; /* REQUIRED */ } -#MainMenuDiv li a { /* link as button!!! not-pressed state */ - background-color: #47c9af; - background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); - background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - border-bottom: 1px solid rgba(255,255,255,.1); - box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); - color: rgb(255,255,255); - display:block; - font-size:1.5rem; - font-weight:500; - height:50px; - letter-spacing: .2rem; - line-height:50px; - text-decoration:none; - /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ - text-transform: uppercase; - transition: all .1s ease; +#MainMenuDiv li a { + /* link as button!!! not-pressed state */ + background-color:#47c9af; + background-image:-webkit-linear-gradient(135deg, #28b095, #47c9af); + background-image:-moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image:-o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image:linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + border-bottom:1px solid rgba(255,255,255,.1); + box-shadow:inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); + color:rgb(255,255,255); + display:block; + font-size:1.5rem; + font-weight:500; + height:50px; + letter-spacing:.2rem; + line-height:50px; + text-decoration:none; + /*text-shadow:0 1px 1px rgba(0,0,0,.1);*/ + text-transform:uppercase; + transition:all .1s ease; } #MainMenuDiv li:first-child a { - border-top: none; + border-top:none; } -#MainMenuDiv li a:hover{ /* link as button!!! pressed state */ - background-color: rgb(114, 51, 98); - background-image: -webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - cursor: pointer; +#MainMenuDiv li a:hover { + /* link as button!!! pressed state */ + background-color:rgb(114, 51, 98); + background-image:-webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:-moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:-o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + cursor:pointer; } -#MainMenuDiv .main_menu_selected a{ /* the selected button */ +#MainMenuDiv .main_menu_selected a { + /* the selected button */ /*border:thin inset #191919;*/ background:#2A2A2A; border-bottom:thin solid #191919; } -#MainMenuDiv .main_menu_selected a:hover{ +#MainMenuDiv .main_menu_selected a:hover { background:#2A2A2A; } /*** BODY - SUB MENU ***/ -#SubMenuDiv{ +#SubMenuDiv { } #SubMenuDiv a:link, a:visited { color:#0088CD; @@ -530,7 +543,7 @@ padding:2px; color:#333333; } -#SubMenuDiv li img{ +#SubMenuDiv li img { vertical-align:middle; /* verticall align icon with the text */ } #SubMenuDiv .menu_group_headers { @@ -542,11 +555,12 @@ #InquiriesDiv, #MaintenanceDiv { margin-left:-10px; - margin-top:5px; + margin-top:5px; } -#InquiriesDiv div{ /* default div, used for custom report header */ +#InquiriesDiv div { + /* default div, used for custom report header */ } -#InquiriesDiv body{ +#InquiriesDiv body { .menu_group_item p { color:transparent; /* buttets color */ margin:4px 0 0 0; @@ -570,18 +584,18 @@ overflow:hidden; padding:3px; } -#FooterLogoDiv{ +#FooterLogoDiv { float:right; /* right side */ - padding:2px; + padding:2px; } #FooterLogoDiv img { - vertical-align:middle; + vertical-align:middle; } -#FooterVersionDiv{ +#FooterVersionDiv { float:left; /* left side */ margin-top:3px; } -#FooterTimeDiv{ +#FooterTimeDiv { clear:left; /* below */ } #Report { @@ -613,9 +627,9 @@ } @media (min-width:1098px) { - .navbar-toggle { - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); + .navbar-toggle { + background-color:#47c9af; + border:3px solid rgba(114, 51, 98, 1.00); border-radius:70px; display:none;/* ? */ float:right; @@ -624,16 +638,33 @@ position:relative; } .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } + display:block !important; + height:auto !important; + padding-bottom:0; + overflow:visible !important; + } + /* make sidebar nav vertical */ + .sidebar-nav .navbar .navbar-collapse { + max-height:none; + padding:0; + } + .sidebar-nav .navbar ul { + display:block; + float:none; + } + .sidebar-nav .navbar li { + display:block; + float:none; + } + .sidebar-nav .navbar li a { + padding-top:12px; + padding-bottom:12px; + } } .navbar-toggle { - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); + background-color:#47c9af; + border:3px solid rgba(114, 51, 98, 1.00); border-radius:70px; float:right; margin:0; @@ -641,7 +672,7 @@ position:relative; } .glyphicon.glyphicon-th { - font-size:30px; + font-size:30px; } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/doc/Change.log 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,5 +1,6 @@ webERP Change Log +25/06/22 RChacon: Merge css/WEBootstrap/css/custom.css into css/WEBootstrap/default.css to preserve bootstrap as original. 24/06/22 RChacon: Add style sections for device rendering width ranges for no responsive themes. 23/06/22 RChacon: Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy. 22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php. |
From: <rc...@us...> - 2017-06-25 14:20:12
|
Revision: 7798 http://sourceforge.net/p/web-erp/reponame/7798 Author: rchacon Date: 2017-06-25 14:20:04 +0000 (Sun, 25 Jun 2017) Log Message: ----------- Rebuild languages files *.pot, *.po and *.mo. Modified Paths: -------------- trunk/css/WEBootstrap/default.css trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po Modified: trunk/css/WEBootstrap/default.css =================================================================== --- trunk/css/WEBootstrap/default.css 2017-06-25 02:50:29 UTC (rev 7797) +++ trunk/css/WEBootstrap/default.css 2017-06-25 14:20:04 UTC (rev 7798) @@ -386,16 +386,14 @@ position: relative; text-decoration: none; z-index: 2; - -webkit-transition: all .2s ease; - -moz-transition: all .2s ease; - -o-transition: all .2s ease; - transition: all .2s ease; + -webkit-transition: all .2s ease; + -moz-transition: all .2s ease; + -o-transition: all .2s ease; + transition: all .2s ease; } -#QuickMenuDiv li:first-child a{ - +#QuickMenuDiv li:first-child a { } -#QuickMenuDiv li:last-child a{ - +#QuickMenuDiv li:last-child a { } #QuickMenuDiv li a:hover { background-color:#47c9af; @@ -421,9 +419,9 @@ text-align:center; } #BodyDiv table { - width:auto; /* automatic width */ margin:0 auto; margin-bottom:10px; + width:auto; /* automatic width */ -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -458,12 +456,11 @@ overflow: visible !important; } } -#MainMenuDiv{ +#MainMenuDiv { font-family:Raleway, sans-serif; margin-top:5px; } - -#MainMenuDiv ul{ +#MainMenuDiv ul { list-style:none; /* REQUIRED: hide bullets */ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ margin:0; @@ -473,28 +470,25 @@ padding:0; /* REQUIRED */ } #MainMenuDiv li a { /* link as button!!! not-pressed state */ - background-color: #47c9af; - background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); - background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - border-bottom: 1px solid rgba(255,255,255,.1); - box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); - color: rgb(255,255,255); - display:block; - font-size:1.5rem; - font-weight:500; - height:50px; - letter-spacing: .2rem; - line-height:50px; - text-decoration:none; - /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ - text-transform: uppercase; - transition: all .1s ease; + background-color: #47c9af; + background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); + background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + border-bottom: 1px solid rgba(255,255,255,.1); + box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); + color: rgb(255,255,255); + display:block; + font-size:1.5rem; + font-weight:500; + height:50px; + letter-spacing: .2rem; + line-height:50px; + text-decoration:none; + /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ + text-transform: uppercase; + transition: all .1s ease; } - - - #MainMenuDiv li:first-child a { border-top: none; } @@ -563,7 +557,7 @@ #FooterDiv { clear:both; /* REQUIRED */ color:#999999; - font-family: Raleway, sans-serif; + font-family:Raleway, sans-serif; margin:auto; overflow:hidden; width:98.6%; Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-06-25 02:50:29 UTC (rev 7797) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-06-25 14:20:04 UTC (rev 7798) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 4.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-17 19:13-0600\n" +"POT-Creation-Date: 2017-06-25 08:09-0600\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -159,23 +159,23 @@ #: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125 #: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273 #: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320 -#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296 -#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334 -#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141 -#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:110 -#: GLAccounts.php:124 Locations.php:279 Locations.php:287 Locations.php:298 -#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334 -#: Locations.php:343 Locations.php:351 Manufacturers.php:185 -#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146 -#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147 -#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166 -#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 -#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776 -#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 -#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 -#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135 -#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135 -#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88 +#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146 +#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 +#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 +#: FixedAssetCategories.php:137 GLAccounts.php:110 GLAccounts.php:124 +#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307 +#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343 +#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185 +#: PaymentMethods.php:162 PaymentTerms.php:146 PaymentTerms.php:153 +#: PcExpenses.php:161 SalesCategories.php:146 SalesCategories.php:153 +#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172 +#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 +#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784 +#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824 +#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 +#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143 +#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88 +#: WorkCentres.php:91 WorkCentres.php:97 msgid "There are" msgstr "يوجد" @@ -231,45 +231,46 @@ #: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186 #: BOMListing.php:110 BOMs.php:285 BOMs.php:990 CollectiveWorkOrderCost.php:281 #: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2097 -#: CounterSales.php:2193 Credit_Invoice.php:286 CreditStatus.php:21 +#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:286 #: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238 #: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 #: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 #: FixedAssetLocations.php:13 FixedAssetRegister.php:16 #: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 -#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250 -#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:167 -#: InternalStockRequest.php:316 InventoryPlanning.php:459 -#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14 -#: MaintenanceUserSchedule.php:16 MRPReport.php:543 NoSalesItems.php:91 -#: PcAssignCashTabToTab.php:76 PcAssignCashTabToTab.php:156 -#: PcAssignCashTabToTab.php:212 PcAssignCashToTab.php:59 -#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160 -#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16 -#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64 -#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16 -#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11 -#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241 -#: PurchData.php:373 PurchData.php:401 QATests.php:22 -#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14 -#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39 -#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48 -#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221 -#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86 -#: SelectOrderItems.php:588 SelectOrderItems.php:1501 SelectOrderItems.php:1601 -#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545 -#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9 -#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11 -#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 +#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11 +#: HistoricalTestResults.php:42 InternalStockRequest.php:316 +#: InternalStockRequestInquiry.php:167 InventoryPlanning.php:459 +#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:543 +#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91 +#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60 +#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10 +#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:76 +#: PcAssignCashTabToTab.php:156 PcAssignCashTabToTab.php:212 +#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144 PcAssignCashToTab.php:160 +#: PcAssignCashToTab.php:207 PriceMatrix.php:16 Prices.php:11 +#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38 +#: PurchData.php:241 PurchData.php:373 PurchData.php:401 +#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320 +#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 +#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28 +#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11 +#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292 +#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588 +#: SelectOrderItems.php:1501 SelectOrderItems.php:1601 SelectProduct.php:523 +#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:14 +#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174 +#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 +#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 #: StockLocMovements.php:14 StockSerialItemResearch.php:30 #: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399 -#: SupplierPriceList.php:458 SupplierPriceList.php:503 Suppliers.php:304 +#: SupplierPriceList.php:458 SupplierPriceList.php:503 #: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664 #: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10 -#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10 -#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22 -#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58 -#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251 +#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118 +#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113 +#: WorkOrderCosting.php:22 WorkOrderIssue.php:22 WorkOrderReceive.php:34 +#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57 +#: ../webSHOP/includes/header.php:251 msgid "Search" msgstr "إبحث" @@ -295,7 +296,6 @@ #: AccountGroups.php:476 AddCustomerContacts.php:165 #: AddCustomerContacts.php:275 AddCustomerContacts.php:279 #: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898 -#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795 #: CompanyPreferences.php:423 CompanyPreferences.php:425 #: CompanyPreferences.php:438 CompanyPreferences.php:440 #: CompanyPreferences.php:453 CompanyPreferences.php:455 @@ -308,29 +308,29 @@ #: InternalStockRequestInquiry.php:438 InternalStockRequestInquiry.php:449 #: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446 #: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687 -#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 -#: MRP.php:566 MRP.php:570 PaymentMethods.php:227 PaymentMethods.php:228 -#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:301 -#: PaymentMethods.php:308 PaymentMethods.php:315 PaymentMethods.php:322 -#: PcAuthorizeExpenses.php:249 PDFChequeListing.php:65 -#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602 -#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134 -#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 -#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409 -#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425 -#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608 -#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623 -#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647 -#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670 -#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308 -#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334 -#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419 -#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493 +#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 +#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 +#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606 +#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 +#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416 +#: PaymentMethods.php:227 PaymentMethods.php:228 PaymentMethods.php:229 +#: PaymentMethods.php:230 PaymentMethods.php:301 PaymentMethods.php:308 +#: PaymentMethods.php:315 PaymentMethods.php:322 PcAuthorizeExpenses.php:249 +#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414 +#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430 +#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610 +#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634 +#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649 +#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293 +#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319 +#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345 +#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424 +#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493 #: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284 #: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420 #: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451 -#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302 -#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227 +#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:297 +#: SalesCategories.php:384 SalesCategories.php:388 SalesPeople.php:227 #: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757 #: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424 #: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574 @@ -345,28 +345,28 @@ #: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672 #: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780 #: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849 -#: SystemParameters.php:945 SystemParameters.php:1088 -#: SystemParameters.php:1090 SystemParameters.php:1100 -#: SystemParameters.php:1102 SystemParameters.php:1156 -#: SystemParameters.php:1168 SystemParameters.php:1170 -#: SystemParameters.php:1208 SystemParameters.php:1210 -#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311 -#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304 -#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 -#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187 -#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212 -#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547 -#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734 -#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764 -#: WWW_Users.php:767 +#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090 +#: SystemParameters.php:1100 SystemParameters.php:1102 +#: SystemParameters.php:1156 SystemParameters.php:1168 +#: SystemParameters.php:1170 SystemParameters.php:1208 +#: SystemParameters.php:1210 SystemParameters.php:1232 +#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314 +#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532 +#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924 +#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196 +#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224 +#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718 +#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749 +#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767 +#: reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "موافق" #: AccountGroups.php:312 AccountGroups.php:472 AccountGroups.php:475 #: AddCustomerContacts.php:165 AddCustomerContacts.php:274 -#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218 -#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418 -#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899 +#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BOMs.php:142 +#: BOMs.php:895 BOMs.php:899 BankAccounts.php:218 BankAccounts.php:412 +#: BankAccounts.php:414 BankAccounts.php:418 BankAccounts.php:426 #: CompanyPreferences.php:422 CompanyPreferences.php:426 #: CompanyPreferences.php:437 CompanyPreferences.php:441 #: CompanyPreferences.php:452 CompanyPreferences.php:456 @@ -379,15 +379,15 @@ #: InternalStockRequestInquiry.php:436 InternalStockRequestInquiry.php:447 #: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446 #: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692 -#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 -#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:227 -#: PaymentMethods.php:228 PaymentMethods.php:229 PaymentMethods.php:230 -#: PaymentMethods.php:302 PaymentMethods.php:309 PaymentMethods.php:316 -#: PaymentMethods.php:323 PcAuthorizeExpenses.php:247 PDFChequeListing.php:64 -#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603 +#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 +#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64 +#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:603 #: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411 +#: PO_PDFPurchOrder.php:417 PaymentMethods.php:227 PaymentMethods.php:228 +#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:302 +#: PaymentMethods.php:309 PaymentMethods.php:316 PaymentMethods.php:323 +#: PcAuthorizeExpenses.php:247 ProductSpecs.php:191 ProductSpecs.php:411 #: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427 #: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615 #: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639 @@ -400,8 +400,8 @@ #: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282 #: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419 #: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450 -#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304 -#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229 +#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:299 +#: SalesCategories.php:385 SalesCategories.php:387 SalesPeople.php:229 #: SalesPeople.php:372 SalesPeople.php:374 SelectCustomer.php:757 #: SelectProduct.php:233 SelectProduct.php:371 SelectQASamples.php:426 #: SelectQASamples.php:523 SelectQASamples.php:525 SelectQASamples.php:579 @@ -416,51 +416,53 @@ #: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673 #: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781 #: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850 -#: SystemParameters.php:946 SystemParameters.php:1087 -#: SystemParameters.php:1091 SystemParameters.php:1099 -#: SystemParameters.php:1103 SystemParameters.php:1157 -#: SystemParameters.php:1167 SystemParameters.php:1171 -#: SystemParameters.php:1207 SystemParameters.php:1211 -#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312 -#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306 -#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866 -#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189 -#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211 -#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546 -#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733 -#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763 -#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44 +#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091 +#: SystemParameters.php:1099 SystemParameters.php:1103 +#: SystemParameters.php:1157 SystemParameters.php:1167 +#: SystemParameters.php:1171 SystemParameters.php:1207 +#: SystemParameters.php:1211 SystemParameters.php:1231 +#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315 +#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535 +#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925 +#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199 +#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223 +#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717 +#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748 +#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766 +#: includes/PDFLowGPPageHeader.inc:44 +#: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "ﻻ" #: AccountGroups.php:321 AccountSections.php:196 AddCustomerContacts.php:158 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:115 +#: BOMs.php:198 BankAccounts.php:243 COGSGLPostings.php:115 #: COGSGLPostings.php:222 CreditStatus.php:175 Currencies.php:374 #: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456 -#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205 +#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165 #: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334 #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:335 GLTags.php:96 +#: FreightCosts.php:253 GLAccounts.php:335 GLTags.php:96 GeocodeSetup.php:173 #: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333 -#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178 -#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309 -#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205 -#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226 -#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 -#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253 -#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467 -#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255 -#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:116 -#: SelectCustomer.php:733 SelectCustomer.php:759 SelectCustomer.php:814 -#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873 -#: SelectGLAccount.php:139 SelectGLAccount.php:154 SelectQASamples.php:417 -#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296 -#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184 -#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185 -#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:391 -#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 +#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309 +#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 +#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:232 +#: PaymentTerms.php:205 PcAssignCashToTab.php:291 +#: PcClaimExpensesFromTab.php:280 PcExpenses.php:226 PcTabs.php:256 +#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253 +#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312 +#: QATests.php:467 SalesCategories.php:305 SalesGLPostings.php:137 +#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206 +#: SecurityTokens.php:116 SelectCustomer.php:733 SelectCustomer.php:759 +#: SelectCustomer.php:814 SelectCustomer.php:832 SelectCustomer.php:856 +#: SelectCustomer.php:873 SelectGLAccount.php:139 SelectGLAccount.php:154 +#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144 +#: StockCategories.php:296 SuppTransGLAnalysis.php:126 SupplierContacts.php:165 +#: SupplierTenderCreate.php:157 SupplierTypes.php:170 TaxAuthorities.php:172 +#: TaxCategories.php:184 TaxGroups.php:191 TaxProvinces.php:179 +#: UnitsOfMeasure.php:185 WWW_Access.php:132 WWW_Users.php:391 +#: WorkCentres.php:145 includes/InputSerialItems.php:110 +#: includes/OutputSerialItems.php:20 #: reportwriter/languages/en_US/reports.php:143 #, php-format msgid "Edit" @@ -472,26 +474,26 @@ #: AccountGroups.php:322 AccountSections.php:201 AddCustomerContacts.php:159 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:116 +#: BOMs.php:200 BankAccounts.php:244 COGSGLPostings.php:116 #: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123 -#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:419 -#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167 -#: CustomerReceipt.php:1009 Customers.php:1166 CustomerTypes.php:206 +#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 +#: Credit_Invoice.php:419 Currencies.php:377 CustItem.php:167 +#: CustomerReceipt.php:1009 CustomerTypes.php:206 Customers.php:1166 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 -#: GeocodeSetup.php:174 GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 +#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174 #: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612 -#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 -#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121 -#: PaymentMethods.php:233 Payments.php:1155 PaymentTerms.php:206 +#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310 +#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 +#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768 +#: PaymentMethods.php:233 PaymentTerms.php:206 Payments.php:1155 #: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227 #: PcExpensesTypeTab.php:186 PcTabs.php:257 PcTypeTabs.php:181 -#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292 -#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466 -#: PurchData.php:314 PurchData.php:721 QATests.php:468 +#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287 +#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468 #: RelatedItemsUpdate.php:161 RelatedItemsUpdate.php:176 -#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311 +#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:306 #: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241 #: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776 #: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815 @@ -500,13 +502,15 @@ #: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667 #: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325 #: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:86 -#: SuppInvGRNs.php:151 SupplierContacts.php:166 SupplierTenderCreate.php:422 -#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90 -#: SuppTransGLAnalysis.php:127 TaxAuthorities.php:173 TaxCategories.php:186 -#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920 -#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865 -#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392 -#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99 +#: SuppInvGRNs.php:151 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127 +#: SupplierContacts.php:166 SupplierTenderCreate.php:422 +#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173 +#: TaxCategories.php:186 TaxGroups.php:192 TaxProvinces.php:180 +#: TestPlanResults.php:920 UnitsOfMeasure.php:186 WOSerialNos.php:335 +#: WWW_Access.php:133 WWW_Users.php:392 WorkCentres.php:146 +#: WorkOrderEntry.php:865 includes/InputSerialItemsKeyed.php:60 +#: includes/OutputSerialItems.php:99 +#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "حذف" @@ -536,17 +540,16 @@ #: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298 #: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819 #: ImportBankTransAnalysis.php:154 ImportBankTransAnalysis.php:185 -#: InternalStockRequestAuthorisation.php:123 -#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255 -#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:981 -#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294 -#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758 -#: ReorderLevelLocation.php:140 RevisionTranslations.php:111 -#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476 -#: ShopParameters.php:610 SMTPServer.php:126 StockCostUpdate.php:196 +#: InternalStockRequest.php:255 InternalStockRequestAuthorisation.php:123 +#: InternalStockRequestFulfill.php:364 LocationUsers.php:177 +#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:981 +#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294 PricesByCost.php:223 +#: PurchData.php:758 ReorderLevelLocation.php:140 RevisionTranslations.php:111 +#: SMTPServer.php:126 SecurityTokens.php:136 SelectCreditItems.php:954 +#: SellThroughSupport.php:476 ShopParameters.php:610 StockCostUpdate.php:196 #: StockReorderLevel.php:111 Stocks.php:1452 SystemParameters.php:1246 -#: UserGLAccounts.php:159 UserLocations.php:178 WorkOrderEntry.php:887 -#: WOSerialNos.php:345 reportwriter/languages/en_US/reports.php:156 +#: UserGLAccounts.php:159 UserLocations.php:178 WOSerialNos.php:345 +#: WorkOrderEntry.php:887 reportwriter/languages/en_US/reports.php:156 msgid "Update" msgstr "" @@ -676,22 +679,22 @@ msgstr "" #: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242 -#: AddCustomerTypeNotes.php:221 Areas.php:229 BankAccounts.php:433 BOMs.php:916 +#: AddCustomerTypeNotes.php:221 Areas.php:229 BOMs.php:916 BankAccounts.php:433 #: COGSGLPostings.php:371 CreditStatus.php:259 Currencies.php:537 #: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142 #: EDIMessageFormat.php:248 FixedAssetCategories.php:350 -#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271 -#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375 -#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57 -#: OffersReceived.php:146 PaymentMethods.php:332 PaymentTerms.php:310 -#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369 +#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:285 +#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188 +#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57 +#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:332 +#: PaymentTerms.php:310 PriceMatrix.php:236 Prices_Customer.php:369 #: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552 #: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381 #: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203 -#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291 +#: StockCategories.php:653 SuppLoginSetup.php:291 SupplierContacts.php:284 #: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234 -#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289 -#: WWW_Users.php:835 +#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WWW_Users.php:835 +#: WorkCentres.php:289 msgid "Enter Information" msgstr "أدخل المعلومات" @@ -732,11 +735,11 @@ #: AddCustomerContacts.php:63 AddCustomerNotes.php:51 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68 #: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105 -#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102 -#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124 -#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76 +#: FixedAssetItems.php:255 MRPCalendar.php:176 PO_Items.php:380 +#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:86 PcExpenses.php:98 +#: PcTabs.php:124 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76 #: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66 -#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 SupplierTypes.php:68 +#: SelectQASamples.php:85 Stocks.php:594 SupplierTypes.php:68 Suppliers.php:531 msgid "has been updated" msgstr "" @@ -754,7 +757,7 @@ #: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164 #: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208 #: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288 -#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108 +#: StockDispatch.php:299 SuppTransGLAnalysis.php:108 SupplierContacts.php:152 #: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:164 #: UserGLAccounts.php:157 UserLocations.php:176 #: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144 @@ -780,17 +783,16 @@ #: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639 #: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593 #: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679 -#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 -#: PrintCustStatements.php:99 PrintCustTrans.php:740 -#: PrintCustTransPortrait.php:788 PrintCustTransPortrait.php:1034 -#: PrintCustTransPortrait.php:1090 SelectCustomer.php:408 -#: SelectCustomer.php:730 SelectSupplier.php:290 SupplierContacts.php:156 -#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:333 -#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:76 -#: includes/PDFTransPageHeader.inc:85 +#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99 +#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788 +#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090 +#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290 +#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184 +#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25 +#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19 -#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443 -#: ../webSHOP/Register.php:608 +#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 +#: ../webSHOP/Register.php:595 msgid "Email" msgstr "" @@ -802,14 +804,14 @@ #: AddCustomerContacts.php:138 AddCustomerContacts.php:289 #: AnalysisHorizontalIncome.php:173 AnalysisHorizontalPosition.php:123 #: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:130 -#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:261 +#: GLCashFlowsIndirect.php:450 PDFQuotation.php:252 +#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:261 #: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256 #: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98 #: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409 -#: PcReportExpense.php:137 PcReportTab.php:336 PDFQuotation.php:252 -#: PDFQuotationPortrait.php:249 PurchasesReport.php:56 SelectCustomer.php:732 -#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306 -#: WOSerialNos.php:312 +#: PcReportExpense.php:137 PcReportTab.php:336 PurchasesReport.php:56 +#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411 +#: WOSerialNos.php:306 WOSerialNos.php:312 msgid "Notes" msgstr "" @@ -835,17 +837,16 @@ msgstr "" #: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239 -#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623 +#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610 msgid "Contact Name" msgstr "" #: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247 #: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246 -#: SelectCustomer.php:406 SelectOrderItems.php:626 -#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72 -#: includes/PDFTransPageHeader.inc:84 -#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:537 -#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737 +#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395 +#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84 +#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389 +#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 msgid "Phone" msgstr "" @@ -896,13 +897,13 @@ #: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211 #: AgedControlledInventory.php:47 BankMatching.php:281 #: BankReconciliation.php:212 BankReconciliation.php:289 -#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348 -#: CustomerAllocations.php:378 CustomerInquiry.php:252 -#: CustomerTransInquiry.php:100 CustWhereAlloc.php:133 GLAccountReport.php:347 +#: ContractCosting.php:177 CustWhereAlloc.php:133 CustomerAccount.php:252 +#: CustomerAllocations.php:348 CustomerAllocations.php:378 +#: CustomerInquiry.php:252 CustomerTransInquiry.php:100 GLAccountReport.php:347 #: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219 +#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450 #: PaymentAllocations.php:67 PcAssignCashTabToTab.php:257 #: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PcReportExpense.php:133 -#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450 #: PrintCustTrans.php:822 PrintCustTransPortrait.php:902 #: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 #: PurchasesReport.php:67 ReverseGRN.php:401 SelectCustomer.php:810 @@ -909,23 +910,24 @@ #: SelectCustomer.php:852 ShipmentCosting.php:538 ShipmentCosting.php:615 #: Shipments.php:489 StockDispatch.php:279 StockDispatch.php:290 #: StockDispatch.php:301 StockLocMovements.php:92 StockMovements.php:105 -#: StockSerialItemResearch.php:82 SupplierAllocations.php:458 -#: SupplierAllocations.php:572 SupplierAllocations.php:647 -#: SupplierInquiry.php:204 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132 -#: Tax.php:408 Z_CheckGLTransBalance.php:11 +#: StockSerialItemResearch.php:82 SuppWhereAlloc.php:132 +#: SupplierAllocations.php:458 SupplierAllocations.php:572 +#: SupplierAllocations.php:647 SupplierInquiry.php:204 +#: SupplierTransInquiry.php:111 Tax.php:408 Z_CheckGLTransBalance.php:11 #: includes/PDFQuotationPageHeader.inc:31 #: includes/PDFQuotationPortraitPageHeader.inc:80 #: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:62 +#: reportwriter/languages/en_US/reports.php:64 msgid "Date" msgstr "" #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:183 #: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942 -#: Stocks.php:1270 UpgradeDatabase.php:248 UpgradeDatabase.php:251 -#: UpgradeDatabase.php:254 UpgradeDatabase.php:257 UpgradeDatabase.php:260 -#: UpgradeDatabase.php:263 UpgradeDatabase.php:266 UpgradeDatabase.php:269 -#: UpgradeDatabase.php:272 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1270 UpgradeDatabase.php:251 UpgradeDatabase.php:254 +#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263 +#: UpgradeDatabase.php:266 UpgradeDatabase.php:269 UpgradeDatabase.php:272 +#: UpgradeDatabase.php:275 Z_Upgrade_3.10-3.11.php:62 #: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70 #: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78 #: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66 @@ -1019,15 +1021,16 @@ #: AgedControlledInventory.php:12 GLCashFlowsSetup.php:109 #: InventoryQuantities.php:155 InventoryValuation.php:217 Locations.php:12 -#: MRPCalendar.php:21 MRPCreateDemands.php:193 MRPDemands.php:27 -#: MRPDemandTypes.php:17 MRP.php:542 MRPPlannedPurchaseOrders.php:264 +#: MRP.php:542 MRPCalendar.php:21 MRPCreateDemands.php:193 +#: MRPDemandTypes.php:17 MRPDemands.php:27 MRPPlannedPurchaseOrders.php:264 #: MRPPlannedWorkOrders.php:245 MRPPlannedWorkOrders.php:319 PricesByCost.php:8 -#: ReorderLevelLocation.php:12 ReorderLevel.php:194 SelectProduct.php:91 +#: ReorderLevel.php:194 ReorderLevelLocation.php:12 SelectProduct.php:91 #: StockDispatch.php:321 StockMovements.php:22 StockQties_csv.php:8 #: StockQuantityByDate.php:10 StockReorderLevel.php:20 #: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45 #: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28 #: includes/MainMenuLinksArray.php:24 +#: reportwriter/languages/en_US/reports.php:243 msgid "Inventory" msgstr "" @@ -1036,14 +1039,13 @@ msgstr "" #: AgedControlledInventory.php:42 MRPReschedules.php:124 MRPShortages.php:260 -#: StockClone.php:53 Stocks.php:63 +#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103 msgid "Stock" msgstr "" #: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37 #: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109 -#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 BOMs_SingleLevel.php:558 -#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:53 +#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53 #: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353 #: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2102 #: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243 @@ -1052,48 +1054,47 @@ #: FixedAssetRegister.php:87 FixedAssetRegister.php:388 #: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63 #: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122 -#: InternalStockCategoriesByRole.php:168 InternalStockRequestInquiry.php:221 -#: InternalStockRequestInquiry.php:267 InternalStockRequestInquiry.php:406 -#: InternalStockRequest.php:350 InternalStockRequest.php:564 -#: InternalStockRequest.php:634 InventoryPlanning.php:419 +#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:350 +#: InternalStockRequest.php:564 InternalStockRequest.php:634 +#: InternalStockRequestInquiry.php:221 InternalStockRequestInquiry.php:267 +#: InternalStockRequestInquiry.php:406 InventoryPlanning.php:419 #: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290 -#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50 -#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295 -#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:256 MRPReport.php:563 -#: MRPReport.php:777 MRPReschedules.php:190 MRPShortages.php:349 -#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190 -#: PcExpenses.php:296 PcExpensesTypeTab.php:170 PcReportTab.php:181 -#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335 -#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 -#: PO_Items.php:716 PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 -#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:160 -#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:400 -#: SalesCategories.php:549 SecurityTokens.php:107 SecurityTokens.php:167 -#: SelectAsset.php:264 SelectCompletedOrder.php:506 SelectContract.php:147 +#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295 +#: MRPPlannedWorkOrders.php:256 MRPReport.php:563 MRPReport.php:777 +#: MRPReschedules.php:190 MRPShortages.php:349 MaintenanceTasks.php:95 +#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194 +#: PDFCOA.php:64 PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335 +#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716 +#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214 +#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296 +#: PcExpensesTypeTab.php:170 PcReportTab.php:181 PcTypeTabs.php:164 +#: PricesByCost.php:153 RelatedItemsUpdate.php:160 ReorderLevel.php:298 +#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:541 +#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264 +#: SelectCompletedOrder.php:506 SelectContract.php:147 #: SelectCreditItems.php:1019 SelectOrderItems.php:1511 -#: SelectOrderItems.php:1682 SelectProduct.php:543 SelectProduct.php:831 +#: SelectOrderItems.php:1682 SelectProduct.php:543 SelectProduct.php:832 #: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603 #: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695 #: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176 #: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92 #: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:74 SuppInvGRNs.php:120 -#: SuppInvGRNs.php:263 SupplierCredit.php:317 SupplierCredit.php:385 -#: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:44 -#: SupplierPriceList.php:276 SupplierPriceList.php:542 +#: SuppInvGRNs.php:263 SuppPriceList.php:306 SupplierCredit.php:317 +#: SupplierCredit.php:385 SupplierInvoice.php:673 SupplierInvoice.php:757 +#: SupplierPriceList.php:44 SupplierPriceList.php:276 SupplierPriceList.php:542 #: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695 #: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421 -#: SupplierTenders.php:687 SuppPriceList.php:306 TestPlanResults.php:177 -#: TestPlanResults.php:280 TopItems.php:170 WorkCentres.php:130 -#: WorkOrderCosting.php:98 WorkOrderCosting.php:130 WorkOrderEntry.php:973 -#: WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35 -#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30 -#: includes/PDFInventoryPlanPageHeader.inc:51 +#: SupplierTenders.php:687 TestPlanResults.php:177 TestPlanResults.php:280 +#: TopItems.php:170 WorkCentres.php:130 WorkOrderCosting.php:98 +#: WorkOrderCosting.php:130 WorkOrderEntry.php:973 WorkOrderIssue.php:1009 +#: Z_ItemsWithoutPicture.php:35 api/api_xml-rpc.php:3489 +#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 -#: includes/PDFTransPageHeaderPortrait.inc:256 api/api_xml-rpc.php:3489 -#: ../webSHOP/includes/PlaceOrder.php:250 +#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12 +#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236 msgid "Description" msgstr "" @@ -1133,17 +1134,17 @@ #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693 #: SelectCreditItems.php:697 SelectOrderItems.php:1352 SuppContractChgs.php:107 -#: SuppFixedAssetChgs.php:93 SupplierAllocations.php:460 -#: SupplierAllocations.php:573 SupplierAllocations.php:648 -#: SupplierCredit.php:407 SupplierInquiry.php:209 SuppShiptChgs.php:97 -#: SuppTransGLAnalysis.php:140 Tax.php:250 Z_CheckDebtorsControl.php:149 +#: SuppFixedAssetChgs.php:93 SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 +#: SupplierAllocations.php:460 SupplierAllocations.php:573 +#: SupplierAllocations.php:648 SupplierCredit.php:407 SupplierInquiry.php:209 +#: Tax.php:250 Z_CheckDebtorsControl.php:149 #: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284 #: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119 #: includes/PDFQuotationPortraitPageHeader.inc:100 -#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271 -#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 -#: ../webSHOP/includes/DisplayShoppingCart.php:8 -#: ../webSHOP/includes/PlaceOrder.php:299 +#: includes/PO_PDFOrderPageHeader.inc:81 +#: reportwriter/languages/en_US/reports.php:107 +#: ../webSHOP/includes/DisplayShoppingCart.php:7 +#: ../webSHOP/includes/PlaceOrder.php:285 #, php-format msgid "Total" msgstr "" @@ -1165,18 +1166,18 @@ #: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53 #: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112 #: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195 -#: GLTrialBalance.php:167 InternalStockRequestInquiry.php:250 -#: InternalStockRequest.php:325 InventoryPlanning.php:99 +#: GLTrialBalance.php:167 InternalStockRequest.php:325 +#: InternalStockRequestInquiry.php:250 InventoryPlanning.php:99 #: InventoryPlanning.php:176 InventoryPlanning.php:213 #: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183 #: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268 #: InventoryPlanningPrefSupplier.php:301 InventoryQuantities.php:84 -#: InventoryValuation.php:64 MailInventoryValuation.php:22 -#: MailInventoryValuation.php:120 MailSalesReport_csv.php:30 -#: MailSalesReport.php:23 MRPPlannedPurchaseOrders.php:113 +#: InventoryValuation.php:64 MRPPlannedPurchaseOrders.php:113 #: MRPPlannedWorkOrders.php:104 MRPReport.php:146 MRPReport.php:535 #: MRPReschedules.php:43 MRPReschedules.php:55 MRPShortages.php:154 -#: MRPShortages.php:166 OutstandingGRNs.php:46 OutstandingGRNs.php:59 +#: MRPShortages.php:166 MailInventoryValuation.php:22 +#: MailInventoryValuation.php:120 MailSalesReport.php:23 +#: MailSalesReport_csv.php:30 OutstandingGRNs.php:46 OutstandingGRNs.php:59 #: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244 #: PDFLowGP.php:20 PDFSalesBySalesperson.php:15 #: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33 @@ -1185,8 +1186,8 @@ #: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471 #: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531 #: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:46 -#: StockCheck.php:60 StockCheck.php:132 SupplierTenderCreate.php:671 -#: SupplierTenders.php:397 SuppPriceList.php:138 +#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138 +#: SupplierTenderCreate.php:671 SupplierTenders.php:397 #: includes/PDFPaymentRun_PymtFooter.php:152 msgid "Problem Report" msgstr "" @@ -1203,10 +1204,10 @@ #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45 #: Credit_Invoice.php:201 Dashboard.php:158 Dashboard.php:245 Dashboard.php:398 #: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187 -#: GetStockImage.php:143 GLBalanceSheet.php:116 GLBalanceSheet.php:155 -#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203 -#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170 -#: GLTrialBalance.php:182 InventoryPlanning.php:102 InventoryPlanning.php:179 +#: GLBalanceSheet.php:116 GLBalanceSheet.php:155 GLBalanceSheet.php:334 +#: GLProfit_Loss.php:191 GLProfit_Loss.php:203 GLTagProfit_Loss.php:199 +#: GLTagProfit_Loss.php:212 GLTrialBalance.php:170 GLTrialBalance.php:182 +#: GetStockImage.php:143 InventoryPlanning.php:102 InventoryPlanning.php:179 #: InventoryPlanning.php:216 InventoryPlanning.php:265 #: InventoryPlanning.php:340 InventoryPlanningPrefSupplier.php:186 #: InventoryPlanningPrefSupplier.php:244 InventoryPlanningPrefSupplier.php:271 @@ -1213,37 +1214,39 @@ #: InventoryPlanningPrefSupplier.php:304 InventoryPlanningPrefSupplier.php:372 #: InventoryQuantities.php:87 InventoryQuantities.php:98 #: InventoryValuation.php:67 InventoryValuation.php:92 -#: MailInventoryValuation.php:123 MailInventoryValuation.php:219 -#: MailInventoryValuation.php:243 MailInventoryValuation.php:251 #: MRPPlannedPurchaseOrders.php:116 MRPPlannedPurchaseOrders.php:127 #: MRPPlannedWorkOrders.php:107 MRPPlannedWorkOrders.php:118 #: MRPPlannedWorkOrders.php:309 MRPReport.php:38 MRPReport.php:49 #: MRPReport.php:149 MRPReschedules.php:46 MRPReschedules.php:58 -#: MRPShortages.php:157 MRPShortages.php:169 OutstandingGRNs.php:49 -#: OutstandingGRNs.php:62 PDFCustomerList.php:235 PDFCustomerList.php:247 -#: PDFFGLabel.php:217 PDFGLJournalCN.php:148 PDFGLJournal.php:108 -#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 -#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276 -#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83 +#: MRPShortages.php:157 MRPShortages.php:169 MailInventoryValuation.php:123 +#: MailInventoryValuation.php:219 MailInventoryValuation.php:243 +#: MailInventoryValuation.php:251 OutstandingGRNs.php:49 OutstandingGRNs.php:62 +#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFFGLabel.php:217 +#: PDFGLJournal.php:108 PDFGLJournalCN.php:148 PDFGrn.php:180 PDFLowGP.php:59 +#: PDFLowGP.php:71 PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116 +#: PDFQuotation.php:276 PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83 #: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168 #: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 #: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 -#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209 -#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 -#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256 -#: PrintCustOrder.php:238 PrintWOItemSlip.php:122 -#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 -#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503 -#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182 -#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42 -#: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 -#: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141 -#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65 -#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186 -#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171 -#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 +#: PDFStockCheckComparison.php:271 PDFWOPrint.php... [truncated message content] |
From: <rc...@us...> - 2017-06-25 02:50:31
|
Revision: 7797 http://sourceforge.net/p/web-erp/reponame/7797 Author: rchacon Date: 2017-06-25 02:50:29 +0000 (Sun, 25 Jun 2017) Log Message: ----------- Add style sections for device rendering width ranges for no responsive themes Modified Paths: -------------- trunk/css/WEBootstrap/default.css trunk/css/aguapop/default.css trunk/css/default/default.css trunk/css/fluid/default.css trunk/css/fresh/default.css trunk/css/gel/default.css trunk/css/professional/default.css trunk/css/professional-rtl/default.css trunk/css/silverwolf/default.css trunk/css/wood/default.css trunk/css/xenos/default.css trunk/doc/Change.log trunk/index.php Modified: trunk/css/WEBootstrap/default.css =================================================================== --- trunk/css/WEBootstrap/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/WEBootstrap/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -5,654 +5,650 @@ Fonts are ??px hight. Icons are 36px x 36px size. */ -/*** - -NOTE: -This CSS is not yet fully optimized. Some styles maybe redundant and not supported by some browser. +/*** +NOTE: +This CSS is not yet fully optimized. Some styles maybe redundant and not supported by some browser. + ***/ -/*** Default Styles ***/ -@import url(http://fonts.googleapis.com/css?family=Raleway); -@import url('css/custom.css'); -@import url('css/bootstrap.css'); -@import url('css/bootstrap-theme.css'); - -p.good { - font-weight:bold; - color:#28b095; -} -p.bad { - font-weight:bold; - color:rgb(203, 90, 174); -} -table { - background-color:white; - margin:0 auto; - width:100%; - /*border-collapse: collapse;*/ - border:thin outset #B3B3B3; - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') -} -table.selection { - -} -th { - border-bottom:thin solid #B3B3B3; - color:#2C2C2C; - font-weight:bold; - text-align:center; -} -th.ascending { - cursor:s-resize; -} -th.descending { - cursor:n-resize; -} -th:after { - content:""; - float:right; - margin-top:7px; - visibility:hidden; -} -th.ascending:after { - border-width:0 4px 4px; - border-style:solid; - border-color:#000 transparent; - visibility:visible; -} -th.descending:after { - border-bottom:none; - border-left:4px solid transparent; - border-right:4px solid transparent; - border-top:4px solid #000; - visibility:visible; -} -td { - padding:2px 4px; - text-align:left; - color:#575757; -} -td.select { - background-color:#eee; -} -td table { - background: #eee; -} -/* -table tr:first-child th:first-child, table tr:first-child td:first-child { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -} -table tr:first-child th:last-child, table tr:first-child td:last-child { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -} -table tr:last-child td:first-child { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -} -table tr:last-child td:last-child { - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -} -*/ -div.centre { - margin:0 auto; - text-align:center; -} -input { -} -input.image { - border-width:0px; - background-color:transparent; -} -input:hover{ -} -select { - font-family:Arial, Verdana, Helvetica, sans-serif; - font-size:12px; - border:thin solid #C3C3C3; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - padding:4px 8px; - cursor: pointer; -} -input.inputerror, input.error, select.error, select.selecterror, label.error { - color:red; - border:2px solid red; -} -input[type='text'], input[type='tel'], input[type='password'], input[type='email'] { - border:thin solid #C3C3C3; - padding:4px 8px; - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -input:required, select:required, textarea:required { - background-color:#e2f5ff; -} -input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus { - outline:none; - border-color:#2380CD; - - -moz-box-shadow: 0px 0px 5px #55B1EA; - -webkit-box-shadow: 0px 0px 5px #55B1EA; - box-shadow: 0px 0px 5px #55B1EA; -} -input[type='submit'], button { - background-color:#34a7e8; - border:thin outset #1992DA; - padding:6px 24px; - vertical-align:middle; - font-weight:bold; - color:#FFFFFF; - cursor: pointer; - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 1px #64BEF1 inset; - -webkit-box-shadow: 1px 1px 1px #64BEF1 inset; - box-shadow: 1px 1px 1px #64BEF1 inset; -} - -textarea{ - border:thin solid #C3C3C3; - padding:4px 8px; - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.EvenTableRows { - background-color:white; -} -.OddTableRows { - background-color:#CCCCCC; -} - -div.error { - color:red; -} -div.warn { - color:maroon; -} -div.success { - color:darkgreen; -} -div.info { - color:navy; -} -div.page_help_text { - background:lightgrey url(images/help.png) top left no-repeat; - border:thin solid #C3C3C3; - color:black; - float:none; - font-weight:normal; - margin:0 auto; - padding:4px 10px; - position:static; - text-align:center; - visibility:visible; - width:80%; - z-index:1; -} - -/*** Calendar picker ***/ -#calendar{ - -} -.dpTbl { - border:1px solid #C3C3C3; - -moz-box-shadow: 0px 0px 8px #999999; - -webkit-box-shadow: 0px 0px 8px #999999; - box-shadow: 0px 0px 8px #999999; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); -} -.dpTD { - border: 0; - width:25px; - text-align:right; - cursor:pointer; -} -.dpTbl button { - padding: 4px 12px; -} -.dpDayHighlight { - border: 0; - width:20px; - background-color: yellow; - text-align:right; - cursor:pointer; -} -.dpTDHover { - border: 0; - width:20px; - background-color: #E1E1E1; - text-align:right; - cursor:pointer; -} - -/* Table type is used for UI tables type 1 */ -.table1 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; -} -/* Table type is used for UI tables type 2 */ -.table2 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; -} -.tableheader { - font-weight: normal; - background-color: #777C59; -} -.notavailable { - font-weight:lighter; - font-style:italic; - color:#555555; -} -.label { - font-weight:bold; - font-style:normal; - font-size:120%; - color: #575757; -} -.table_index { - background-color: #F1FFDD; -} - - -.header { - background-image: url(""); - background-repeat: no-repeat; - background-attachment: fixed; - border: none; - margin: 0px; - padding: 0px; - background-color: #fddbdb; -} -input.inputerror { - background-color: #fddbdb; -} -textarea.texterror { - background-color: #fddbdb; -} -select.selecterror { - background-color: #fddbdb; -} -.OsRow { - background-color: #234567; - color:white; -} - -/*** CANVAS ***/ - -#CanvasDiv{ - background:#F1F1F1; - margin:0; -} - -/*** HEADER ***/ - -#HeaderDiv { - /* - overflow:hidden; REQUIRED: height according to items contained */ - color:#333333; - font-weight:bold; - padding-left:3px; - height: 44px; -} -#HeaderWrapDiv{ -} - -/*** HEADER - APP INFO ***/ - -#AppInfoDiv{ - font-family: Raleway, sans-serif; - float:left; /* REQUIRED: to the left */ - -} -#AppInfoDiv img{ - - vertical-align:middle; /* center image and text vertically */ -} -#AppInfoCompanyDiv{ - display:table-cell; /* REQUIRED: as a cell */ -} -#AppInfoUserDiv{ - display:table-cell; /* REQUIRED: as a cell */ -} -#AppInfoUserDiv a{ - text-decoration:none; - color:#333333; - font-weight:bold; -} -#AppInfoUserDiv a:hover{ - text-decoration:none; -} -#AppInfoModuleDiv{ -} - -/*** HEADER - QUICK MENU ***/ - -#QuickMenuDiv{ - width: auto; - border-bottom: 3px solid #47c9af; - font-family: Raleway, sans-serif; - line-height: 1; -} -#QuickMenuDiv ul{ - -} -#QuickMenuDiv li{ - -} - -/*** links as buttons!!! clicking anywhere in the button will activate - the link!!! ***HJ***/ - -#QuickMenuDiv li a{ - margin: 0; - padding: 0; - border: 0; - list-style: none; - line-height: 1; - display: block; - position: relative; - z-index: 2; - padding: 10px; - font-size: 25px; - font-weight: 400; - text-decoration: none; - color: #444444; - -webkit-transition: all .2s ease; - -moz-transition: all .2s ease; - -o-transition: all .2s ease; - transition: all .2s ease; - margin-right: -4px; -} -#QuickMenuDiv li:first-child a{ - -} -#QuickMenuDiv li:last-child a{ - -} -#QuickMenuDiv li a:hover{ - background-color:#47c9af; - border-radius:18px 18px 0 0; -padding-bottom:1px; -border-bottom:17px; -border-bottom-color:rgba(114, 51, 98, 1.00); -border-bottom-style:solid; - -} - -/*** BODY ***/ -#BodyWrapDiv{ -margin-left:-20px; -} -#BodyDiv { - font-family: Raleway, sans-serif; - clear:right; /* REQUIRED */ - overflow:hidden; /* REQUIRED */ - color:black; - background:#F1F1F1; - padding:5px; - text-align:center; - min-height: 440px; -} -#BodyDiv table { - width:auto; /* automatic width */ - margin:0 auto; - margin-bottom:10px; - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') -} -#BodyDiv table.selection { - background-color:white; - border:thin outset #D2D2D2; - padding:5px 0 0 10px; - position: center fixed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') -} - -/*** BODY - MAIN MENU ***/ -@media (min-width: 998px) { - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } -} -#MainMenuDiv{ - margin-top:5px; - font-family: Raleway, sans-serif; -} - -#MainMenuDiv ul{ - list-style:none; /* REQUIRED: hide bullets */ - padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ - margin:0; -} -#MainMenuDiv li{ - list-style:none; /* REQUIRED */ - padding:0; /* REQUIRED */ -} - #MainMenuDiv li a { /* link as button!!! not-pressed state */ - background-color: #47c9af; - background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); - background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - border-bottom: 1px solid rgba(255,255,255,.1); - box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); - color: rgb(255,255,255); - display: block; - font-size: 1.5rem; - font-weight: 500; - height: 50px; - text-decoration: none; - letter-spacing: .2rem; - line-height: 50px; - /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ - text-transform: uppercase; - transition: all .1s ease; - } - - - -#MainMenuDiv li:first-child a { - border-top: none; -} -#MainMenuDiv li a:hover{ /* link as button!!! pressed state */ - background-color: rgb(114, 51, 98); - background-image: -webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - cursor: pointer; -} -#MainMenuDiv .main_menu_selected a{ /* the selected button */ - /*border:thin inset #191919;*/ - background:#2A2A2A; - border-bottom:thin solid #191919; -} -#MainMenuDiv .main_menu_selected a:hover{ - background:#2A2A2A; -} - -/*** BODY - SUB MENU ***/ - -#SubMenuDiv{ - margin-top: 5px; -} -#SubMenuDiv a:link, a:visited{ - color:#0088CD; - text-decoration:none; -} -#SubMenuDiv a:hover{ - color:#0088CD; - text-decoration:none; -} -#SubMenuDiv ul{ - list-style-type:none; - padding:0; - margin:0; -} -#SubMenuDiv li{ - padding:2px; - color:#333333; -} -#SubMenuDiv li img{ - vertical-align:middle; /* verticall align icon with the text */ -} -#SubMenuDiv .menu_group_headers { - border-bottom:thin solid #DADADA; - text-align:center; - color:#2C2C2C; +/*** Default Styles ***/ +@import url(http://fonts.googleapis.com/css?family=Raleway); +@import url('css/custom.css'); +@import url('css/bootstrap.css'); +@import url('css/bootstrap-theme.css'); + +p.good { + font-weight:bold; + color:#28b095; } +p.bad { + font-weight:bold; + color:rgb(203, 90, 174); +} +table { + background-color:white; + margin:0 auto; + width:100%; + /*border-collapse: collapse;*/ + border:thin outset #B3B3B3; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') +} +table.selection { + +} +th { + border-bottom:thin solid #B3B3B3; + color:#2C2C2C; + font-weight:bold; + text-align:center; +} +th.ascending { + cursor:s-resize; +} +th.descending { + cursor:n-resize; +} +th:after { + content:""; + float:right; + margin-top:7px; + visibility:hidden; +} +th.ascending:after { + border-width:0 4px 4px; + border-style:solid; + border-color:#000 transparent; + visibility:visible; +} +th.descending:after { + border-bottom:none; + border-left:4px solid transparent; + border-right:4px solid transparent; + border-top:4px solid #000; + visibility:visible; +} +td { + padding:2px 4px; + text-align:left; + color:#575757; +} +td.select { + background-color:#eee; +} +td table { + background: #eee; +} +/* +table tr:first-child th:first-child, table tr:first-child td:first-child { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; +} +table tr:first-child th:last-child, table tr:first-child td:last-child { + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; +} +table tr:last-child td:first-child { + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; +} +table tr:last-child td:last-child { + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; +} +*/ +div.centre { + margin:0 auto; + text-align:center; +} +input { +} +input.image { + border-width:0px; + background-color:transparent; +} +input:hover{ +} +select { + font-family:Arial, Verdana, Helvetica, sans-serif; + font-size:12px; + border:thin solid #C3C3C3; + -webkit-border-radius:4px; + -moz-border-radius:4px; + border-radius:4px; + padding:4px 8px; + cursor: pointer; +} +input.inputerror, input.error, select.error, select.selecterror, label.error { + color:red; + border:2px solid red; +} +input[type='text'], input[type='tel'], input[type='password'], input[type='email'] { + border:thin solid #C3C3C3; + padding:4px 8px; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +input:required, select:required, textarea:required { + background-color:#e2f5ff; +} +input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus { + outline:none; + border-color:#2380CD; + + -moz-box-shadow: 0px 0px 5px #55B1EA; + -webkit-box-shadow: 0px 0px 5px #55B1EA; + box-shadow: 0px 0px 5px #55B1EA; +} +input[type='submit'], button { + background-color:#34a7e8; + border:thin outset #1992DA; + padding:6px 24px; + vertical-align:middle; + font-weight:bold; + color:#FFFFFF; + cursor: pointer; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 1px #64BEF1 inset; + -webkit-box-shadow: 1px 1px 1px #64BEF1 inset; + box-shadow: 1px 1px 1px #64BEF1 inset; +} + +textarea{ + border:thin solid #C3C3C3; + padding:4px 8px; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.EvenTableRows { + background-color:white; +} +.OddTableRows { + background-color:#CCCCCC; +} + +div.error { + color:red; +} +div.warn { + color:maroon; +} +div.success { + color:darkgreen; +} +div.info { + color:navy; +} +div.page_help_text { + background:lightgrey url(images/help.png) top left no-repeat; + border:thin solid #C3C3C3; + color:black; + float:none; + font-weight:normal; + margin:0 auto; + padding:4px 10px; + position:static; + text-align:center; + visibility:visible; + width:80%; + z-index:1; +} + +/*** Calendar picker ***/ +#calendar{ + +} +.dpTbl { + border:1px solid #C3C3C3; + -moz-box-shadow: 0px 0px 8px #999999; + -webkit-box-shadow: 0px 0px 8px #999999; + box-shadow: 0px 0px 8px #999999; + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); +} +.dpTD { + border: 0; + width:25px; + text-align:right; + cursor:pointer; +} +.dpTbl button { + padding: 4px 12px; +} +.dpDayHighlight { + border: 0; + width:20px; + background-color: yellow; + text-align:right; + cursor:pointer; +} +.dpTDHover { + border: 0; + width:20px; + background-color: #E1E1E1; + text-align:right; + cursor:pointer; +} + +/* Table type is used for UI tables type 1 */ +.table1 { + width:90%; + background: #eee; + border: 0px 0px 2px 2px #222 solid; + margin: 0 auto; +} +/* Table type is used for UI tables type 2 */ +.table2 { + width:90%; + background: #eee; + border: 0px 0px 2px 2px #222 solid; + margin: 0 auto; +} +.tableheader { + font-weight: normal; + background-color: #777C59; +} +.notavailable { + font-weight:lighter; + font-style:italic; + color:#555555; +} +.label { + font-weight:bold; + font-style:normal; + font-size:120%; + color: #575757; +} +.table_index { + background-color: #F1FFDD; +} + + +.header { + background-image: url(""); + background-repeat: no-repeat; + background-attachment: fixed; + border: none; + margin: 0px; + padding: 0px; + background-color: #fddbdb; +} +input.inputerror { + background-color: #fddbdb; +} +textarea.texterror { + background-color: #fddbdb; +} +select.selecterror { + background-color: #fddbdb; +} +.OsRow { + background-color: #234567; + color:white; +} + +/*** CANVAS ***/ + +#CanvasDiv{ + background:#F1F1F1; + margin:0; +} + +/*** HEADER ***/ + +#HeaderDiv { + /* + overflow:hidden; REQUIRED: height according to items contained */ + color:#333333; + font-weight:bold; + padding-left:3px; + height: 44px; +} +#HeaderWrapDiv{ +} + +/*** HEADER - APP INFO ***/ + +#AppInfoDiv{ + font-family: Raleway, sans-serif; + float:left; /* REQUIRED: to the left */ + +} +#AppInfoDiv img{ + + vertical-align:middle; /* center image and text vertically */ +} +#AppInfoCompanyDiv{ + display:table-cell; /* REQUIRED: as a cell */ +} +#AppInfoUserDiv{ + display:table-cell; /* REQUIRED: as a cell */ +} +#AppInfoUserDiv a{ + text-decoration:none; + color:#333333; + font-weight:bold; +} +#AppInfoUserDiv a:hover{ + text-decoration:none; +} +#AppInfoModuleDiv{ +} + +/*** HEADER - QUICK MENU ***/ + +#QuickMenuDiv { + border-bottom: 3px solid #47c9af; + font-family: Raleway, sans-serif; + line-height: 1; + width: auto; +} +#QuickMenuDiv ul { +} +#QuickMenuDiv li { +} + +/*** links as buttons!!! clicking anywhere in the button will activate + the link!!! ***HJ***/ + +#QuickMenuDiv li a { + border: 0; + color: #444444; + display: block; + font-size: 25px; + font-weight: 400; + line-height: 1; + list-style: none; + margin: 0; + margin-right: -4px; + padding: 0; + padding: 10px; + position: relative; + text-decoration: none; + z-index: 2; + -webkit-transition: all .2s ease; + -moz-transition: all .2s ease; + -o-transition: all .2s ease; + transition: all .2s ease; +} +#QuickMenuDiv li:first-child a{ + +} +#QuickMenuDiv li:last-child a{ + +} +#QuickMenuDiv li a:hover { + background-color:#47c9af; + border-bottom:17px; + border-bottom-color:rgba(114, 51, 98, 1.00); + border-bottom-style:solid; + border-radius:18px 18px 0 0; + padding-bottom:1px; +} + +/*** BODY ***/ +#BodyWrapDiv{ + margin-left:-20px; +} +#BodyDiv { + background:#F1F1F1; + clear:right; /* REQUIRED */ + color:black; + font-family: Raleway, sans-serif; + min-height: 440px; + overflow:hidden; /* REQUIRED */ + padding:5px; + text-align:center; +} +#BodyDiv table { + width:auto; /* automatic width */ + margin:0 auto; + margin-bottom:10px; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') +} +#BodyDiv table.selection { + background-color:white; + border:thin outset #D2D2D2; + padding:5px 0 0 10px; + position: center fixed; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') +} + +/*** BODY - MAIN MENU ***/ +@media (min-width: 998px) { + .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } +} +#MainMenuDiv{ + font-family:Raleway, sans-serif; + margin-top:5px; +} + +#MainMenuDiv ul{ + list-style:none; /* REQUIRED: hide bullets */ + padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ + margin:0; +} +#MainMenuDiv li{ + list-style:none; /* REQUIRED */ + padding:0; /* REQUIRED */ +} +#MainMenuDiv li a { /* link as button!!! not-pressed state */ + background-color: #47c9af; + background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); + background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + border-bottom: 1px solid rgba(255,255,255,.1); + box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); + color: rgb(255,255,255); + display:block; + font-size:1.5rem; + font-weight:500; + height:50px; + letter-spacing: .2rem; + line-height:50px; + text-decoration:none; + /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ + text-transform: uppercase; + transition: all .1s ease; +} + + + +#MainMenuDiv li:first-child a { + border-top: none; +} +#MainMenuDiv li a:hover{ /* link as button!!! pressed state */ + background-color: rgb(114, 51, 98); + background-image: -webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image: -moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image: -o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image: linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + cursor: pointer; +} +#MainMenuDiv .main_menu_selected a{ /* the selected button */ + /*border:thin inset #191919;*/ + background:#2A2A2A; + border-bottom:thin solid #191919; +} +#MainMenuDiv .main_menu_selected a:hover{ + background:#2A2A2A; +} + +/*** BODY - SUB MENU ***/ + +#SubMenuDiv{ +} +#SubMenuDiv a:link, a:visited { + color:#0088CD; + text-decoration:none; +} +#SubMenuDiv a:hover { + color:#0088CD; + text-decoration:none; +} +#SubMenuDiv ul { + list-style-type:none; + margin:0; + padding:0; +} +#SubMenuDiv li { + padding:2px; + color:#333333; +} +#SubMenuDiv li img{ + vertical-align:middle; /* verticall align icon with the text */ +} +#SubMenuDiv .menu_group_headers { + border-bottom:thin solid #DADADA; + color:#2C2C2C; + text-align:center; +} #TransactionsDiv, #InquiriesDiv, -#MaintenanceDiv { - margin-left:-10px; - margin-top:5px; -} -#InquiriesDiv div{ /* default div, used for custom report header */ -} -#InquiriesDiv body{ -.menu_group_item p { - color:transparent; /* buttets color */ - margin:4px 0 0 0; -} - -/*** FOOTER ***/ - -#FooterDiv{ - font-family: Raleway, sans-serif; - clear:both; /* REQUIRED */ - color:#999999; - margin:auto; - overflow:hidden; - width:98.6%; -} -#FooterDiv a{ - text-decoration:underline; - color:#999999; -} -#FooterWrapDiv{ - overflow:hidden; - padding:3px; -} -#FooterLogoDiv{ - float:right; /* right side */ - padding:2px; -} -#FooterLogoDiv img { - vertical-align:middle; -} -#FooterVersionDiv{ - float:left; /* left side */ - margin-top:3px; -} -#FooterTimeDiv{ - clear:left; /* below */ -} -#Report { - /* Division id for reports. */} -#Report table { - /* Body of a report formatted with table tag. */ -} -.centre { - text-align:center; - /* Class selector to horizontal align a text (centre) in an element. */ -} -.number { - text-align:right; - /* Class selector to horizontal align a number (right) in an element. */ -} -.text { - text-align:left; - /* Class selector to horizontal align a text (left) in an element. */ -} -.page_title_text { - color:black; - font-size:18px; - margin:10px auto; - padding-bottom:2px; - padding-top:2px; - text-align:center; - width:60%; - /* Class selector for page title. */ -} - - @media (min-width: 1098px){ - .navbar-toggle { - display: none; - position: relative; - float: right; - padding: 9px 15px 1px 15px; - margin: 0; - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); - border-radius:70px; - -} - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } -} -.navbar-toggle { - position: relative; - float: right; - padding: 9px 15px 1px 15px; - margin: 0; - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); - border-radius:70px; -} -.glyphicon.glyphicon-th { - font-size: 30px; -} - - -/* END Style for all. ********************************************************/ +#MaintenanceDiv { + margin-left:-10px; + margin-top:5px; +} +#InquiriesDiv div{ /* default div, used for custom report header */ +} +#InquiriesDiv body{ +.menu_group_item p { + color:transparent; /* buttets color */ + margin:4px 0 0 0; +} + +/*** FOOTER ***/ + +#FooterDiv { + clear:both; /* REQUIRED */ + color:#999999; + font-family: Raleway, sans-serif; + margin:auto; + overflow:hidden; + width:98.6%; +} +#FooterDiv a { + color:#999999; + text-decoration:underline; +} +#FooterWrapDiv { + overflow:hidden; + padding:3px; +} +#FooterLogoDiv{ + float:right; /* right side */ + padding:2px; +} +#FooterLogoDiv img { + vertical-align:middle; +} +#FooterVersionDiv{ + float:left; /* left side */ + margin-top:3px; +} +#FooterTimeDiv{ + clear:left; /* below */ +} +#Report { + /* Division id for reports. */} +#Report table { + /* Body of a report formatted with table tag. */ +} +.centre { + text-align:center; + /* Class selector to horizontal align a text (centre) in an element. */ +} +.number { + text-align:right; + /* Class selector to horizontal align a number (right) in an element. */ +} +.text { + text-align:left; + /* Class selector to horizontal align a text (left) in an element. */ +} +.page_title_text { + color:black; + font-size:18px; + margin:10px auto; + padding-bottom:2px; + padding-top:2px; + text-align:center; + width:60%; + /* Class selector for page title. */ +} + +@media (min-width:1098px) { + .navbar-toggle { + background-color: #47c9af; + border: 3px solid rgba(114, 51, 98, 1.00); + border-radius:70px; + display:none;/* ? */ + float:right; + margin:0; + padding:9px 15px 1px 15px; + position:relative; + } + .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } +} + +.navbar-toggle { + background-color: #47c9af; + border: 3px solid rgba(114, 51, 98, 1.00); + border-radius:70px; + float:right; + margin:0; + padding:9px 15px 1px 15px; + position:relative; +} +.glyphicon.glyphicon-th { + font-size:30px; +} + + +/* END Style for all. ********************************************************/ Modified: trunk/css/aguapop/default.css =================================================================== --- trunk/css/aguapop/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/aguapop/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -500,5 +500,24 @@ padding:5px; text-align:center; /* Class selector for page title. */ -} -/* END Style for all. ********************************************************/ +} +/* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/default/default.css =================================================================== --- trunk/css/default/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/default/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -538,7 +538,6 @@ text-align:center; /* Class selector for page title. */ } - /* END Style for all. ********************************************************/ @@ -545,15 +544,17 @@ /* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ @media only screen and (max-device-width:767px) { - /* Style for new browser in a device with a rendering width less than 768px. */ + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ } -@media only screen and (min-device-width:768px) and (max-device-width:1023px) { - /* Style for new browser in a device with a rendering width between 768px and 1024px. */ +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ } -@media only screen and (min-device-width:1024px) { - /* Style for new browser in a device with a rendering width greater than 1024px. */ +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ } - +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/fluid/default.css =================================================================== --- trunk/css/fluid/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/fluid/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -397,5 +397,23 @@ text-align:center; /* Class selector for page title. */ } +/* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ } -/* END Style for all. ********************************************************/ + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/fresh/default.css =================================================================== --- trunk/css/fresh/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/fresh/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -512,3 +512,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/gel/default.css =================================================================== --- trunk/css/gel/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/gel/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -553,3 +553,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/professional/default.css =================================================================== --- trunk/css/professional/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/professional/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -532,3 +532,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/professional-rtl/default.css =================================================================== --- trunk/css/professional-rtl/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/professional-rtl/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -550,3 +550,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/silverwolf/default.css =================================================================== --- trunk/css/silverwolf/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/silverwolf/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -520,3 +520,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/wood/default.css =================================================================== --- trunk/css/wood/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/wood/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -582,5 +582,24 @@ padding:5px; text-align:center; /* Class selector for page title. */ -} -/* END Style for all. ********************************************************/ +} +/* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/css/xenos/default.css =================================================================== --- trunk/css/xenos/default.css 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/css/xenos/default.css 2017-06-25 02:50:29 UTC (rev 7797) @@ -652,3 +652,22 @@ /* Class selector for page title. */ } /* END Style for all. ********************************************************/ + + +/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */ + +@media only screen and (max-device-width:767px) { + /* Style for new browser in a device with a rendering width less than 768px (xs - Extra small devices - Phones). */ +} + +@media only screen and (min-device-width:768px) and (max-device-width:991px) { + /* Style for new browser in a device with a rendering width between 768px and 992px (sm - Small devices - Tablets). */ +} + +@media only screen and (min-device-width:992px) and (max-device-width:1199px) { + /* Style for new browser in a device with a rendering width between 992px and 1200px (md - Medium devices - Desktops). */ +} + +@media only screen and (min-device-width:1200px) { + /* Style for new browser in a device with a rendering width greater than 1200px (lg - Large devices - Larger desktops). */ +} Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/doc/Change.log 2017-06-25 02:50:29 UTC (rev 7797) @@ -1,5 +1,6 @@ webERP Change Log +24/06/22 RChacon: Add style sections for device rendering width ranges for no responsive themes. 23/06/22 RChacon: Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy. 22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php. 21/06/17 RChacon: Add meta viewport for initial-scale=1 for working css in small devices. Modified: trunk/index.php =================================================================== --- trunk/index.php 2017-06-24 00:07:15 UTC (rev 7796) +++ trunk/index.php 2017-06-25 02:50:29 UTC (rev 7797) @@ -58,23 +58,17 @@ $_SESSION['Module'] = $_GET['Application']; } -//=== MainMenuDiv ======================================================================= +// BEGIN MainMenuDiv =========================================================== +// Option 1: echo '<div class="row well sidebar-nav ">'; echo '<div class="col-md-3">'; - - - - - - - - - - - - echo '<div id="MainMenuDiv" class= "collapse navbar-collapse navbar-bootsnipp-collapse sidebar-navbar-collapse ">'; echo '<ul class="nav">'; //===HJ=== +/* +// Option 2: +echo '<div id="MainMenuDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="nav">'; +*/ + $i=0; while ($i < count($ModuleLink)){ // This determines if the user has display access to the module see config.php and header.php @@ -101,9 +95,9 @@ //=== SubMenuDiv (wrapper) ============================================================================== echo '<div id="SubMenuDiv">'; //===HJ=== +// BEGIN TransactionsDiv ======================================================= +echo '<div id="TransactionsDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; -echo '<div id="TransactionsDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== TransactionsDiv === - echo '<li class="menu_group_headers">'; //=== SubMenuHeader === if ($_SESSION['Module']=='system') { $Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/company.png" title="' . _('General Setup Options') . '" alt="' . _('General Setup Options') . '" /><b>' . _('General Setup Options') . '</b>'; @@ -126,7 +120,8 @@ } $i++; } -echo '</ul></div>'; //=== TransactionsDiv === +echo '</ul></div>'; +// END TransactionsDiv ========================================================= echo '<div id="InquiriesDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== InquiriesDiv === |
From: <dai...@us...> - 2017-06-24 00:07:22
|
Revision: 7796 http://sourceforge.net/p/web-erp/reponame/7796 Author: daintree Date: 2017-06-24 00:07:15 +0000 (Sat, 24 Jun 2017) Log Message: ----------- check favourites table exists before using it Modified Paths: -------------- trunk/includes/GetConfig.php trunk/includes/Z_POSDataCreation.php trunk/includes/session.php trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po trunk/sql/mysql/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql trunk/sql/mysql/upgrade4.13.1-4.14.sql Modified: trunk/includes/GetConfig.php =================================================================== --- trunk/includes/GetConfig.php 2017-06-23 02:10:22 UTC (rev 7795) +++ trunk/includes/GetConfig.php 2017-06-24 00:07:15 UTC (rev 7796) @@ -115,9 +115,19 @@ $_SESSION['SMTPSettings']['timeout']=$myrow['timeout']; $_SESSION['SMTPSettings']['auth']=$myrow['auth']; } - //Add favorite scripts + //Add favorite scripts + //Check that the favourites table exists (upgrades will choke otherwise) + $sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'"; - $result = DB_query($sql); + $result = DB_query($sql,'','',false,false); + if (DB_error_no()!=0) { + $result = DB_query("CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '', + caption varchar(50) NOT NULL DEFAULT '', + href varchar(200) NOT NULL DEFAULT '#', + PRIMARY KEY (userid,caption)) + Engine=InnoDB DEFAULT CHARSET=utf8"); + $result = DB_query($sql); + } if (DB_num_rows($result)>0) { while ($myrow = DB_fetch_array($result)) { $_SESSION['Favourites'][$myrow['href']] = $myrow['caption']; Modified: trunk/includes/Z_POSDataCreation.php =================================================================== --- trunk/includes/Z_POSDataCreation.php 2017-06-23 02:10:22 UTC (rev 7795) +++ trunk/includes/Z_POSDataCreation.php 2017-06-24 00:07:15 UTC (rev 7796) @@ -122,11 +122,13 @@ fwrite($FileHandle,"DELETE FROM stockmaster;\n"); - $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0"); + //$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0"); + $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory, controlled FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0"); + while ($myrow = DB_fetch_array($result)) { - fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape(str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "', '" . SQLite_Escape($myrow['discountcategory']) . "');\n"); + fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape(str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "', '" . SQLite_Escape($myrow['discountcategory']) . "', '" . $myrow['controlled'] . "' );\n"); } fwrite($FileHandle,"DELETE FROM prices;\n"); Modified: trunk/includes/session.php =================================================================== --- trunk/includes/session.php 2017-06-23 02:10:22 UTC (rev 7795) +++ trunk/includes/session.php 2017-06-24 00:07:15 UTC (rev 7796) @@ -115,7 +115,7 @@ $result = DB_query($sqli); } } else { - + $sqli = "INSERT INTO favourites(href,caption,userid) VALUES "; $k = 0; foreach ($_SESSION['Favourites'] as $url=>$ttl) { @@ -129,7 +129,7 @@ $result = DB_query($sqli); } } -} + } header('Location: index.php'); } elseif (isset($AllowAnyone)){ /* only do security checks if AllowAnyone is not true */ Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-06-23 02:10:22 UTC (rev 7795) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-06-24 00:07:15 UTC (rev 7796) @@ -295,6 +295,7 @@ #: AccountGroups.php:476 AddCustomerContacts.php:165 #: AddCustomerContacts.php:275 AddCustomerContacts.php:279 #: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898 +#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795 #: CompanyPreferences.php:423 CompanyPreferences.php:425 #: CompanyPreferences.php:438 CompanyPreferences.php:440 #: CompanyPreferences.php:453 CompanyPreferences.php:455 @@ -344,20 +345,20 @@ #: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672 #: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780 #: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849 -#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090 -#: SystemParameters.php:1100 SystemParameters.php:1102 -#: SystemParameters.php:1156 SystemParameters.php:1168 -#: SystemParameters.php:1170 SystemParameters.php:1208 -#: SystemParameters.php:1210 SystemParameters.php:1232 -#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314 -#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532 -#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924 -#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196 -#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224 -#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718 -#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749 -#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767 -#: reportwriter/languages/en_US/reports.php:114 +#: SystemParameters.php:945 SystemParameters.php:1088 +#: SystemParameters.php:1090 SystemParameters.php:1100 +#: SystemParameters.php:1102 SystemParameters.php:1156 +#: SystemParameters.php:1168 SystemParameters.php:1170 +#: SystemParameters.php:1208 SystemParameters.php:1210 +#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311 +#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304 +#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 +#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187 +#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212 +#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547 +#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734 +#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764 +#: WWW_Users.php:767 msgid "Yes" msgstr "موافق" @@ -415,21 +416,20 @@ #: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673 #: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781 #: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850 -#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091 -#: SystemParameters.php:1099 SystemParameters.php:1103 -#: SystemParameters.php:1157 SystemParameters.php:1167 -#: SystemParameters.php:1171 SystemParameters.php:1207 -#: SystemParameters.php:1211 SystemParameters.php:1231 -#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315 -#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535 -#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925 -#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199 -#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223 -#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717 -#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748 -#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766 -#: includes/PDFLowGPPageHeader.inc:44 -#: reportwriter/languages/en_US/reports.php:82 +#: SystemParameters.php:946 SystemParameters.php:1087 +#: SystemParameters.php:1091 SystemParameters.php:1099 +#: SystemParameters.php:1103 SystemParameters.php:1157 +#: SystemParameters.php:1167 SystemParameters.php:1171 +#: SystemParameters.php:1207 SystemParameters.php:1211 +#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312 +#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306 +#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866 +#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189 +#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211 +#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546 +#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733 +#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763 +#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44 msgid "No" msgstr "ﻻ" @@ -507,7 +507,6 @@ #: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865 #: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392 #: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99 -#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "حذف" @@ -781,16 +780,17 @@ #: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639 #: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593 #: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679 -#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99 -#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788 -#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090 -#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290 -#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184 -#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25 -#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85 +#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 +#: PrintCustStatements.php:99 PrintCustTrans.php:740 +#: PrintCustTransPortrait.php:788 PrintCustTransPortrait.php:1034 +#: PrintCustTransPortrait.php:1090 SelectCustomer.php:408 +#: SelectCustomer.php:730 SelectSupplier.php:290 SupplierContacts.php:156 +#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:333 +#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:76 +#: includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19 -#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 -#: ../webSHOP/Register.php:595 +#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443 +#: ../webSHOP/Register.php:608 msgid "Email" msgstr "" @@ -835,16 +835,17 @@ msgstr "" #: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239 -#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610 +#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623 msgid "Contact Name" msgstr "" #: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247 #: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246 -#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395 -#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84 -#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389 -#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 +#: SelectCustomer.php:406 SelectOrderItems.php:626 +#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72 +#: includes/PDFTransPageHeader.inc:84 +#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:537 +#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737 msgid "Phone" msgstr "" @@ -916,7 +917,6 @@ #: includes/PDFQuotationPortraitPageHeader.inc:80 #: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:62 -#: reportwriter/languages/en_US/reports.php:64 msgid "Date" msgstr "" @@ -1028,7 +1028,6 @@ #: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45 #: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28 #: includes/MainMenuLinksArray.php:24 -#: reportwriter/languages/en_US/reports.php:243 msgid "Inventory" msgstr "" @@ -1037,13 +1036,14 @@ msgstr "" #: AgedControlledInventory.php:42 MRPReschedules.php:124 MRPShortages.php:260 -#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103 +#: StockClone.php:53 Stocks.php:63 msgid "Stock" msgstr "" #: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37 #: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109 -#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53 +#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 BOMs_SingleLevel.php:558 +#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:53 #: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353 #: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2102 #: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243 @@ -1092,8 +1092,8 @@ #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 -#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12 -#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236 +#: includes/PDFTransPageHeaderPortrait.inc:256 api/api_xml-rpc.php:3489 +#: ../webSHOP/includes/PlaceOrder.php:250 msgid "Description" msgstr "" @@ -1140,10 +1140,10 @@ #: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284 #: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119 #: includes/PDFQuotationPortraitPageHeader.inc:100 -#: includes/PO_PDFOrderPageHeader.inc:81 -#: reportwriter/languages/en_US/reports.php:107 -#: ../webSHOP/includes/DisplayShoppingCart.php:7 -#: ../webSHOP/includes/PlaceOrder.php:285 +#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271 +#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 +#: ../webSHOP/includes/DisplayShoppingCart.php:8 +#: ../webSHOP/includes/PlaceOrder.php:299 #, php-format msgid "Total" msgstr "" @@ -1244,9 +1244,6 @@ #: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 #: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383 #: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 #: includes/PDFPaymentRun_PymtFooter.php:59 #: includes/PDFPaymentRun_PymtFooter.php:89 #: includes/PDFPaymentRun_PymtFooter.php:119 @@ -1253,6 +1250,9 @@ #: includes/PDFPaymentRun_PymtFooter.php:156 #: includes/PDFPaymentRun_PymtFooter.php:187 #: includes/PDFPaymentRun_PymtFooter.php:218 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 msgid "Back to the menu" msgstr "" @@ -1303,9 +1303,10 @@ #: includes/PDFPaymentRun_PymtFooter.php:91 #: includes/PDFPaymentRun_PymtFooter.php:121 #: includes/PDFPaymentRun_PymtFooter.php:158 -#: includes/PDFPaymentRun_PymtFooter.php:189 +#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:70 +#: includes/ConnectDB_mysql.inc:62 #: ../webSHOP/includes/DatabaseFunctions.php:60 -#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70 +#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68 msgid "The SQL that failed was" msgstr "" @@ -1462,7 +1463,7 @@ #: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188 #: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194 #: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230 -#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:41 +#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:40 msgid "N/A" msgstr "" @@ -1472,12 +1473,13 @@ msgid "Horizontal Analysis of Statement of Comprehensive Income" msgstr "" -#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14 -#: Z_UpdateChartDetailsBFwd.php:14 +#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 +#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14 msgid "The selected period from is actually after the period to" msgstr "" -#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14 +#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 +#: GLTagProfit_Loss.php:14 msgid "Please reselect the reporting period" msgstr "" @@ -1558,25 +1560,25 @@ msgid "Show on Screen (HTML)" msgstr "" -#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577 -#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 +#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 +#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 msgid "A period up to 12 months in duration can be specified" msgstr "" -#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577 -#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 +#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 +#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 msgid "" "the system automatically shows a comparative for the same period from the " "previous year" msgstr "" -#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577 -#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 +#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 +#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 msgid "it cannot do this if a period of more than 12 months is specified" msgstr "" -#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577 -#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 +#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 +#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480 msgid "Please select an alternative period range" msgstr "" @@ -1917,13 +1919,13 @@ #: StockLocStatus.php:94 StockLocStatus.php:99 StockLocStatus.php:104 #: StockLocStatus.php:109 StockQuantityByDate.php:25 SupplierPriceList.php:27 #: SupplierPriceList.php:29 SupplierTenderCreate.php:683 -#: SupplierTenderCreate.php:685 SupplierTenders.php:409 SupplierTenders.php:411 -#: SupplierTransInquiry.php:31 SystemParameters.php:1119 -#: SystemParameters.php:1125 SystemParameters.php:1131 -#: SystemParameters.php:1137 SystemParameters.php:1143 TopItems.php:32 -#: TopItems.php:49 TopItems.php:71 TopItems.php:73 WorkOrderEntry.php:903 -#: WorkOrderEntry.php:906 WorkOrderIssue.php:964 WorkOrderIssue.php:967 -#: reportwriter/languages/en_US/reports.php:54 +#: SupplierTenderCreate.php:685 SupplierTenders.php:409 +#: SupplierTenders.php:411 SupplierTransInquiry.php:31 +#: SystemParameters.php:1119 SystemParameters.php:1125 +#: SystemParameters.php:1131 SystemParameters.php:1137 +#: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71 +#: TopItems.php:73 WorkOrderEntry.php:903 WorkOrderEntry.php:906 +#: WorkOrderIssue.php:964 WorkOrderIssue.php:967 msgid "All" msgstr "" @@ -1971,7 +1973,6 @@ #: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57 #: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:12 #: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152 -#: reportwriter/languages/en_US/reports.php:111 msgid "Type" msgstr "" @@ -1980,7 +1981,7 @@ msgstr "" #: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777 -#: api/api_xml-rpc.php:2187 reportwriter/languages/en_US/reports.php:72 +#: api/api_xml-rpc.php:2187 msgid "Field Name" msgstr "" @@ -2040,7 +2041,6 @@ #: SalesInquiry.php:798 SalesInquiry.php:1107 StockDispatch.php:515 #: StockLocTransferReceive.php:106 SupplierTransInquiry.php:56 #: includes/PO_PDFOrderPageHeader.inc:40 -#: reportwriter/languages/en_US/reports.php:105 msgid "To" msgstr "" @@ -2925,7 +2925,8 @@ #: includes/PDFInventoryValnPageHeader.inc:39 #: includes/PDFOrderPageHeader_generic.inc:93 #: includes/PDFPeriodStockTransListingPageHeader.inc:50 -#: includes/PDFPickingListHeader.inc:74 includes/PDFQuotationPageHeader.inc:108 +#: includes/PDFPickingListHeader.inc:74 +#: includes/PDFQuotationPageHeader.inc:108 #: includes/PDFQuotationPortraitPageHeader.inc:95 #: includes/PDFSalesOrder_generic.inc:95 #: includes/PDFSellThroughSupportClaimPageHeader.inc:27 @@ -2995,9 +2996,11 @@ #: includes/PDFLowGPPageHeader.inc:16 #: includes/PDFOrderPageHeader_generic.inc:79 #: includes/PDFOstdgGRNsPageHeader.inc:16 -#: includes/PDFPaymentRunPageHeader.inc:11 includes/PDFPickingListHeader.inc:48 +#: includes/PDFPaymentRunPageHeader.inc:11 +#: includes/PDFPickingListHeader.inc:48 #: includes/PDFProfitAndLossPageHeader.inc:27 -#: includes/PDFSalesAnalPageHeader.inc:15 includes/PDFSalesOrder_generic.inc:81 +#: includes/PDFSalesAnalPageHeader.inc:15 +#: includes/PDFSalesOrder_generic.inc:81 #: includes/PDFSellThroughSupportClaimPageHeader.inc:16 #: includes/PDFStockCheckPageHeader.inc:12 #: includes/PDFStockComparisonPageHeader.inc:12 @@ -3004,11 +3007,11 @@ #: includes/PDFStockLocTransferHeader.inc:25 #: includes/PDFStockNegativesHeader.inc:12 #: includes/PDFStockTransferHeader.inc:16 -#: includes/PDFSupplierBalsPageHeader.inc:20 includes/PDFTabReportHeader.inc:15 +#: includes/PDFSupplierBalsPageHeader.inc:20 +#: includes/PDFTabReportHeader.inc:15 #: includes/PDFTagProfitAndLossPageHeader.inc:29 #: includes/PDFTaxPageHeader.inc:27 includes/PDFTopItemsHeader.inc:34 #: includes/PDFTrialBalancePageHeader.inc:18 -#: reportwriter/languages/en_US/reports.php:88 msgid "Printed" msgstr "" @@ -3046,7 +3049,8 @@ #: includes/PDFProfitAndLossPageHeader.inc:28 #: includes/PDFQuotationPageHeader.inc:32 #: includes/PDFQuotationPortraitPageHeader.inc:81 -#: includes/PDFSalesAnalPageHeader.inc:15 includes/PDFSalesOrder_generic.inc:85 +#: includes/PDFSalesAnalPageHeader.inc:15 +#: includes/PDFSalesOrder_generic.inc:85 #: includes/PDFSellThroughSupportClaimPageHeader.inc:16 #: includes/PDFStatementPageHeader.inc:40 #: includes/PDFStatementPageHeader.inc:43 @@ -3064,7 +3068,6 @@ #: includes/PDFTransPageHeaderPortrait.inc:37 #: includes/PDFTrialBalancePageHeader.inc:18 includes/PDFWOPageHeader.inc:12 #: includes/PO_PDFOrderPageHeader.inc:17 -#: reportwriter/languages/en_US/reports.php:86 msgid "Page" msgstr "" @@ -3077,14 +3080,15 @@ msgstr "" #: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:1015 -#: CollectiveWorkOrderCost.php:326 CounterReturns.php:1690 -#: CounterSales.php:2104 CounterSales.php:2258 InternalStockRequest.php:636 -#: PO_SelectOSPurchOrder.php:311 PO_SelectPurchOrder.php:215 -#: PurchaseByPrefSupplier.php:415 ReorderLevelLocation.php:75 -#: ReorderLevelLocation.php:76 SelectCompletedOrder.php:507 -#: SelectOrderItems.php:1513 SelectOrderItems.php:1685 SelectQASamples.php:300 -#: SelectSalesOrder.php:604 SelectWorkOrder.php:220 Shipt_Select.php:192 -#: TestPlanResults.php:178 TopItems.php:174 includes/PDFTopItemsHeader.inc:54 +#: BOMs_SingleLevel.php:906 CollectiveWorkOrderCost.php:326 +#: CounterReturns.php:1690 CounterSales.php:2104 CounterSales.php:2258 +#: InternalStockRequest.php:636 PO_SelectOSPurchOrder.php:311 +#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415 +#: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76 +#: SelectCompletedOrder.php:507 SelectOrderItems.php:1513 +#: SelectOrderItems.php:1685 SelectQASamples.php:300 SelectSalesOrder.php:604 +#: SelectWorkOrder.php:220 Shipt_Select.php:192 TestPlanResults.php:178 +#: TopItems.php:174 includes/PDFTopItemsHeader.inc:54 msgid "On Hand" msgstr "" @@ -3158,12 +3162,12 @@ msgid "WC" msgstr "" -#: BOMIndented.php:326 BOMs.php:499 ConfirmDispatch_Invoice.php:1052 -#: CounterReturns.php:1070 CounterSales.php:1474 Credit_Invoice.php:822 -#: Credit_Invoice.php:852 SelectCreditItems.php:1501 StockClone.php:863 -#: StockClone.php:865 Stocks.php:1191 Stocks.php:1193 -#: api/api_debtortransactions.php:753 api/api_salesorders.php:920 -#: reportwriter/languages/en_US/reports.php:56 +#: BOMIndented.php:326 BOMs.php:499 BOMs_SingleLevel.php:428 +#: ConfirmDispatch_Invoice.php:1052 CounterReturns.php:1070 +#: CounterSales.php:1474 Credit_Invoice.php:822 Credit_Invoice.php:852 +#: SelectCreditItems.php:1501 StockClone.php:863 StockClone.php:865 +#: Stocks.php:1191 Stocks.php:1193 api/api_debtortransactions.php:753 +#: api/api_salesorders.php:920 msgid "Assembly" msgstr "" @@ -3195,11 +3199,11 @@ msgid "Costed Bill Of Material" msgstr "" -#: BOMInquiry.php:20 BOMs.php:992 +#: BOMInquiry.php:20 BOMs.php:992 BOMs_SingleLevel.php:883 msgid "Select a manufactured part" msgstr "" -#: BOMInquiry.php:20 BOMs.php:992 +#: BOMInquiry.php:20 BOMs.php:992 BOMs_SingleLevel.php:883 msgid "or Assembly or Kit part" msgstr "" @@ -3207,20 +3211,20 @@ msgid "to view the costed bill of materials" msgstr "" -#: BOMInquiry.php:21 BOMs.php:992 +#: BOMInquiry.php:21 BOMs.php:992 BOMs_SingleLevel.php:883 msgid "Parts must be defined in the stock item entry" msgstr "" -#: BOMInquiry.php:21 BOMs.php:992 +#: BOMInquiry.php:21 BOMs.php:992 BOMs_SingleLevel.php:883 msgid "modification screen as manufactured" msgstr "" -#: BOMInquiry.php:21 BOMs.php:992 +#: BOMInquiry.php:21 BOMs.php:992 BOMs_SingleLevel.php:883 msgid "" "kits or assemblies to be available for construction of a bill of material" msgstr "" -#: BOMInquiry.php:26 BOMs.php:996 MRPDemands.php:336 +#: BOMInquiry.php:26 BOMs.php:996 BOMs_SingleLevel.php:887 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:288 PO_SelectPurchOrder.php:190 #: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153 #: WorkOrderEntry.php:933 WorkOrderIssue.php:980 @@ -3227,7 +3231,7 @@ msgid "Enter text extracts in the" msgstr "" -#: BOMInquiry.php:26 BOMs.php:996 MRPDemands.php:336 +#: BOMInquiry.php:26 BOMs.php:996 BOMs_SingleLevel.php:887 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:288 PO_SelectPurchOrder.php:190 #: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153 #: WorkOrderEntry.php:933 WorkOrderIssue.php:980 @@ -3234,10 +3238,11 @@ msgid "description" msgstr "" -#: BOMInquiry.php:28 BOMs.php:998 CollectiveWorkOrderCost.php:312 -#: ContractBOM.php:331 ContractBOM.php:336 Contracts.php:766 Contracts.php:769 -#: CounterReturns.php:1658 CounterSales.php:2225 CustItem.php:220 -#: CustomerReceipt.php:1211 CustomerReceipt.php:1214 DiscountCategories.php:121 +#: BOMInquiry.php:28 BOMs.php:998 BOMs_SingleLevel.php:889 +#: CollectiveWorkOrderCost.php:312 ContractBOM.php:331 ContractBOM.php:336 +#: Contracts.php:766 Contracts.php:769 CounterReturns.php:1658 +#: CounterSales.php:2225 CustItem.php:220 CustomerReceipt.php:1211 +#: CustomerReceipt.php:1214 DiscountCategories.php:121 #: DiscountCategories.php:123 DiscountCategories.php:127 #: DiscountCategories.php:129 FixedAssetTransfer.php:94 #: InternalStockRequestInquiry.php:230 InternalStockRequest.php:359 @@ -3253,13 +3258,13 @@ #: SelectWorkOrder.php:206 SellThroughSupport.php:202 Shipt_Select.php:174 #: SuppFixedAssetChgs.php:122 SupplierPriceList.php:54 #: SupplierPriceList.php:414 SupplierTenderCreate.php:566 -#: SupplierTenderCreate.php:706 SupplierTenders.php:433 TestPlanResults.php:158 -#: WorkOrderEntry.php:938 WorkOrderEntry.php:942 WorkOrderEntry.php:944 -#: WorkOrderIssue.php:985 +#: SupplierTenderCreate.php:706 SupplierTenders.php:433 +#: TestPlanResults.php:158 WorkOrderEntry.php:938 WorkOrderEntry.php:942 +#: WorkOrderEntry.php:944 WorkOrderIssue.php:985 msgid "OR" msgstr "" -#: BOMInquiry.php:29 BOMs.php:999 MRPDemands.php:339 +#: BOMInquiry.php:29 BOMs.php:999 BOMs_SingleLevel.php:890 MRPDemands.php:339 #: PO_SelectOSPurchOrder.php:292 PO_SelectPurchOrder.php:195 #: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158 #: WorkOrderEntry.php:938 WorkOrderIssue.php:985 @@ -3298,13 +3303,13 @@ msgid "Search Now" msgstr "" -#: BOMInquiry.php:47 BOMs.php:933 CollectiveWorkOrderCost.php:132 -#: ContractBOM.php:51 InternalStockRequestInquiry.php:510 MRPDemands.php:56 -#: MRPReport.php:605 PO_Items.php:852 PO_SelectOSPurchOrder.php:65 -#: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:98 -#: SelectCreditItems.php:302 SelectProduct.php:583 SelectQASamples.php:176 -#: SelectSalesOrder.php:1035 SelectWorkOrder.php:51 Shipt_Select.php:61 -#: SupplierPriceList.php:81 SupplierTenderCreate.php:731 +#: BOMInquiry.php:47 BOMs.php:933 BOMs_SingleLevel.php:824 +#: CollectiveWorkOrderCost.php:132 ContractBOM.php:51 +#: InternalStockRequestInquiry.php:510 MRPDemands.php:56 MRPReport.php:605 +#: PO_Items.php:852 PO_SelectOSPurchOrder.php:65 PO_SelectPurchOrder.php:48 +#: SelectCompletedOrder.php:98 SelectCreditItems.php:302 SelectProduct.php:583 +#: SelectQASamples.php:176 SelectSalesOrder.php:1035 SelectWorkOrder.php:51 +#: Shipt_Select.php:61 SupplierPriceList.php:81 SupplierTenderCreate.php:731 #: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:112 #: WorkOrderIssue.php:630 msgid "" @@ -3312,14 +3317,15 @@ "extract entered" msgstr "" -#: BOMInquiry.php:50 BOMs.php:936 MRPDemands.php:59 +#: BOMInquiry.php:50 BOMs.php:936 BOMs_SingleLevel.php:827 MRPDemands.php:59 msgid "" "At least one stock description keyword or an extract of a stock code must be " "entered for the search" msgstr "" -#: BOMInquiry.php:95 BOMs.php:982 MRPCalendar.php:213 MRPDemands.php:80 -#: MRPDemands.php:289 POReport.php:483 POReport.php:1266 SalesInquiry.php:758 +#: BOMInquiry.php:95 BOMs.php:982 BOMs_SingleLevel.php:873 MRPCalendar.php:213 +#: MRPDemands.php:80 MRPDemands.php:289 POReport.php:483 POReport.php:1266 +#: SalesInquiry.php:758 msgid "The SQL to find the parts selected failed with the message" msgstr "" @@ -3343,7 +3349,7 @@ #: SupplierTenders.php:688 TestPlanResults.php:179 TestPlanResults.php:510 #: TopItems.php:172 WorkOrderCosting.php:100 WorkOrderEntry.php:974 #: WorkOrderIssue.php:1010 WorkOrderIssue.php:1090 -#: includes/PDFInventoryValnPageHeader.inc:34 includes/DefineLabelClass.php:21 +#: includes/DefineLabelClass.php:21 includes/PDFInventoryValnPageHeader.inc:34 msgid "Units" msgstr "" @@ -3367,8 +3373,9 @@ msgid "per" msgstr "" -#: BOMInquiry.php:197 BOMs.php:738 WOCanBeProducedNow.php:48 -#: WorkOrderReceive.php:191 WorkOrderReceive.php:409 Z_BottomUpCosts.php:33 +#: BOMInquiry.php:197 BOMs.php:738 BOMs_SingleLevel.php:635 +#: WOCanBeProducedNow.php:48 WorkOrderReceive.php:191 WorkOrderReceive.php:409 +#: Z_BottomUpCosts.php:33 msgid "Component" msgstr "" @@ -3444,7 +3451,7 @@ msgid "Multi-Level Bill Of Materials Maintenance" msgstr "" -#: BOMs.php:33 +#: BOMs.php:33 BOMs_SingleLevel.php:31 msgid "A maximum of 15 levels of bill of materials only can be displayed" msgstr "" @@ -3452,31 +3459,31 @@ msgid "The component and the parent is the same" msgstr "" -#: BOMs.php:59 +#: BOMs.php:59 BOMs_SingleLevel.php:49 msgid "" "An error occurred in retrieving the components of the BOM during the check " "for recursion" msgstr "" -#: BOMs.php:60 +#: BOMs.php:60 BOMs_SingleLevel.php:50 msgid "" "The SQL that was used to retrieve the components of the BOM and that failed " "in the process was" msgstr "" -#: BOMs.php:115 +#: BOMs.php:115 BOMs_SingleLevel.php:100 msgid "Could not retrieve the BOM components because" msgstr "" -#: BOMs.php:116 +#: BOMs.php:116 BOMs_SingleLevel.php:101 msgid "The SQL used to retrieve the components was" msgstr "" -#: BOMs.php:130 +#: BOMs.php:130 BOMs_SingleLevel.php:115 msgid "No lower levels" msgstr "" -#: BOMs.php:133 +#: BOMs.php:133 BOMs_SingleLevel.php:118 msgid "Drill Down" msgstr "" @@ -3487,57 +3494,57 @@ #: SelectCreditItems.php:1057 SelectOrderItems.php:1525 #: SelectOrderItems.php:1691 SelectProduct.php:442 StockClone.php:116 #: StockClone.php:741 StockClone.php:746 StockClone.php:751 StockClone.php:755 -#: Stocks.php:1065 Stocks.php:1068 Stocks.php:1081 SupplierTenderCreate.php:884 -#: SupplierTenders.php:720 WorkOrderEntry.php:998 WorkOrderIssue.php:1032 -#: reportwriter/languages/en_US/reports.php:270 +#: Stocks.php:1065 Stocks.php:1068 Stocks.php:1081 +#: SupplierTenderCreate.php:884 SupplierTenders.php:720 WorkOrderEntry.php:998 +#: WorkOrderIssue.php:1032 #, php-format msgid "No Image" msgstr "" -#: BOMs.php:200 +#: BOMs.php:200 BOMs_SingleLevel.php:154 #, php-format msgid "" "Are you sure you wish to delete this component from the bill of material?" msgstr "" -#: BOMs.php:296 +#: BOMs.php:296 BOMs_SingleLevel.php:242 msgid "The effective after date field must be a date in the format" msgstr "" -#: BOMs.php:302 +#: BOMs.php:302 BOMs_SingleLevel.php:248 msgid "The effective to date field must be a date in the format" msgstr "" -#: BOMs.php:308 StockAdjustments.php:165 StockTransfers.php:173 -#: WorkOrderEntry.php:494 +#: BOMs.php:308 BOMs_SingleLevel.php:254 StockAdjustments.php:165 +#: StockTransfers.php:173 WorkOrderEntry.php:494 msgid "The quantity entered must be numeric" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "The effective to date must be a date after the effective after date" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "The effective to date is" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "days before the effective after date" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "No updates have been performed" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "Effective after was" msgstr "" -#: BOMs.php:322 +#: BOMs.php:322 BOMs_SingleLevel.php:266 msgid "and effective to was" msgstr "" -#: BOMs.php:333 +#: BOMs.php:333 BOMs_SingleLevel.php:277 msgid "" "Only non-serialised or non-lot controlled items can be set to auto issue. " "These items require the lot/serial numbers of items issued to the works " @@ -3549,118 +3556,122 @@ msgid "The component selected is the same with the parent, it is not allowed" msgstr "" -#: BOMs.php:366 +#: BOMs.php:366 BOMs_SingleLevel.php:302 msgid "Could not update this BOM component because" msgstr "" -#: BOMs.php:367 +#: BOMs.php:367 BOMs_SingleLevel.php:303 msgid "The SQL used to update the component was" msgstr "" -#: BOMs.php:370 +#: BOMs.php:370 BOMs_SingleLevel.php:306 msgid "Details for" msgstr "" -#: BOMs.php:370 RevisionTranslations.php:30 +#: BOMs.php:370 BOMs_SingleLevel.php:306 RevisionTranslations.php:30 msgid "have been updated" msgstr "" -#: BOMs.php:389 +#: BOMs.php:389 BOMs_SingleLevel.php:325 msgid "An error occurred in checking the component is not already on the BOM" msgstr "" -#: BOMs.php:390 +#: BOMs.php:390 BOMs_SingleLevel.php:326 msgid "" "The SQL that was used to check the component was not already on the BOM and " "that failed in the process was" msgstr "" -#: BOMs.php:422 +#: BOMs.php:422 BOMs_SingleLevel.php:351 msgid "Could not insert the BOM component because" msgstr "" -#: BOMs.php:423 +#: BOMs.php:423 BOMs_SingleLevel.php:352 msgid "The SQL used to insert the component was" msgstr "" -#: BOMs.php:428 +#: BOMs.php:428 BOMs_SingleLevel.php:357 msgid "A new component part" msgstr "" -#: BOMs.php:428 +#: BOMs.php:428 BOMs_SingleLevel.php:357 msgid "has been added to the bill of material for part" msgstr "" -#: BOMs.php:434 +#: BOMs.php:434 BOMs_SingleLevel.php:363 msgid "The component" msgstr "" -#: BOMs.php:434 +#: BOMs.php:434 BOMs_SingleLevel.php:363 msgid "is already recorded as a component of" msgstr "" -#: BOMs.php:434 +#: BOMs.php:434 BOMs_SingleLevel.php:363 msgid "" "Whilst the quantity of the component required can be modified it is " "inappropriate for a component to appear more than once in a bill of material" msgstr "" -#: BOMs.php:455 +#: BOMs.php:455 BOMs_SingleLevel.php:384 msgid "Could not delete this BOM components because" msgstr "" -#: BOMs.php:456 +#: BOMs.php:456 BOMs_SingleLevel.php:385 msgid "The SQL used to delete the BOM was" msgstr "" -#: BOMs.php:466 +#: BOMs.php:466 BOMs_SingleLevel.php:395 msgid "The component part" msgstr "" -#: BOMs.php:466 +#: BOMs.php:466 BOMs_SingleLevel.php:395 msgid "has been deleted from this BOM" msgstr "" #: BOMs.php:489 BOMs.php:525 BOMs.php:549 BOMs.php:574 BOMs.php:598 +#: BOMs_SingleLevel.php:418 BOMs_SingleLevel.php:454 BOMs_SingleLevel.php:478 +#: BOMs_SingleLevel.php:503 BOMs_SingleLevel.php:527 msgid "Could not retrieve the description of the parent part because" msgstr "" #: BOMs.php:490 BOMs.php:526 BOMs.php:550 BOMs.php:575 BOMs.php:599 +#: BOMs_SingleLevel.php:419 BOMs_SingleLevel.php:455 BOMs_SingleLevel.php:479 +#: BOMs_SingleLevel.php:504 BOMs_SingleLevel.php:528 msgid "The SQL used to retrieve description of the parent part was" msgstr "" -#: BOMs.php:502 FixedAssetRegister.php:390 StockClone.php:883 -#: StockClone.php:885 Stocks.php:1211 Stocks.php:1213 +#: BOMs.php:502 BOMs_SingleLevel.php:431 FixedAssetRegister.php:390 +#: StockClone.php:883 StockClone.php:885 Stocks.php:1211 Stocks.php:1213 msgid "Purchased" msgstr "" -#: BOMs.php:505 StockClone.php:873 StockClone.php:875 Stocks.php:1201 -#: Stocks.php:1203 +#: BOMs.php:505 BOMs_SingleLevel.php:434 StockClone.php:873 StockClone.php:875 +#: Stocks.php:1201 Stocks.php:1203 msgid "Manufactured" msgstr "" -#: BOMs.php:508 +#: BOMs.php:508 BOMs_SingleLevel.php:437 msgid "Kit Set" msgstr "" -#: BOMs.php:511 BOMs.php:604 StockClone.php:878 StockClone.php:880 -#: Stocks.php:1206 Stocks.php:1208 +#: BOMs.php:511 BOMs.php:604 BOMs_SingleLevel.php:440 BOMs_SingleLevel.php:533 +#: StockClone.php:878 StockClone.php:880 Stocks.php:1206 Stocks.php:1208 msgid "Phantom" msgstr "" -#: BOMs.php:515 +#: BOMs.php:515 BOMs_SingleLevel.php:444 msgid "Select a Different BOM" msgstr "" -#: BOMs.php:531 +#: BOMs.php:531 BOMs_SingleLevel.php:460 msgid "Manufactured parent items" msgstr "" -#: BOMs.php:554 +#: BOMs.php:554 BOMs_SingleLevel.php:483 msgid "Assembly parent items" msgstr "" -#: BOMs.php:579 +#: BOMs.php:579 BOMs_SingleLevel.php:508 msgid "Kit sets" msgstr "" @@ -3668,8 +3679,8 @@ msgid "Level" msgstr "" -#: BOMs.php:653 EDIMessageFormat.php:130 SuppInvGRNs.php:117 -#: SuppInvGRNs.php:258 reportwriter/languages/en_US/reports.php:98 +#: BOMs.php:653 BOMs_SingleLevel.php:556 EDIMessageFormat.php:130 +#: SuppInvGRNs.php:117 SuppInvGRNs.php:258 msgid "Sequence" msgstr "" @@ -3688,42 +3699,43 @@ #: StockStatus.php:93 SupplierTenderCreate.php:137 WhereUsedInquiry.php:74 #: WorkCentres.php:131 WorkCentres.php:232 api/api_xml-rpc.php:2531 #: api/api_xml-rpc.php:2577 api/api_xml-rpc.php:2773 -#: includes/PDFPeriodStockTransListingPageHeader.inc:51 -#: includes/PDFStockNegativesHeader.inc:31 msgid "Location" msgstr "" -#: BOMs.php:658 WhereUsedInquiry.php:73 includes/MainMenuLinksArray.php:338 +#: BOMs.php:658 BOMs_SingleLevel.php:560 WhereUsedInquiry.php:73 +#: includes/MainMenuLinksArray.php:338 msgid "Work Centre" msgstr "" -#: BOMs.php:660 ContractBOM.php:243 InternalStockRequest.php:279 -#: SupplierTenderCreate.php:436 SupplierTenders.php:328 -#: WOCanBeProducedNow.php:47 WOCanBeProducedNow.php:52 +#: BOMs.php:660 BOMs_SingleLevel.php:562 ContractBOM.php:243 +#: InternalStockRequest.php:279 SupplierTenderCreate.php:436 +#: SupplierTenders.php:328 WOCanBeProducedNow.php:47 WOCanBeProducedNow.php:52 #: includes/PDFTransPageHeader.inc:214 #: includes/PDFTransPageHeaderPortrait.inc:259 msgid "UOM" msgstr "" -#: BOMs.php:661 BOMs.php:877 WhereUsedInquiry.php:76 -#: includes/PDFBOMListingPageHeader.inc:40 +#: BOMs.php:661 BOMs.php:877 BOMs_SingleLevel.php:563 BOMs_SingleLevel.php:774 +#: WhereUsedInquiry.php:76 includes/PDFBOMListingPageHeader.inc:40 msgid "Effective After" msgstr "" -#: BOMs.php:662 BOMs.php:881 PurchData.php:703 SellThroughSupport.php:267 -#: WhereUsedInquiry.php:77 includes/PDFBOMListingPageHeader.inc:41 +#: BOMs.php:662 BOMs.php:881 BOMs_SingleLevel.php:564 BOMs_SingleLevel.php:778 +#: PurchData.php:703 SellThroughSupport.php:267 WhereUsedInquiry.php:77 +#: includes/PDFBOMListingPageHeader.inc:41 msgid "Effective To" msgstr "" -#: BOMs.php:663 WorkOrderIssue.php:895 WorkOrderStatus.php:128 +#: BOMs.php:663 BOMs_SingleLevel.php:565 WorkOrderIssue.php:895 +#: WorkOrderStatus.php:128 msgid "Auto Issue" msgstr "" -#: BOMs.php:664 InventoryValuation.php:197 +#: BOMs.php:664 BOMs_SingleLevel.php:566 InventoryValuation.php:197 msgid "Qty On Hand" msgstr "" -#: BOMs.php:669 +#: BOMs.php:669 BOMs_SingleLevel.php:571 msgid "No materials found." msgstr "" @@ -3731,31 +3743,31 @@ msgid "Print Date" msgstr "" -#: BOMs.php:729 +#: BOMs.php:729 BOMs_SingleLevel.php:626 msgid "Edit the details of the selected component in the fields below" msgstr "" -#: BOMs.php:729 +#: BOMs.php:729 BOMs_SingleLevel.php:626 msgid "Click on the Enter Information button to update the component details" msgstr "" -#: BOMs.php:751 +#: BOMs.php:751 BOMs_SingleLevel.php:647 msgid "New Component Details" msgstr "" -#: BOMs.php:754 +#: BOMs.php:754 BOMs_SingleLevel.php:650 msgid "Component code" msgstr "" -#: BOMs.php:784 +#: BOMs.php:784 BOMs_SingleLevel.php:680 msgid "Could not retrieve the list of potential components because" msgstr "" -#: BOMs.php:785 +#: BOMs.php:785 BOMs_SingleLevel.php:681 msgid "The SQL used to retrieve the list of potential components part was" msgstr "" -#: BOMs.php:797 +#: BOMs.php:797 BOMs_SingleLevel.php:693 msgid "Sequence in BOM" msgstr "" @@ -3763,27 +3775,27 @@ msgid "Number with decimal places is acceptable" msgstr "" -#: BOMs.php:830 +#: BOMs.php:830 BOMs_SingleLevel.php:727 msgid "Work Centre Added" msgstr "" -#: BOMs.php:836 Contracts.php:898 +#: BOMs.php:836 BOMs_SingleLevel.php:733 Contracts.php:898 msgid "There are no work centres set up yet" msgstr "" -#: BOMs.php:836 Contracts.php:898 +#: BOMs.php:836 BOMs_SingleLevel.php:733 Contracts.php:898 msgid "Please use the link below to set up work centres" msgstr "" -#: BOMs.php:837 Contracts.php:899 +#: BOMs.php:837 BOMs_SingleLevel.php:734 Contracts.php:899 msgid "Work Centre Maintenance" msgstr "" -#: BOMs.php:859 +#: BOMs.php:859 BOMs_SingleLevel.php:756 msgid "Enter the quantity of this item required for the parent item" msgstr "" -#: BOMs.php:887 +#: BOMs.php:887 BOMs_SingleLevel.php:784 msgid "Auto Issue this Component to Work Orders" msgstr "" @@ -3791,7 +3803,7 @@ msgid "Remark" msgstr "" -#: BOMs.php:992 +#: BOMs.php:992 BOMs_SingleLevel.php:883 msgid "to maintain the bill of material for using the options below" msgstr "" @@ -3828,8 +3840,8 @@ #: POReport.php:748 POReport.php:1282 POReport.php:1309 POReport.php:1448 #: POReport.php:1642 SalesGLPostings.php:116 SalesGLPostings.php:233 #: SalesGLPostings.php:339 SalesInquiry.php:774 SalesInquiry.php:809 -#: SalesInquiry.php:977 SalesInquiry.php:1234 StockCategorySalesInquiry.php:165 -#: Z_ChangeStockCategory.php:108 +#: SalesInquiry.php:977 SalesInquiry.php:1234 +#: StockCategorySalesInquiry.php:165 Z_ChangeStockCategory.php:108 msgid "Stock Category" msgstr "" @@ -3898,17 +3910,18 @@ #: DiscountCategories.php:222 GoodsReceived.php:121 #: InventoryPlanningPrefSupplier.php:72 PDFCOA.php:64 #: PDFSalesBySalesperson.php:85 PDFWeeklyOrders.php:81 SalesCategories.php:185 -#: SalesCategories.php:548 SalesTopItemsInquiry.php:220 SelectWorkOrder.php:340 -#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:398 -#: Shipments.php:485 StockUsage.php:60 SuppCreditGRNs.php:290 -#: WorkOrderCosting.php:97 WorkOrderCosting.php:129 WorkOrderIssue.php:858 -#: WorkOrderReceive.php:829 WorkOrderStatus.php:65 WorkOrderStatus.php:97 -#: includes/PDFInventoryPlanPageHeader.inc:50 +#: SalesCategories.php:548 SalesTopItemsInquiry.php:220 +#: SelectWorkOrder.php:340 ShipmentCosting.php:148 ShipmentCosting.php:539 +#: Shipments.php:398 Shipments.php:485 StockUsage.php:60 +#: SuppCreditGRNs.php:290 WorkOrderCosting.php:97 WorkOrderCosting.php:129 +#: WorkOrderIssue.php:858 WorkOrderReceive.php:829 WorkOrderStatus.php:65 +#: WorkOrderStatus.php:97 includes/PDFInventoryPlanPageHeader.inc:50 #: includes/PDFInventoryValnPageHeader.inc:32 #: includes/PDFLowGPPageHeader.inc:45 includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFSellThroughSupportClaimPageHeader.inc:24 #: includes/PDFStockCheckPageHeader.inc:31 -#: includes/PDFStockComparisonPageHeader.inc:33 includes/PDFWOPageHeader.inc:69 +#: includes/PDFStockComparisonPageHeader.inc:33 +#: includes/PDFWOPageHeader.inc:69 msgid "Item" msgstr "" @@ -3942,8 +3955,8 @@ msgstr "" #: CollectiveWorkOrderCost.php:125 PDFFGLabel.php:183 PDFWOPrint.php:259 -#: PDFWOPrint.php:480 SelectWorkOrder.php:44 api/api_xml-rpc.php:2573 -#: api/api_xml-rpc.php:2769 includes/PDFWOPageHeader.inc:10 +#: PDFWOPrint.php:480 SelectWorkOrder.php:44 includes/PDFWOPageHeader.inc:10 +#: api/api_xml-rpc.php:2573 api/api_xml-rpc.php:2769 msgid "Work Order Number" msgstr "" @@ -4558,8 +4571,9 @@ #: SelectCreditItems.php:243 SelectCustomer.php:13 SelectCustomer.php:181 #: SelectCustomer.php:182 SelectOrderItems.php:623 #: SelectRecurringSalesOrder.php:91 SelectSalesOrder.php:853 -#: SelectSalesOrder.php:870 SellThroughSupport.php:262 StockLocMovements.php:93 -#: StockMovements.php:107 includes/PDFAgedDebtorsPageHeader.inc:48 +#: SelectSalesOrder.php:870 SellThroughSupport.php:262 +#: StockLocMovements.php:93 StockMovements.php:107 +#: includes/PDFAgedDebtorsPageHeader.inc:48 #: includes/PDFBankingSummaryPageHeader.inc:56 #: includes/PDFCustTransListingPageHeader.inc:48 #: includes/PDFDebtorBalsPageHeader.inc:30 @@ -4592,6 +4606,7 @@ #: SalesInquiry.php:950 SalesInquiry.php:961 SalesInquiry.php:967 #: SalesInquiry.php:973 SalesInquiry.php:1138 SalesInquiry.php:1213 #: SalesInquiry.php:1232 SelectCustomer.php:402 SelectOrderItems.php:723 +#: ../webSHOP/Checkout.php:389 msgid "Customer Name" msgstr "" @@ -4617,9 +4632,10 @@ #: Stocks.php:922 Stocks.php:989 Stocks.php:995 SuppCreditGRNs.php:91 #: SuppCreditGRNs.php:191 SuppInvGRNs.php:119 SuppInvGRNs.php:262 #: SupplierCredit.php:316 SupplierInvoice.php:667 SupplierTenders.php:122 -#: SupplierTenders.php:528 SupplierTenders.php:530 Z_ItemsWithoutPicture.php:34 -#: includes/PDFOrderPageHeader_generic.inc:91 -#: includes/PDFPickingListHeader.inc:72 includes/PDFQuotationPageHeader.inc:103 +#: SupplierTenders.php:528 SupplierTenders.php:530 +#: Z_ItemsWithoutPicture.php:34 includes/PDFOrderPageHeader_generic.inc:91 +#: includes/PDFPickingListHeader.inc:72 +#: includes/PDFQuotationPageHeader.inc:103 #: includes/PDFQuotationPortraitPageHeader.inc:93 #: includes/PDFSalesOrder_generic.inc:93 #: includes/PDFStockLocTransferHeader.inc:64 @@ -4643,12 +4659,13 @@ #: StockCategorySalesInquiry.php:121 StockLocTransferReceive.php:542 #: SupplierTenders.php:123 SupplierTenders.php:529 #: includes/PDFOrderPageHeader_generic.inc:92 -#: includes/PDFPickingListHeader.inc:73 includes/PDFQuotationPageHeader.inc:107 +#: includes/PDFPickingListHeader.inc:73 +#: includes/PDFQuotationPageHeader.inc:107 #: includes/PDFQuotationPortraitPageHeader.inc:94 #: includes/PDFSalesOrder_generic.inc:94 #: includes/PDFStockNegativesHeader.inc:32 includes/PDFWOPageHeader.inc:43 #: includes/PDFWOPageHeader.inc:70 includes/PO_PDFOrderPageHeader.inc:76 -#: ../webSHOP/includes/DisplayShoppingCart.php:6 +#: ../webSHOP/includes/DisplayShoppingCart.php:7 msgid "Item Description" msgstr "" @@ -4659,8 +4676,8 @@ msgid "Ordered" msgstr "" -#: ConfirmDispatch_Invoice.php:306 FTP_RadioBeacon.php:83 GoodsReceived.php:125 -#: GoodsReceived.php:129 +#: ConfirmDispatch_Invoice.php:306 FTP_RadioBeacon.php:83 +#: GoodsReceived.php:125 GoodsReceived.php:129 #, php-format msgid "Already" msgstr "" @@ -4693,9 +4710,9 @@ #: api/api_xml-rpc.php:981 includes/PDFQuotationPageHeader.inc:109 #: includes/PDFQuotationPortraitPageHeader.inc:96 #: includes/PDFTransPageHeaderPortrait.inc:261 -#: includes/PO_PDFOrderPageHeader.inc:80 includes/DefineLabelClass.php:49 -#: ../webSHOP/includes/DisplayShoppingCart.php:9 -#: ../webSHOP/includes/Functions.php:59 +#: includes/PO_PDFOrderPageHeader.inc:80 api/api_xml-rpc.php:981 +#: ../webSHOP/includes/DisplayShoppingCart.php:10 +#: ../webSHOP/includes/Functions.php:58 msgid "Price" msgstr "" @@ -4854,11 +4871,13 @@ msgid "Please remedy this" msgstr "" -#: ConfirmDispatch_Invoice.php:683 Credit_Invoice.php:544 GoodsReceived.php:323 +#: ConfirmDispatch_Invoice.php:683 Credit_Invoice.php:544 +#: GoodsReceived.php:323 msgid "The company information and preferences could not be retrieved" msgstr "" -#: ConfirmDispatch_Invoice.php:683 Credit_Invoice.php:544 GoodsReceived.php:323 +#: ConfirmDispatch_Invoice.php:683 Credit_Invoice.php:544 +#: GoodsReceived.php:323 msgid "see your system administrator" msgstr "" @@ -5055,8 +5074,8 @@ #: WorkOrderReceive.php:742 includes/SQL_CommonFunctions.inc:21 #: includes/SQL_CommonFunctions.inc:25 includes/SQL_CommonFunctions.inc:179 #: includes/SQL_CommonFunctions.inc:198 includes/SQL_CommonFunctions.inc:480 -#: includes/SQL_CommonFunctions.inc:502 ../webSHOP/includes/Functions.php:180 -#: ../webSHOP/includes/Functions.php:187 +#: includes/SQL_CommonFunctions.inc:502 ../webSHOP/includes/Functions.php:190 +#: ../webSHOP/includes/Functions.php:197 msgid "CRITICAL ERROR" msgstr "" @@ -5180,7 +5199,7 @@ #: includes/SQL_CommonFunctions.inc:21 includes/SQL_CommonFunctions.inc:25 #: includes/SQL_CommonFunctions.inc:179 includes/SQL_CommonFunctions.inc:198 #: includes/SQL_CommonFunctions.inc:480 includes/SQL_CommonFunctions.inc:502 -#: ../webSHOP/includes/Functions.php:180 ../webSHOP/includes/Functions.php:187 +#: ../webSHOP/includes/Functions.php:190 ../webSHOP/includes/Functions.php:197 msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE" msgstr "" @@ -5194,25 +5213,25 @@ msgid "The following SQL to update the sales order was used" msgstr "" -#: ConfirmDispatch_Invoice.php:820 CounterReturns.php:947 CounterSales.php:1352 -#: RecurringSalesOrdersProcess.php:682 +#: ConfirmDispatch_Invoice.php:820 CounterReturns.php:947 +#: CounterSales.php:1352 RecurringSalesOrdersProcess.php:682 msgid "The debtor transaction record could not be inserted because" msgstr "" -#: ConfirmDispatch_Invoice.php:821 CounterReturns.php:948 CounterSales.php:1353 -#: RecurringSalesOrdersProcess.php:683 +#: ConfirmDispatch_Invoice.php:821 CounterReturns.php:948 +#: CounterSales.php:1353 RecurringSalesOrdersProcess.php:683 msgid "The following SQL to insert the debtor transaction record was used" msgstr "" -#: ConfirmDispatch_Invoice.php:836 CounterReturns.php:963 CounterSales.php:1368 -#: Credit_Invoice.php:664 RecurringSalesOrdersProcess.php:696 -#: SelectCreditItems.php:1186 +#: ConfirmDispatch_Invoice.php:836 CounterReturns.php:963 +#: CounterSales.php:1368 Credit_Invoice.php:664 +#: RecurringSalesOrdersProcess.php:696 SelectCreditItems.php:1186 msgid "The debtor transaction taxes records could not be inserted because" msgstr "" -#: ConfirmDispatch_Invoice.php:837 CounterReturns.php:964 CounterSales.php:1369 -#: Credit_Invoice.php:665 RecurringSalesOrdersProcess.php:697 -#: SelectCreditItems.php:1187 +#: ConfirmDispatch_Invoice.php:837 CounterReturns.php:964 +#: CounterSales.php:1369 Credit_Invoice.php:665 +#: RecurringSalesOrdersProcess.php:697 SelectCreditItems.php:1187 msgid "" "The following SQL to insert the debtor transaction taxes record was used" msgstr "" @@ -5244,13 +5263,14 @@ msgid "Cannot retrieve the mbflag" msgstr "" -#: ConfirmDispatch_Invoice.php:968 CounterReturns.php:984 CounterSales.php:1389 -#: FixedAssetItems.php:685 SalesAnalReptCols.php:327 Stocks.php:1455 -#: Suppliers.php:1126 includes/MiscFunctions.php:35 +#: ConfirmDispatch_Invoice.php:968 CounterReturns.php:984 +#: CounterSales.php:1389 FixedAssetItems.php:685 SalesAnalReptCols.php:327 +#: Stocks.php:1455 Suppliers.php:1126 includes/MiscFunctions.php:35 msgid "WARNING" msgstr "" -#: ConfirmDispatch_Invoice.php:968 CounterReturns.php:984 CounterSales.php:1389 +#: ConfirmDispatch_Invoice.php:968 CounterReturns.php:984 +#: CounterSales.php:1389 msgid "Could not retrieve current location stock" msgstr "" @@ -5380,11 +5400,12 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1195 Credit_Invoice.php:980 -#: Credit_Invoice.php:990 SelectCreditItems.php:1397 SelectCreditItems.php:1627 -#: StockAdjustments.php:268 StockAdjustments.php:286 -#: StockLocTransferReceive.php:146 StockLocTransferReceive.php:160 -#: StockLocTransferReceive.php:299 StockLocTransferReceive.php:313 -#: StockTransfers.php:317 StockTransfers.php:470 +#: Credit_Invoice.php:990 SelectCreditItems.php:1397 +#: SelectCreditItems.php:1627 StockAdjustments.php:268 +#: StockAdjustments.php:286 StockLocTransferReceive.php:146 +#: StockLocTransferReceive.php:160 StockLocTransferReceive.php:299 +#: StockLocTransferReceive.php:313 StockTransfers.php:317 +#: StockTransfers.php:470 msgid "The following SQL to update the serial stock item record was used" msgstr "" @@ -5575,7 +5596,6 @@ #: ConfirmDispatch_Invoice.php:1655 CounterReturns.php:1603 #: CounterSales.php:2056 SelectSalesOrder.php:978 SystemParameters.php:577 -#: reportwriter/languages/en_US/reports.php:300 #, php-format msgid "Landscape" msgstr "" @@ -5582,7 +5602,6 @@ #: ConfirmDispatch_Invoice.php:1657 CounterReturns.php:1605 #: CounterSales.php:2058 SelectSalesOrder.php:978 SystemParameters.php:578 -#: reportwriter/languages/en_US/reports.php:299 #, php-format msgid "Portrait" msgstr "" @@ -5658,11 +5677,11 @@ #: ContractBOM.php:43 ContractOtherReqts.php:46 Contracts.php:96 #: Contracts.php:105 DeliveryDetails.php:276 DeliveryDetails.php:285 -#: PO_Header.php:243 SalesAnalysis_UserDefined.php:46 SelectOrderItems.php:1181 -#: StockUsage.php:21 SupplierCredit.php:210 SupplierCredit.php:221 -#: SupplierCredit.php:233 SupplierCredit.php:243 SupplierCredit.php:253 -#: SupplierInvoice.php:563 SupplierInvoice.php:572 SupplierInvoice.php:580 -#: SupplierInvoice.php:588 SupplierInvoice.php:598 +#: PO_Header.php:243 SalesAnalysis_UserDefined.php:46 +#: SelectOrderItems.php:1181 StockUsage.php:21 SupplierCredit.php:210 +#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243 +#: SupplierCredit.php:253 SupplierInvoice.php:563 SupplierInvoice.php:572 +#: SupplierInvoice.php:580 SupplierInvoice.php:588 SupplierInvoice.php:598 #: includes/PDFSalesAnalysis.inc:547 msgid "to continue" msgstr "" @@ -5834,9 +5853,9 @@ msgstr "" #: ContractCosting.php:58 ContractCosting.php:66 Contracts.php:205 -#: Contracts.php:758 Contracts.php:833 CopyBOM.php:164 EDIProcessOrders.php:373 -#: InternalStockRequestFulfill.php:14 SuppContractChgs.php:78 -#: SupplierCredit.php:420 SupplierInvoice.php:789 +#: Contracts.php:758 Contracts.php:833 CopyBOM.php:164 +#: EDIProcessOrders.php:373 InternalStockRequestFulfill.php:14 +#: SuppContractChgs.php:78 SupplierCredit.php:420 SupplierInvoice.php:789 msgid "Contract" msgstr "" @@ -6105,22 +6124,23 @@ "items page" msgstr "" -#: Contracts.php:96 Contracts.php:104 Customers.php:272 DeliveryDetails.php:276 -#: DeliveryDetails.php:285 EmailCustTrans.php:23 PO_Header.php:243 -#: SalesAnalysis_UserDefined.php:46 StockUsage.php:20 SupplierCredit.php:210 -#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243 -#: SupplierCredit.php:253 SupplierInvoice.php:562 SupplierInvoice.php:571 -#: SupplierInvoice.php:579 SupplierInvoice.php:587 SupplierInvoice.php:597 -#: includes/PDFSalesAnalysis.inc:547 +#: Contracts.php:96 Contracts.php:104 Customers.php:272 +#: DeliveryDetails.php:276 DeliveryDetails.php:285 EmailCustTrans.php:23 +#: PO_Header.php:243 SalesAnalysis_UserDefined.php:46 StockUsage.php:20 +#: SupplierCredit.php:210 SupplierCredit.php:221 SupplierCredit.php:233 +#: SupplierCredit.php:243 SupplierCredit.php:253 SupplierInvoice.php:562 +#: SupplierInvoice.php:571 SupplierInvoice.php:579 SupplierInvoice.php:587 +#: SupplierInvoice.php:597 includes/PDFSalesAnalysis.inc:547 msgid "If this does not happen" msgstr "" -#: Contracts.php:96 Contracts.php:104 Customers.php:272 DeliveryDetails.php:276 -#: DeliveryDetails.php:285 EmailCustTrans.php:23 PO_Header.php... [truncated message content] |
From: <rc...@us...> - 2017-06-23 02:10:25
|
Revision: 7795 http://sourceforge.net/p/web-erp/reponame/7795 Author: rchacon Date: 2017-06-23 02:10:22 +0000 (Fri, 23 Jun 2017) Log Message: ----------- Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy. Modified Paths: -------------- trunk/css/WEBootstrap/css/bootstrap.css trunk/css/WEBootstrap/default.css trunk/doc/Change.log trunk/index.php Modified: trunk/css/WEBootstrap/css/bootstrap.css =================================================================== --- trunk/css/WEBootstrap/css/bootstrap.css 2017-06-22 02:52:29 UTC (rev 7794) +++ trunk/css/WEBootstrap/css/bootstrap.css 2017-06-23 02:10:22 UTC (rev 7795) @@ -1295,7 +1295,7 @@ font-weight: 300; line-height: 1.4; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .lead { font-size: 21px; } @@ -1451,7 +1451,7 @@ dd { margin-left: 0; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .dl-horizontal dt { float: left; width: 160px; @@ -1587,7 +1587,7 @@ margin-right: auto; margin-left: auto; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .container { width: 750px; } @@ -1774,7 +1774,7 @@ .col-xs-offset-0 { margin-left: 0; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left; } @@ -2912,7 +2912,7 @@ margin-bottom: 10px; color: #737373; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .form-inline .form-group { display: inline-block; margin-bottom: 0; @@ -2978,7 +2978,7 @@ margin-right: -15px; margin-left: -15px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .form-horizontal .control-label { padding-top: 7px; margin-bottom: 0; @@ -2988,13 +2988,13 @@ .form-horizontal .has-feedback .form-control-feedback { right: 15px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 11px; font-size: 18px; } } -@media (min-width: 1068px) { +@media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; font-size: 12px; @@ -3632,7 +3632,7 @@ bottom: 100%; margin-bottom: 2px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-right .dropdown-menu { right: 0; left: auto; @@ -4055,7 +4055,7 @@ top: auto; left: auto; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .nav-tabs.nav-justified > li { display: table-cell; width: 1%; @@ -4073,7 +4073,7 @@ .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; @@ -4120,7 +4120,7 @@ top: auto; left: auto; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .nav-justified > li { display: table-cell; width: 1%; @@ -4141,7 +4141,7 @@ .nav-tabs-justified > .active > a:focus { border: 1px solid #ddd; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; @@ -4169,12 +4169,12 @@ margin-bottom: 20px; border: 1px solid transparent; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar { border-radius: 4px; } } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-header { float: left; } @@ -4191,7 +4191,7 @@ .navbar-collapse.in { overflow-y: auto; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-collapse { width: auto; border-top: 0; @@ -4231,7 +4231,7 @@ margin-right: -15px; margin-left: -15px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, @@ -4244,7 +4244,7 @@ z-index: 1000; border-width: 0 0 1px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-static-top { border-radius: 0; } @@ -4256,7 +4256,7 @@ left: 0; z-index: 1030; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0; @@ -4285,7 +4285,7 @@ .navbar-brand > img { display: block; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px; @@ -4315,7 +4315,7 @@ .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-toggle { display: none; } @@ -4351,7 +4351,7 @@ background-image: none; } } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-nav { float: left; margin: 0; @@ -4375,7 +4375,7 @@ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; @@ -4433,7 +4433,7 @@ margin-bottom: 0; } } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-form { width: auto; padding-top: 0; @@ -4473,7 +4473,7 @@ margin-top: 15px; margin-bottom: 15px; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-text { float: left; margin-right: 15px; @@ -4480,7 +4480,7 @@ margin-left: 15px; } } -@media (min-width: 1068px) { +@media (min-width: 768px) { .navbar-left { float: left !important; } @@ -4983,7 +4983,7 @@ .jumbotron .container { max-width: 100%; } -@media screen and (min-width: 1068px) { +@media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; padding-bottom: 48px; @@ -5968,7 +5968,7 @@ height: 50px; overflow: scroll; } -@media (min-width: 1068px) { +@media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto; @@ -6431,7 +6431,7 @@ .carousel-caption .btn { text-shadow: none; } -@media screen and (min-width: 1068px) { +@media screen and (min-width: 768px) { .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, @@ -6597,7 +6597,7 @@ display: inline-block !important; } } -@media (min-width: 1068px) and (max-width: 991px) { +@media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; } @@ -6612,17 +6612,17 @@ display: table-cell !important; } } -@media (min-width: 1068px) and (max-width: 991px) { +@media (min-width: 768px) and (max-width: 991px) { .visible-sm-block { display: block !important; } } -@media (min-width: 1068px) and (max-width: 991px) { +@media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline { display: inline !important; } } -@media (min-width: 1068px) and (max-width: 991px) { +@media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline-block { display: inline-block !important; } @@ -6692,7 +6692,7 @@ display: none !important; } } -@media (min-width: 1068px) and (max-width: 991px) { +@media (min-width: 768px) and (max-width: 991px) { .hidden-sm { display: none !important; } Modified: trunk/css/WEBootstrap/default.css =================================================================== --- trunk/css/WEBootstrap/default.css 2017-06-22 02:52:29 UTC (rev 7794) +++ trunk/css/WEBootstrap/default.css 2017-06-23 02:10:22 UTC (rev 7795) @@ -547,22 +547,16 @@ border-bottom:thin solid #DADADA; text-align:center; color:#2C2C2C; +} +#TransactionsDiv, +#InquiriesDiv, +#MaintenanceDiv { + margin-left:-10px; + margin-top:5px; } -#TransactionsDiv{ - margin-left:-10px; -} -#InquiriesDiv{ - margin-left:-10px; -} #InquiriesDiv div{ /* default div, used for custom report header */ - } #InquiriesDiv body{ - -} -#MaintenanceDiv{ - margin-left:-10px; -} .menu_group_item p { color:transparent; /* buttets color */ margin:4px 0 0 0; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-22 02:52:29 UTC (rev 7794) +++ trunk/doc/Change.log 2017-06-23 02:10:22 UTC (rev 7795) @@ -1,7 +1,8 @@ webERP Change Log +23/06/22 RChacon: Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy. 22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php. -21/06/17 RChacon: Add meta viewport for initial-scale=1 (for working css in small devices). +21/06/17 RChacon: Add meta viewport for initial-scale=1 for working css in small devices. 2017-06-20 4.14 release Modified: trunk/index.php =================================================================== --- trunk/index.php 2017-06-22 02:52:29 UTC (rev 7794) +++ trunk/index.php 2017-06-23 02:10:22 UTC (rev 7795) @@ -102,7 +102,7 @@ echo '<div id="SubMenuDiv">'; //===HJ=== -echo '<div id="TransactionsDiv" class="col-md-3"><ul class="list-group-item">'; //=== TransactionsDiv === +echo '<div id="TransactionsDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== TransactionsDiv === echo '<li class="menu_group_headers">'; //=== SubMenuHeader === if ($_SESSION['Module']=='system') { @@ -129,7 +129,7 @@ echo '</ul></div>'; //=== TransactionsDiv === -echo '<div id="InquiriesDiv" class="col-md-3"><ul class="list-group-item">'; //=== InquiriesDiv === +echo '<div id="InquiriesDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== InquiriesDiv === echo '<li class="menu_group_headers">'; if ($_SESSION['Module']=='system') { @@ -157,7 +157,7 @@ echo '</ul></div>'; //=== InquiriesDiv === -echo '<div id="MaintenanceDiv" class="col-md-3"><ul class="list-group-item">'; //=== MaintenanceDive === +echo '<div id="MaintenanceDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== MaintenanceDive === echo '<li class="menu_group_headers">'; if ($_SESSION['Module']=='system') { |
From: <ex...@us...> - 2017-06-22 02:52:31
|
Revision: 7794 http://sourceforge.net/p/web-erp/reponame/7794 Author: exsonqu Date: 2017-06-22 02:52:29 +0000 (Thu, 22 Jun 2017) Log Message: ----------- 22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php. Modified Paths: -------------- trunk/WorkOrderReceive.php trunk/doc/Change.log Modified: trunk/WorkOrderReceive.php =================================================================== --- trunk/WorkOrderReceive.php 2017-06-22 00:53:58 UTC (rev 7793) +++ trunk/WorkOrderReceive.php 2017-06-22 02:52:29 UTC (rev 7794) @@ -136,7 +136,7 @@ } } - if ($QuantityReceived + $WORow['qtyrecd'] > $WORow['qtyreqd'] *(1+$_SESSION['OverReceiveProportion'])){ + if ($QuantityReceived + $WORow['qtyrecd'] > $WORow['qtyreqd'] *(1+$_SESSION['OverReceiveProportion']/100)){ prnMsg(_('The quantity received is greater than the quantity required even after allowing for the configured allowable over-receive proportion. If this is correct then the work order must be modified first.'),'error'); $InputError=true; } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-22 00:53:58 UTC (rev 7793) +++ trunk/doc/Change.log 2017-06-22 02:52:29 UTC (rev 7794) @@ -1,5 +1,6 @@ webERP Change Log +22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php. 21/06/17 RChacon: Add meta viewport for initial-scale=1 (for working css in small devices). 2017-06-20 4.14 release |
From: <rc...@us...> - 2017-06-22 00:54:00
|
Revision: 7793 http://sourceforge.net/p/web-erp/reponame/7793 Author: rchacon Date: 2017-06-22 00:53:58 +0000 (Thu, 22 Jun 2017) Log Message: ----------- Add meta viewport for initial-scale=1 for working css in small devices Modified Paths: -------------- trunk/doc/Change.log trunk/includes/header.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-21 04:02:03 UTC (rev 7792) +++ trunk/doc/Change.log 2017-06-22 00:53:58 UTC (rev 7793) @@ -1,5 +1,9 @@ webERP Change Log +21/06/17 RChacon: Add meta viewport for initial-scale=1 (for working css in small devices). + +2017-06-20 4.14 release + 19/06/17 Exson: Add menu.css to make the main menu workable in header.php. 19/06/17 Exson: Fixed the variable not existed error (Reported by Tim). Add a feature to add favorite script under main menu which idea originated from Tim's Kwamoja project. 19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. Modified: trunk/includes/header.php =================================================================== --- trunk/includes/header.php 2017-06-21 04:02:03 UTC (rev 7792) +++ trunk/includes/header.php 2017-06-22 00:53:58 UTC (rev 7793) @@ -37,11 +37,11 @@ } else { echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />'; } - + echo '<link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />'; echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />', '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>', -/* '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).*/ + '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels). '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>', '<title>', $Title, '</title>', '</head>', |
From: <ex...@us...> - 2017-06-21 04:02:06
|
Revision: 7792 http://sourceforge.net/p/web-erp/reponame/7792 Author: exsonqu Date: 2017-06-21 04:02:03 +0000 (Wed, 21 Jun 2017) Log Message: ----------- 21/06/17 Exson: Fixed bug of Add menu features. Modified Paths: -------------- trunk/includes/GetConfig.php trunk/includes/header.php trunk/includes/session.php Modified: trunk/includes/GetConfig.php =================================================================== --- trunk/includes/GetConfig.php 2017-06-20 11:03:31 UTC (rev 7791) +++ trunk/includes/GetConfig.php 2017-06-21 04:02:03 UTC (rev 7792) @@ -115,6 +115,15 @@ $_SESSION['SMTPSettings']['timeout']=$myrow['timeout']; $_SESSION['SMTPSettings']['auth']=$myrow['auth']; } + //Add favorite scripts + $sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'"; + $result = DB_query($sql); + if (DB_num_rows($result)>0) { + while ($myrow = DB_fetch_array($result)) { + $_SESSION['Favourites'][$myrow['href']] = $myrow['caption']; + } + } + } //end if force reload or not set already @@ -138,4 +147,4 @@ $RadioBeaconFTP_user_name = RadioBeacon ftp server user name $RadionBeaconFTP_user_pass = Radio Beacon remote ftp server password */ -?> \ No newline at end of file +?> Modified: trunk/includes/header.php =================================================================== --- trunk/includes/header.php 2017-06-20 11:03:31 UTC (rev 7791) +++ trunk/includes/header.php 2017-06-21 04:02:03 UTC (rev 7792) @@ -77,8 +77,8 @@ } if (isset($_POST['DelFromMenu'])) { unset($_SESSION['Favourites'][$_POST['ScriptName']]); - } - if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) { + } + if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) { echo '<ul>'; foreach ($_SESSION['Favourites'] as $url=>$ttl) { echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>'; @@ -85,7 +85,7 @@ } echo '</ul>'; - } + } echo '</li>'; //take off inline formatting, use CSS instead ===HJ=== if (count($_SESSION['AllowedPageSecurityTokens'])>1){ Modified: trunk/includes/session.php =================================================================== --- trunk/includes/session.php 2017-06-20 11:03:31 UTC (rev 7791) +++ trunk/includes/session.php 2017-06-21 04:02:03 UTC (rev 7792) @@ -88,9 +88,10 @@ $ErrMsg = _('Failed to retrieve favorites'); $result = DB_query($sql,$ErrMsg); if (DB_num_rows($result)>0) { + $sql = array(); while ($myrow = DB_fetch_array($result)) { if (!isset($_SESSION['Favourites'][$myrow['href']])) {//The script is removed; - $sql[] = "DELECT FROM favourites WHERE href='" . $myrow['href'] . "' AND userid='" . $_SESSION['UserID'] . "'"; + $sql[] = "DELETE FROM favourites WHERE href='" . $myrow['href'] . "' AND userid='" . $_SESSION['UserID'] . "'"; } else { unset($_SESSION['Favourites'][$myrow['href']]); @@ -110,7 +111,9 @@ foreach ($sql as $sq) { $result = DB_query($sq); } - $result = DB_query($sqli); + if (isset($sqli)) { + $result = DB_query($sqli); + } } else { $sqli = "INSERT INTO favourites(href,caption,userid) VALUES "; @@ -122,7 +125,9 @@ $sqli .= "('" . $url . "', '" . $ttl . "','" . $_SESSION['UserID'] . "')"; $k++; } - $result = DB_query($sqli); + if ($k) { + $result = DB_query($sqli); + } } } |
From: <ex...@us...> - 2017-06-20 11:03:33
|
Revision: 7791 http://sourceforge.net/p/web-erp/reponame/7791 Author: exsonqu Date: 2017-06-20 11:03:31 +0000 (Tue, 20 Jun 2017) Log Message: ----------- 20/06/17 Exson: 4.14 release rollup. Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/includes/ConnectDB.inc Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2017-06-19 11:26:35 UTC (rev 7790) +++ trunk/UpgradeDatabase.php 2017-06-20 11:03:31 UTC (rev 7791) @@ -196,6 +196,9 @@ $SQLScripts[] = './sql/mysql/upgrade4.12.3-4.13.sql'; case '4.13': $SQLScripts[] = './sql/mysql/upgrade4.13-4.13.1.sql'; + case '4.14': + $SQLScripts[] = './sql/mysql/upgrade4.13.1-4.14.sql'; + break; } //end switch } Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2017-06-19 11:26:35 UTC (rev 7790) +++ trunk/includes/ConnectDB.inc 2017-06-20 11:03:31 UTC (rev 7791) @@ -4,7 +4,7 @@ * this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run * if VersionNumber is < $Version then the DB update script is run */ -$Version='4.13.1'; //must update manually every time there is a DB change +$Version='4.14'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); if (!isset($_SESSION['DatabaseName'])){ |
From: <ex...@us...> - 2017-06-19 11:26:38
|
Revision: 7790 http://sourceforge.net/p/web-erp/reponame/7790 Author: exsonqu Date: 2017-06-19 11:26:35 +0000 (Mon, 19 Jun 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-19 11:25:43 UTC (rev 7789) +++ trunk/doc/Change.log 2017-06-19 11:26:35 UTC (rev 7790) @@ -1,5 +1,6 @@ webERP Change Log +19/06/17 Exson: Add menu.css to make the main menu workable in header.php. 19/06/17 Exson: Fixed the variable not existed error (Reported by Tim). Add a feature to add favorite script under main menu which idea originated from Tim's Kwamoja project. 19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. 19/06/17 Exson: Make these classes defined php 7 compliant and keep php4 backwards compatibility. |
From: <ex...@us...> - 2017-06-19 11:25:45
|
Revision: 7789 http://sourceforge.net/p/web-erp/reponame/7789 Author: exsonqu Date: 2017-06-19 11:25:43 +0000 (Mon, 19 Jun 2017) Log Message: ----------- 19/06/17 Exson: Add menu.css to make the main menu workable in header.php. Modified Paths: -------------- trunk/includes/header.php Modified: trunk/includes/header.php =================================================================== --- trunk/includes/header.php 2017-06-19 09:21:01 UTC (rev 7788) +++ trunk/includes/header.php 2017-06-19 11:25:43 UTC (rev 7789) @@ -37,6 +37,8 @@ } else { echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />'; } + + echo '<link href="', $RootPath, '/css/menu.css" rel="stylesheet" type="text/css" />'; echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />', '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>', /* '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).*/ |
From: <ex...@us...> - 2017-06-19 09:21:03
|
Revision: 7788 http://sourceforge.net/p/web-erp/reponame/7788 Author: exsonqu Date: 2017-06-19 09:21:01 +0000 (Mon, 19 Jun 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-19 09:18:58 UTC (rev 7787) +++ trunk/doc/Change.log 2017-06-19 09:21:01 UTC (rev 7788) @@ -1,5 +1,6 @@ webERP Change Log +19/06/17 Exson: Fixed the variable not existed error (Reported by Tim). Add a feature to add favorite script under main menu which idea originated from Tim's Kwamoja project. 19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. 19/06/17 Exson: Make these classes defined php 7 compliant and keep php4 backwards compatibility. 18/06/17 RChacon: Rename from css/custom/ to from css/WEBootstrap/. |
From: <ex...@us...> - 2017-06-19 09:19:01
|
Revision: 7787 http://sourceforge.net/p/web-erp/reponame/7787 Author: exsonqu Date: 2017-06-19 09:18:58 +0000 (Mon, 19 Jun 2017) Log Message: ----------- 19/06/17 Exson: Fixed the variable not existed error (Reported by Tim). Add a feature to add favorite script under main menu which idea originated from Tim's Kwamoja project. Modified Paths: -------------- trunk/SelectProduct.php trunk/SupplierInvoice.php trunk/includes/footer.php trunk/includes/header.php trunk/includes/session.php trunk/sql/mysql/upgrade4.13.1-4.14.sql Added Paths: ----------- trunk/css/menu.css Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/SelectProduct.php 2017-06-19 09:18:58 UTC (rev 7787) @@ -858,7 +858,7 @@ } else { $ItemStatus =''; } - $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE))); + $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE))); if (!empty($imagefile)){ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'. '&StockID='.urlencode($myrow['stockid']). Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/SupplierInvoice.php 2017-06-19 09:18:58 UTC (rev 7787) @@ -33,7 +33,7 @@ $myrow = DB_fetch_row($result); $SupplierName=$myrow[0]; if (!isset($_SESSION['SuppTrans']->SupplierID)) { - $_SESSION['SuppTrans']->SupplierID = $myrow[1]; + $_SESSION['SuppTrans']->SupplierID = $_GET['SupplierID']; } } else { $SupplierName=$_SESSION['SuppTrans']->SupplierName; Added: trunk/css/menu.css =================================================================== --- trunk/css/menu.css (rev 0) +++ trunk/css/menu.css 2017-06-19 09:18:58 UTC (rev 7787) @@ -0,0 +1,24 @@ +#menu ul { + display:none; + position:absolute; + list-style:none; + padding:0; + margin:0; + border-top:1px #a81b2f solid; +} +#menu ul li a{ + color:#5d6364; + text-decoration:none; + display:block; + padding:6px 7px; + border-bottom:1px solid #d3d9da; + border-left:1px solid #d3d9da; + border-right:1px solid #d3d9da; + font-size:13px; +} +#menu li:hover ul { + display:block; + top:40px; + min-width:160px; +} + Modified: trunk/includes/footer.php =================================================================== --- trunk/includes/footer.php 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/includes/footer.php 2017-06-19 09:18:58 UTC (rev 7787) @@ -22,9 +22,31 @@ echo '</div>'; // FooterWrapDiv echo '</div>'; // FooterDiv +$BaseName = basename($_SERVER['PHP_SELF']); +$ScriptName = $BaseName.'?'.$_SERVER['QUERY_STRING']; +if ( $BaseName != 'index.php' AND !isset($_SESSION['Favourites'][$ScriptName])) { + $ShowAdd = '<input type="submit" value="' . _('Add To Menu') . '" name="AddToMenu" />'; +} else { + $ShowAdd = ''; +} +if (isset($_SESSION['Favourites'][$ScriptName])) { + $ShowDel = '<input type="submit" value="' . _('Remove From Menu') . '" name="DelFromMenu" />'; +} else { + $ShowDel = ''; +} + +echo '<div> + <form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post"> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> + <input type="hidden" name="ScriptName" value="' . $ScriptName . '" /> + <input type="hidden" name="Title" value="' . $Title . '" /> + ' . $ShowAdd . $ShowDel . ' + + + </form> + </div> +'; echo '</div>'; // Canvas - echo '</body> </html>'; - ?> Modified: trunk/includes/header.php =================================================================== --- trunk/includes/header.php 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/includes/header.php 2017-06-19 09:18:58 UTC (rev 7787) @@ -65,10 +65,27 @@ echo '</div>'; // AppInfoDiv - echo '<div id="QuickMenuDiv"><ul>'; + echo '<div id="QuickMenuDiv"><ul id="menu">'; - echo '<li><a href="'.$RootPath.'/index.php">' . _('Main Menu') . '</a></li>'; //take off inline formatting, use CSS instead ===HJ=== + echo '<li><a href="'.$RootPath.'/index.php">' . _('Main Menu') . '</a>'; + if (isset($_POST['AddToMenu'])) { + if (!isset($_SESSION['Favourites'][$_POST['ScriptName']])) { + $_SESSION['Favourites'][$_POST['ScriptName']] = $_POST['Title']; + } + } + if (isset($_POST['DelFromMenu'])) { + unset($_SESSION['Favourites'][$_POST['ScriptName']]); + } + if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) { + echo '<ul>'; + foreach ($_SESSION['Favourites'] as $url=>$ttl) { + echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>'; + } + echo '</ul>'; + } + echo '</li>'; //take off inline formatting, use CSS instead ===HJ=== + if (count($_SESSION['AllowedPageSecurityTokens'])>1){ echo '<li><a href="'.$RootPath.'/SelectCustomer.php">' . _('Customers') . '</a></li>'; echo '<li><a href="'.$RootPath.'/SelectProduct.php">' . _('Items') . '</a></li>'; Modified: trunk/includes/session.php =================================================================== --- trunk/includes/session.php 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/includes/session.php 2017-06-19 09:18:58 UTC (rev 7787) @@ -82,6 +82,50 @@ $FirstLogin = False; if(basename($_SERVER['SCRIPT_NAME'])=='Logout.php'){ + if (isset($_SESSION['Favourites'])) { + //retrieve the sql data; + $sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'"; + $ErrMsg = _('Failed to retrieve favorites'); + $result = DB_query($sql,$ErrMsg); + if (DB_num_rows($result)>0) { + while ($myrow = DB_fetch_array($result)) { + if (!isset($_SESSION['Favourites'][$myrow['href']])) {//The script is removed; + $sql[] = "DELECT FROM favourites WHERE href='" . $myrow['href'] . "' AND userid='" . $_SESSION['UserID'] . "'"; + + } else { + unset($_SESSION['Favourites'][$myrow['href']]); + } + } + if (count($_SESSION['Favourites']) >0) { + $sqli = "INSERT INTO favourites(href,caption,userid) VALUES "; + $k = 0; + foreach ($_SESSION['Favourites'] as $url=>$ttl) { + if ($k) { + $sqli .=","; + } + $sqli .= "('" . $url . "', '" . $ttl . "', '" . $_SESSION['UserID'] . "')"; + $k++; + } + } + foreach ($sql as $sq) { + $result = DB_query($sq); + } + $result = DB_query($sqli); + } else { + + $sqli = "INSERT INTO favourites(href,caption,userid) VALUES "; + $k = 0; + foreach ($_SESSION['Favourites'] as $url=>$ttl) { + if ($k) { + $sqli .=","; + } + $sqli .= "('" . $url . "', '" . $ttl . "','" . $_SESSION['UserID'] . "')"; + $k++; + } + $result = DB_query($sqli); + } +} + header('Location: index.php'); } elseif (isset($AllowAnyone)){ /* only do security checks if AllowAnyone is not true */ $_SESSION['AllowedPageSecurityTokens'] = array(); Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql =================================================================== --- trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-06-19 06:19:29 UTC (rev 7786) +++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-06-19 09:18:58 UTC (rev 7787) @@ -14,5 +14,11 @@ -- Convert prices to use non- SQL mode specific end date we will have a year 10000 problem but its a way off!: UPDATE prices SET enddate='9999-12-31' WHERE enddate='0000-00-00'; +CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '', + caption varchar(50) NOT NULL DEFAULT '', + href varchar(200) NOT NULL DEFAULT '#', + PRIMARY KEY (userid,caption)) Engine=InnoDB DEFAULT CHARSET=utf8; + + -- Update version number: UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber'; |
From: <ex...@us...> - 2017-06-19 06:19:32
|
Revision: 7786 http://sourceforge.net/p/web-erp/reponame/7786 Author: exsonqu Date: 2017-06-19 06:19:29 +0000 (Mon, 19 Jun 2017) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-19 06:17:24 UTC (rev 7785) +++ trunk/doc/Change.log 2017-06-19 06:19:29 UTC (rev 7786) @@ -1,5 +1,6 @@ webERP Change Log +19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. 19/06/17 Exson: Make these classes defined php 7 compliant and keep php4 backwards compatibility. 18/06/17 RChacon: Rename from css/custom/ to from css/WEBootstrap/. 18/06/17 RChacon: Standardise icon size to 36x36 px in css/custom/ (WEBootstrap). |
From: <ex...@us...> - 2017-06-19 06:17:26
|
Revision: 7785 http://sourceforge.net/p/web-erp/reponame/7785 Author: exsonqu Date: 2017-06-19 06:17:24 +0000 (Mon, 19 Jun 2017) Log Message: ----------- 19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice. Modified Paths: -------------- trunk/SupplierInvoice.php Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2017-06-19 04:25:04 UTC (rev 7784) +++ trunk/SupplierInvoice.php 2017-06-19 06:17:24 UTC (rev 7785) @@ -32,12 +32,15 @@ $result = DB_query($sql); $myrow = DB_fetch_row($result); $SupplierName=$myrow[0]; + if (!isset($_SESSION['SuppTrans']->SupplierID)) { + $_SESSION['SuppTrans']->SupplierID = $myrow[1]; + } } else { $SupplierName=$_SESSION['SuppTrans']->SupplierName; } echo '<p class="page_title_text"><img alt="" src="'.$RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Supplier Invoice') . '" />' . ' ' . - _('Enter Supplier Invoice') . ': ' . $SupplierName . '</p>'; + _('Enter Supplier Invoice') . ': ' . $SupplierName . ' ' . $_SESSION['SuppTrans']->SupplierID . '</p>'; if (isset($_GET['SupplierID']) AND $_GET['SupplierID']!=''){ /*It must be a new invoice entry - clear any existing invoice details from the SuppTrans object and initiate a newy*/ @@ -649,11 +652,13 @@ } echo ' <input type="submit" name="FixedAssets" value="' . _('Fixed Assets') . '" /> </div>'; + $CanSubmit = false;//To avoid a empty submit $TotalGRNValue = 0; if (count( $_SESSION['SuppTrans']->GRNs)>0){ /*if there are any GRNs selected for invoicing then */ /*Show all the selected GRNs so far from the SESSION['SuppInv']->GRNs array */ + $CanSubmit = true; echo '<br /> <table class="selection"> @@ -699,6 +704,7 @@ $TotalShiptValue = 0; if (count( $_SESSION['SuppTrans']->Shipts) > 0){ /*if there are any Shipment charges on the invoice*/ + $CanSubmit = true; echo '<br /> <table class="selection"> @@ -739,6 +745,7 @@ $TotalAssetValue = 0; if (count( $_SESSION['SuppTrans']->Assets) > 0){ /*if there are any fixed assets on the invoice*/ + $CanSubmit = true; echo '<br /> <table class="selection"> @@ -779,6 +786,7 @@ $TotalContractsValue = 0; if (count( $_SESSION['SuppTrans']->Contracts) > 0){ /*if there are any contract charges on the invoice*/ + $CanSubmit = true; echo '<br /> <table class="selection"> @@ -823,6 +831,7 @@ if ( $_SESSION['SuppTrans']->GLLink_Creditors == 1){ if (count($_SESSION['SuppTrans']->GLCodes) > 0){ + $CanSubmit = true; echo '<br /> <table class="selection"> <tr> @@ -957,11 +966,13 @@ <td><textarea name="Comments" cols="40" rows="2">' . $_SESSION['SuppTrans']->Comments . '</textarea></td> </tr> </table>'; + if ($CanSubmit) { echo '<br /> <div class="centre"> <input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" /> </div>'; + } echo '</div> </form>'; |