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...> - 2011-12-07 07:03:44
|
Revision: 4763 http://web-erp.svn.sourceforge.net/web-erp/?rev=4763&view=rev Author: daintree Date: 2011-12-07 07:03:38 +0000 (Wed, 07 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/StockLocTransfer.php Modified: trunk/StockLocTransfer.php =================================================================== --- trunk/StockLocTransfer.php 2011-12-03 04:18:47 UTC (rev 4762) +++ trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763) @@ -22,56 +22,127 @@ unset($_POST['StockID' . $i]); unset($_POST['StockQTY' . $i]); } - } - $ErrorMessage=''; - for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){ - if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){ - $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i])); - $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db); - $myrow = DB_fetch_row($result); - if ($myrow[0]==0){ - $InputError = True; - $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />'; - $_POST['LinesCounter'] -= 10; - } - DB_free_result( $result ); - if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){ - $InputError = True; - $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />'; - $_POST['LinesCounter'] -= 10; - } - if (filter_number_format($_POST['StockQTY' . $i]) <= 0){ - $InputError = True; - $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />'; - $_POST['LinesCounter'] -= 10; - } - // Only if stock exists at this location - $result = DB_query("SELECT quantity - FROM locstock - WHERE stockid='" . $_POST['StockID' . $i] . "' - AND loccode='".$_POST['FromStockLocation']."'", - $db); - - $myrow = DB_fetch_row($result); - if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){ - $InputError = True; - $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />'; - $_POST['LinesCounter'] -= 10; - } - DB_free_result( $result ); - $TotalItems++; - } - }//for all LinesCounter - if ($TotalItems == 0){ - $InputError = True; - $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />'; - } + } else { + if ($_FILES['SelectedTransferFile']['name']) { //start file processing + //initialize + $InputError = false; + $ErrorMessage=''; + //get file handle + $FileHandle = fopen($_FILES['SelectedTransferFile']['tmp_name'], 'r'); + $TotalItems=0; + //loop through file rows + while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) { -/*Ship location and Receive location are different */ - if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){ - $InputError=True; - $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from'); - } + //check for correct number of fields + $FieldCount = count($myrow); + if ($FieldCount != 2)){ + prnMsg (_('File contains') . ' '. $FieldCount . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error'); + fclose($FileHandle); + include('includes/footer.inc'); + exit; + } + + // cleanup the data (csv files often import with empty strings and such) + for ($i=0; $i<count($myrow);$i++) { + $StockID=''; + $Quantity=0; + $myrow[$i] = trim($myrow[$i]); + switch ($i) { + case 0: + $StockID = trim(mb_strtoupper($myrow[$i])); + $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db); + $myrow = DB_fetch_row($result); + if ($myrow[0]==0){ + $InputError = True; + $ErrorMessage .= _('The part code entered of'). ' ' . $StockID . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />'; + } + break; + case 1: + $Quantity = filter_number_format($myrow[$i]); + if (!is_numeric($Quantity)){ + $InputError = True; + $ErrorMessage .= _('The quantity entered for'). ' ' . $StockID . ' ' . _('of') . $Quantity . ' '. _('is not numeric.') . _('The quantity entered for transfers is expected to be numeric'); + } + break; + } // end switch statement + if ($_SESSION['ProhibitNegativeStock']==1){ + // Only if stock exists at this location + $result = DB_query("SELECT quantity + FROM locstock + WHERE stockid='" . $StockID . "' + AND loccode='".$_POST['FromStockLocation']."'", + $db); + $CheckStockRow = DB_fetch_array($result); + if ($myrow['quantity'] < $Quantity){ + $InputError = True; + $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />'; + } + } + + if ($StockID!='' AND $Quantity!=0){ + $_POST['StockID' . $RowCounter] = $StockID; + $_POST['StockQTY' . $RowCounter] = $Quantity; + } + } // end for loop through the columns on the row being processed + $TotalItems++; + $_POST['LinesCounter']=$TotalItems; + } //end while there are lines in the CSV file + } //end if there is a CSV file to import + else { // process the manually input lines + $ErrorMessage=''; + for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){ + if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){ + $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i])); + $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db); + $myrow = DB_fetch_row($result); + if ($myrow[0]==0){ + $InputError = True; + $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />'; + $_POST['LinesCounter'] -= 10; + } + DB_free_result( $result ); + if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){ + $InputError = True; + $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />'; + $_POST['LinesCounter'] -= 10; + } + if (filter_number_format($_POST['StockQTY' . $i]) <= 0){ + $InputError = True; + $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />'; + $_POST['LinesCounter'] -= 10; + } + if ($_SESSION['ProhibitNegativeStock']==1){ + // Only if stock exists at this location + $result = DB_query("SELECT quantity + FROM locstock + WHERE stockid='" . $_POST['StockID' . $i] . "' + AND loccode='".$_POST['FromStockLocation']."'", + $db); + + $myrow = DB_fetch_row($result); + if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){ + $InputError = True; + $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />'; + $_POST['LinesCounter'] -= 10; + } + } + DB_free_result( $result ); + $TotalItems++; + } + }//for all LinesCounter + } + + if ($TotalItems == 0){ + $InputError = True; + $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />'; + } + + /*Ship location and Receive location are different */ + if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){ + $InputError=True; + $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from'); + } + } //end if the transfer is not a duplicated } if(isset($_POST['Submit']) AND $InputError==False){ @@ -178,8 +249,14 @@ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>'; } } - echo '</select></td></tr></table>'; + echo '</select></td></tr>'; + echo '<tr> + <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td> + <td><input name="SelectedTransferFile" type="file" /></td> + </tr> + </table>'; + echo '<table class="selection">'; $tableheader = '<tr><th>'. _('Item Code'). '</th> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-12-03 04:18:59
|
Revision: 4762 http://web-erp.svn.sourceforge.net/web-erp/?rev=4762&view=rev Author: daintree Date: 2011-12-03 04:18:47 +0000 (Sat, 03 Dec 2011) Log Message: ----------- pre v 4.06.2 Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/doc/Change.log trunk/includes/ConnectDB.inc trunk/includes/footer.inc 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_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.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/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.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/sql/mysql/upgrade4.05-4.06.sql trunk/sql/mysql/weberp-demo.sql trunk/sql/mysql/weberp-new.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/UpgradeDatabase.php 2011-12-03 04:18:47 UTC (rev 4762) @@ -121,8 +121,9 @@ case '4.05.2': case '4.05.3': case '4.06': + case '4.06.1': $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql'; - case '4.06.1': + case '4.06.2': break; } //end switch } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/doc/Change.log 2011-12-03 04:18:47 UTC (rev 4762) @@ -1,5 +1,8 @@ webERP Change Log +3/12/11 Release 4.06.2 + +2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8 27/11/11 Phil: Removed a load of DB_escape_string() calls as no longer required now the entire $_POST and $_GET array are DB_escape_string()'ed 27/11/11 Tim: PrintCustTransPortrait.php added bank account code 27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/includes/ConnectDB.inc 2011-12-03 04:18:47 UTC (rev 4762) @@ -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.06.1'; //must update manually every time there is a DB change +$Version='4.06.2'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); @@ -31,4 +31,4 @@ include_once($PathPrefix .'includes/ConnectDB_' . $dbType . '.inc'); } -?> +?> \ No newline at end of file Modified: trunk/includes/footer.inc =================================================================== --- trunk/includes/footer.inc 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/includes/footer.inc 2011-12-03 04:18:47 UTC (rev 4762) @@ -20,7 +20,7 @@ echo '<tr> <td class="footer"> </td> - <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org - '.date('Y').'</td> + <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org 2002 - '.date('Y').'</td> </tr>'; if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) { Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 04:18:47 UTC (rev 4762) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 3.08\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-19 17:05+1300\n" +"POT-Creation-Date: 2011-12-03 16:31+1300\n" "PO-Revision-Date: 2011-02-07 15:33+0000\n" "Last-Translator: Tim Schofield <Unknown>\n" "Language-Team: Czech <cs...@li...>\n" @@ -147,9 +147,9 @@ #: Locations.php:256 Locations.php:265 Locations.php:274 Locations.php:283 #: Locations.php:292 Locations.php:301 MRPDemandTypes.php:87 #: PaymentMethods.php:138 PaymentTerms.php:146 PaymentTerms.php:153 -#: PcExpenses.php:158 SalesCategories.php:124 SalesCategories.php:131 +#: PcExpenses.php:158 SalesCategories.php:125 SalesCategories.php:132 #: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163 -#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:82 Shippers.php:94 +#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 #: StockCategories.php:181 Stocks.php:615 Stocks.php:624 Stocks.php:632 #: Stocks.php:640 Stocks.php:648 Stocks.php:656 Suppliers.php:612 #: Suppliers.php:621 Suppliers.php:629 SupplierTypes.php:145 @@ -220,7 +220,7 @@ #: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28 #: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17 #: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64 -#: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8 +#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8 #: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258 #: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 #: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17 @@ -231,7 +231,7 @@ #: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533 #: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9 #: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17 -#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8 +#: Shippers.php:122 Shippers.php:158 Shipt_Select.php:8 #: StockLocMovements.php:13 StockLocStatus.php:27 Suppliers.php:302 #: SupplierTenders.php:260 SupplierTenders.php:317 SupplierTransInquiry.php:10 #: TaxGroups.php:15 TaxProvinces.php:11 TopItems.php:77 @@ -278,14 +278,14 @@ #: PaymentMethods.php:275 PcAuthorizeExpenses.php:244 PDFChequeListing.php:63 #: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75 #: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 -#: PO_Header.php:777 PO_PDFPurchOrder.php:382 PO_PDFPurchOrder.php:385 +#: PO_Header.php:783 PO_PDFPurchOrder.php:384 PO_PDFPurchOrder.php:387 #: PurchData.php:189 PurchData.php:514 PurchData.php:517 #: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 #: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418 #: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471 -#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:354 -#: SalesPeople.php:356 SelectProduct.php:381 ShipmentCosting.php:663 +#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355 +#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663 #: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042 #: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412 #: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499 @@ -294,7 +294,7 @@ #: SystemParameters.php:781 SystemParameters.php:916 SystemParameters.php:918 #: SystemParameters.php:928 SystemParameters.php:930 SystemParameters.php:984 #: SystemParameters.php:996 SystemParameters.php:998 TaxGroups.php:307 -#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:632 WWW_Users.php:634 +#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:636 WWW_Users.php:638 msgid "Yes" msgstr "Ano" @@ -313,14 +313,14 @@ #: PaymentMethods.php:276 PcAuthorizeExpenses.php:242 PDFChequeListing.php:62 #: PDFDeliveryDifferences.php:74 PDFDIFOT.php:74 #: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141 -#: PO_Header.php:776 PO_PDFPurchOrder.php:383 PO_PDFPurchOrder.php:386 +#: PO_Header.php:782 PO_PDFPurchOrder.php:385 PO_PDFPurchOrder.php:388 #: PurchData.php:192 PurchData.php:515 PurchData.php:518 #: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484 #: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420 #: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417 #: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470 -#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:359 -#: SalesPeople.php:361 SelectProduct.php:383 ShipmentCosting.php:664 +#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360 +#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664 #: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037 #: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413 #: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500 @@ -329,7 +329,7 @@ #: SystemParameters.php:782 SystemParameters.php:915 SystemParameters.php:919 #: SystemParameters.php:927 SystemParameters.php:931 SystemParameters.php:985 #: SystemParameters.php:995 SystemParameters.php:999 TaxGroups.php:308 -#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:631 WWW_Users.php:635 +#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:635 WWW_Users.php:639 #: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35 msgid "No" msgstr "Ne" @@ -346,11 +346,11 @@ #: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259 #: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234 #: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278 -#: Prices.php:251 PurchData.php:204 SalesCategories.php:255 +#: Prices.php:251 PurchData.php:204 SalesCategories.php:256 #: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232 #: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612 #: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671 -#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:144 +#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:143 #: StockCategories.php:242 SupplierContacts.php:163 SupplierTypes.php:189 #: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182 #: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185 @@ -378,20 +378,20 @@ #: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206 #: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224 #: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173 -#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279 +#: PO_AuthorisationLevels.php:153 PO_Items.php:709 Prices_Customer.php:279 #: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299 -#: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133 +#: SalesAnalRepts.php:303 SalesCategories.php:257 SalesGLPostings.php:133 #: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207 #: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613 #: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672 #: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398 -#: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655 -#: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99 -#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139 +#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656 +#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99 +#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147 #: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90 #: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183 #: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186 -#: WorkCentres.php:142 WOSerialNos.php:319 WWW_Access.php:124 +#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124 #: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58 #: includes/OutputSerialItems.php:99 #, php-format @@ -446,10 +446,10 @@ #: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282 #: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356 #: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416 -#: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581 +#: SalesPeople.php:369 Shippers.php:199 StockCategories.php:584 #: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327 #: TaxCategories.php:237 TaxProvinces.php:235 UnitsOfMeasure.php:240 -#: WorkCentres.php:279 WWW_Users.php:674 +#: WorkCentres.php:279 WWW_Users.php:678 msgid "Enter Information" msgstr "Vložit informace" @@ -560,7 +560,7 @@ #: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69 #: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246 #: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 -#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:374 +#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371 #: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66 #: Stocks.php:497 Suppliers.php:513 SupplierTypes.php:67 msgid "has been updated" @@ -597,12 +597,12 @@ #: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253 #: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15 #: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563 -#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369 -#: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945 +#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:371 +#: PO_PDFPurchOrder.php:374 PrintCustTrans.php:714 PrintCustTrans.php:945 #: PrintCustTrans.php:994 PrintCustTransPortrait.php:753 #: PrintCustTransPortrait.php:999 PrintCustTransPortrait.php:1056 #: SelectCustomer.php:610 SupplierContacts.php:154 SupplierContacts.php:274 -#: UserSettings.php:183 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25 +#: UserSettings.php:184 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25 #: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82 #: includes/PDFTransPageHeaderPortrait.inc:109 #: includes/PO_PDFOrderPageHeader.inc:29 @@ -613,7 +613,7 @@ #: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 #: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214 #: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611 -#: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296 +#: SystemParameters.php:328 WOSerialNos.php:291 WOSerialNos.php:297 msgid "Notes" msgstr "Bere na vědomí" @@ -635,7 +635,7 @@ msgstr "Jméno kontaktní osoby" #: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239 -#: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241 +#: PO_Header.php:992 PO_Header.php:1073 SelectCreditItems.php:241 #: SelectCustomer.php:417 SelectOrderItems.php:606 #: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81 #: includes/PDFTransPageHeaderPortrait.inc:105 @@ -685,7 +685,7 @@ #: PaymentAllocations.php:66 PcAssignCashToTab.php:220 #: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300 #: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386 -#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:476 +#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491 #: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90 #: StockMovements.php:94 StockSerialItemResearch.php:81 #: SupplierAllocations.php:455 SupplierAllocations.php:568 @@ -699,10 +699,10 @@ msgstr "Datum" #: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173 -#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178 -#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187 -#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196 -#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179 +#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188 +#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197 +#: UpgradeDatabase.php:200 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 @@ -850,7 +850,7 @@ #: PDFPriceList.php:128 PDFQuotation.php:270 PDFQuotationPortrait.php:268 #: PDFRemittanceAdvice.php:83 PDFStockCheckComparison.php:37 #: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268 -#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:152 +#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:154 #: PrintCustOrder_generic.php:243 PrintCustOrder.php:220 ReorderLevel.php:63 #: ReorderLevel.php:152 SalesAnalysis_UserDefined.php:28 #: SelectCreditItems.php:30 StockCheck.php:47 StockCheck.php:69 @@ -879,16 +879,16 @@ msgstr "Podrobnosti o nesplacených transakcí pro zákazníka" #: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168 -#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435 -#: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365 -#: SpecialOrder.php:440 StockLocTransferReceive.php:370 +#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:433 +#: PO_Items.php:557 PO_Items.php:582 SalesAnalReptCols.php:365 +#: SpecialOrder.php:441 StockLocTransferReceive.php:370 #: StockQuantityByDate.php:121 includes/SelectOrderItems_IntoCart.inc:54 msgid "could not be retrieved because" msgstr "se nepodařilo získat, protože" #: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95 -#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967 -#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365 +#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974 +#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365 #: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718 #: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709 #: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596 @@ -909,7 +909,7 @@ #: includes/PDFPaymentRun_PymtFooter.php:91 #: includes/PDFPaymentRun_PymtFooter.php:121 #: includes/PDFPaymentRun_PymtFooter.php:158 -#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:81 +#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76 #: includes/ConnectDB_mysql.inc:67 msgid "The SQL that failed was" msgstr "SQL příkaz, který selhal, byl" @@ -1109,7 +1109,7 @@ #: FixedAssetCategories.php:138 GLAccounts.php:197 Locations.php:328 #: MRPDemands.php:248 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126 #: PcExpenses.php:166 PcExpensesTypeTab.php:101 PcTabs.php:166 -#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:135 +#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:136 #: SalesTypes.php:156 StockCategories.php:198 Suppliers.php:638 #: SupplierTypes.php:151 Z_DeleteInvoice.php:146 msgid "has been deleted" @@ -1152,7 +1152,7 @@ #: AuditTrail.php:47 PO_AuthorisationLevels.php:124 #: PO_AuthorisationLevels.php:172 PO_AuthorisationLevels.php:175 -#: UserSettings.php:111 +#: UserSettings.php:112 msgid "User ID" msgstr "ID uživatele" @@ -1163,7 +1163,7 @@ #: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585 #: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144 #: PDFPeriodStockTransListing.php:59 PDFPriceList.php:198 -#: PDFPrintLabel.php:250 PO_Items.php:1023 POReport.php:1567 +#: PDFPrintLabel.php:250 PO_Items.php:1021 POReport.php:1567 #: ReorderLevel.php:181 ReorderLevel.php:183 ReorderLevel.php:213 #: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119 #: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179 @@ -1408,10 +1408,10 @@ #: PcTabs.php:206 PcTabs.php:349 PDFPrintLabel.php:97 #: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:209 #: PO_AuthorisationLevels.php:214 PO_AuthoriseMyOrders.php:115 -#: PO_Header.php:554 PO_SelectOSPurchOrder.php:481 PO_SelectPurchOrder.php:432 +#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432 #: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169 #: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260 -#: SupplierCredit.php:263 SupplierInvoice.php:235 SupplierTransInquiry.php:109 +#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109 #: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42 #: includes/PDFDebtorBalsPageHeader.inc:33 #: includes/PDFSupplierBalsPageHeader.inc:36 @@ -1535,7 +1535,7 @@ #: PDFDeliveryDifferences.php:200 PDFDeliveryDifferences.php:296 #: PDFDIFOT.php:190 PDFDIFOT.php:203 PDFDIFOT.php:307 PDFOrdersInvoiced.php:77 #: PDFOrdersInvoiced.php:274 PDFOrderStatus.php:82 PDFOrderStatus.php:256 -#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:332 +#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:334 #: PricesBasedOnMarkUp.php:213 PricesBasedOnMarkUp.php:352 #: PrintCustStatements.php:43 PrintCustTrans.php:60 PrintCustTrans.php:63 #: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61 @@ -1641,7 +1641,7 @@ msgid "Ref" msgstr "Ref" -#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279 +#: BankMatching.php:264 ConfirmDispatch_Invoice.php:288 Credit_Invoice.php:279 #: CustomerAllocations.php:364 CustomerReceipt.php:897 #: CustomerTransInquiry.php:107 CustWhereAlloc.php:109 #: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030 @@ -1652,8 +1652,8 @@ #: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76 #: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457 #: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421 -#: SupplierCredit.php:460 SupplierInvoice.php:330 SupplierInvoice.php:371 -#: SupplierInvoice.php:411 SupplierInvoice.php:455 +#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369 +#: SupplierInvoice.php:409 SupplierInvoice.php:453 #: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146 #: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191 #: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55 @@ -1663,7 +1663,7 @@ #: BankMatching.php:265 BankReconciliation.php:214 BankReconciliation.php:289 #: PDFOrdersInvoiced.php:351 PDFOrderStatus.php:322 -#: PO_SelectOSPurchOrder.php:233 PO_SelectPurchOrder.php:214 +#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:214 #: Shipt_Select.php:192 SuppCreditGRNs.php:267 #: includes/PDFStatementPageHeader.inc:173 #: includes/PDFStatementPageHeader.inc:180 @@ -1936,13 +1936,13 @@ #: SelectCreditItems.php:673 SelectCreditItems.php:1034 #: SelectOrderItems.php:1333 SelectOrderItems.php:1491 #: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145 -#: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393 -#: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616 +#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403 +#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617 #: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186 #: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12 #: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317 -#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255 -#: WOSerialNos.php:295 includes/InputSerialItems.php:111 +#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256 +#: WOSerialNos.php:296 includes/InputSerialItems.php:111 #: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38 #: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49 #: includes/PDFBOMListingPageHeader.inc:44 @@ -2002,8 +2002,8 @@ #: InventoryQuantities.php:232 MRPPlannedPurchaseOrders.php:303 #: MRPPlannedWorkOrders.php:360 MRPReport.php:813 MRPReschedules.php:177 #: MRPShortages.php:331 PDFOrderStatus.php:305 PDFPriceList.php:337 -#: PDFReceipt.php:31 PO_Header.php:814 PO_PDFPurchOrder.php:61 -#: PO_SelectOSPurchOrder.php:511 ReorderLevel.php:251 StockDispatch.php:355 +#: PDFReceipt.php:31 PO_Header.php:820 PO_PDFPurchOrder.php:61 +#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:251 StockDispatch.php:355 #: SuppPriceList.php:273 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34 #: includes/PDFAgedSuppliersPageHeader.inc:21 #: includes/PDFBalanceSheetPageHeader.inc:25 @@ -2097,9 +2097,9 @@ msgstr "Stavět" #: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856 -#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232 +#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236 #: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70 -#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584 +#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551 #: SelectOrderItems.php:1487 SelectOrderItems.php:1671 #: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191 #: TopItems.php:182 includes/PDFTopItemsHeader.inc:54 @@ -2181,20 +2181,20 @@ #: MRPReschedules.php:189 MRPShortages.php:347 PaymentTerms.php:182 #: PcExpenses.php:187 PcExpenses.php:291 PcExpensesTypeTab.php:169 #: PcReportTab.php:171 PcTypeTabs.php:156 PDFOrdersInvoiced.php:348 -#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:661 -#: PO_Items.php:1073 PO_SelectOSPurchOrder.php:231 PO_SelectPurchOrder.php:212 +#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:659 +#: PO_Items.php:1071 PO_SelectOSPurchOrder.php:235 PO_SelectPurchOrder.php:212 #: PricesByCost.php:152 ReorderLevelLocation.php:67 ReorderLevel.php:266 -#: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94 +#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94 #: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243 -#: SelectCompletedOrder.php:583 SelectContract.php:153 +#: SelectCompletedOrder.php:550 SelectContract.php:153 #: SelectCreditItems.php:988 SelectOrderItems.php:1485 #: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733 #: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190 #: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382 #: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82 -#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:118 -#: SuppInvGRNs.php:296 SupplierCredit.php:316 SupplierCredit.php:384 -#: SupplierInvoice.php:290 SupplierInvoice.php:370 SupplierTenders.php:264 +#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126 +#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384 +#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264 #: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290 #: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127 #: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623 @@ -2272,13 +2272,13 @@ msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku" #: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331 -#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189 +#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:189 #: Shipt_Select.php:168 WorkOrderEntry.php:602 WorkOrderIssue.php:664 msgid "Enter text extracts in the" msgstr "Zadejte text extrakty v" #: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331 -#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189 +#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:189 #: Shipt_Select.php:168 WorkOrderEntry.php:602 WorkOrderIssue.php:664 msgid "description" msgstr "popis" @@ -2289,9 +2289,9 @@ #: DiscountCategories.php:104 DiscountCategories.php:106 #: DiscountCategories.php:110 DiscountCategories.php:112 #: FixedAssetTransfer.php:61 MRPDemands.php:333 MRPDemands.php:336 -#: MRPReport.php:542 PO_Header.php:534 PO_Items.php:1052 PO_Items.php:1056 -#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 PurchData.php:268 -#: SelectAsset.php:94 SelectCompletedOrder.php:562 SelectCreditItems.php:222 +#: MRPReport.php:542 PO_Header.php:538 PO_Items.php:1050 PO_Items.php:1054 +#: PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 PurchData.php:268 +#: SelectAsset.php:94 SelectCompletedOrder.php:529 SelectCreditItems.php:222 #: SelectCreditItems.php:971 SelectCustomer.php:269 SelectCustomer.php:279 #: SelectCustomer.php:288 SelectCustomer.php:298 SelectCustomer.php:344 #: SelectGLAccount.php:90 SelectOrderItems.php:587 SelectOrderItems.php:590 @@ -2303,14 +2303,14 @@ msgstr "nebo" #: BOMInquiry.php:31 BOMs.php:840 MRPDemands.php:334 -#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 +#: PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 #: Shipt_Select.php:173 WorkOrderEntry.php:606 WorkOrderIssue.php:667 msgid "Enter extract of the" msgstr "Zadejte extrakt" #: BOMInquiry.php:31 BOMs.php:840 EmailConfirmation.php:191 MRPDemands.php:334 -#: MRPReport.php:542 PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 -#: SalesCategories.php:420 SalesInquiry.php:751 SalesInquiry.php:762 +#: MRPReport.php:542 PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 +#: SalesCategories.php:421 SalesInquiry.php:751 SalesInquiry.php:762 #: SalesInquiry.php:782 SalesInquiry.php:808 SalesInquiry.php:827 #: SalesInquiry.php:937 SalesInquiry.php:1096 SalesInquiry.php:1186 #: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173 @@ -2325,7 +2325,7 @@ #: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764 #: CounterSales.php:2186 CustomerReceipt.php:1116 FixedAssetTransfer.php:72 -#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:541 PO_Items.php:1060 +#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058 #: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:978 #: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595 #: SelectOrderItems.php:1644 SelectProduct.php:531 SelectSupplier.php:219 @@ -2335,7 +2335,7 @@ msgstr "Vyhledat" #: BOMInquiry.php:49 BOMs.php:775 ContractBOM.php:47 MRPDemands.php:56 -#: MRPReport.php:576 PO_Items.php:781 PO_SelectOSPurchOrder.php:63 +#: MRPReport.php:576 PO_Items.php:779 PO_SelectOSPurchOrder.php:63 #: PO_SelectPurchOrder.php:47 SelectCompletedOrder.php:92 #: SelectCreditItems.php:292 SelectProduct.php:544 SelectSalesOrder.php:418 #: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379 @@ -2364,10 +2364,10 @@ #: CounterSales.php:2029 CounterSales.php:2214 CustomerBranches.php:367 #: CustomerReceipt.php:1127 GLCodesInquiry.php:26 MRPDemands.php:90 #: MRPPlannedWorkOrders.php:256 MRPReport.php:746 PDFOrdersInvoiced.php:347 -#: PDFOrderStatus.php:318 PDFPrintLabel.php:247 PO_Header.php:551 -#: PO_Items.php:1072 PO_SelectOSPurchOrder.php:230 PO_SelectPurchOrder.php:211 +#: PDFOrderStatus.php:318 PDFPrintLabel.php:247 PO_Header.php:555 +#: PO_Items.php:1070 PO_SelectOSPurchOrder.php:234 PO_SelectPurchOrder.php:211 #: PricesByCost.php:151 PurchData.php:350 ReorderLevelLocation.php:66 -#: SalesPeople.php:199 SelectCompletedOrder.php:582 SelectCreditItems.php:987 +#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:987 #: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1484 #: SelectOrderItems.php:1668 SelectProduct.php:732 SelectSalesOrder.php:580 #: SelectSupplier.php:258 SelectWorkOrder.php:191 Shipt_Select.php:189 @@ -2378,15 +2378,15 @@ msgid "Code" msgstr "Kód" -#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:276 +#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280 #: ContractBOM.php:347 CounterSales.php:2031 CounterSales.php:2216 #: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105 -#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1076 -#: PO_SelectOSPurchOrder.php:234 PO_SelectPurchOrder.php:215 -#: SelectCompletedOrder.php:587 SelectCreditItems.php:989 +#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1074 +#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:215 +#: SelectCompletedOrder.php:554 SelectCreditItems.php:989 #: SelectOrderItems.php:1486 SelectOrderItems.php:1670 SelectProduct.php:117 #: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194 -#: Shipments.php:392 Shipments.php:474 Shipt_Select.php:193 +#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193 #: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180 #: WorkOrderCosting.php:90 WorkOrderEntry.php:624 WorkOrderIssue.php:693 #: WorkOrderIssue.php:763 includes/DefineLabelClass.php:21 @@ -2422,14 +2422,14 @@ #: BOMInquiry.php:201 ContractBOM.php:239 ContractCosting.php:83 #: ContractCosting.php:89 ContractCosting.php:153 ContractOtherReqts.php:95 #: Contracts.php:963 Contracts.php:998 MRPPlannedWorkOrders.php:261 -#: MRPShortages.php:349 SpecialOrder.php:716 StockAdjustments.php:379 +#: MRPShortages.php:349 SpecialOrder.php:717 StockAdjustments.php:379 msgid "Unit Cost" msgstr "Jednotková cena" #: BOMInquiry.php:202 BOMInquiry.php:250 ContractBOM.php:272 #: ContractCosting.php:84 ContractCosting.php:90 ContractCosting.php:154 #: ContractCosting.php:175 Contracts.php:964 Contracts.php:999 -#: SpecialOrder.php:619 SpecialOrder.php:621 +#: SpecialOrder.php:620 SpecialOrder.php:622 msgid "Total Cost" msgstr "Celková cena" @@ -2512,7 +2512,7 @@ msgstr "Drill-down" #: BOMs.php:120 BOMs.php:126 BOMs.php:134 BOMs.php:873 OrderDetails.php:186 -#: PaymentTerms.php:190 PaymentTerms.php:196 PO_SelectOSPurchOrder.php:516 +#: PaymentTerms.php:190 PaymentTerms.php:196 PO_SelectOSPurchOrder.php:524 #: SalesAnalReptCols.php:285 SelectProduct.php:115 SelectProduct.php:161 #: SelectProduct.php:174 SelectProduct.php:258 SelectProduct.php:259 #: SelectProduct.php:754 @@ -2664,7 +2664,7 @@ msgid "The SQL used to retrieve description of the parent part was" msgstr "SQL slouží k získání popisu mateřské část byla" -#: BOMs.php:405 ConfirmDispatch_Invoice.php:1014 CounterSales.php:1413 +#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413 #: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1453 #: Stocks.php:940 Stocks.php:942 msgid "Assembly" @@ -2995,7 +2995,7 @@ #: CompanyPreferences.php:278 CustLoginSetup.php:161 Customers.php:449 #: Suppliers.php:679 Suppliers.php:856 SuppLoginSetup.php:147 -#: WWW_Users.php:448 +#: WWW_Users.php:452 msgid "Email Address" msgstr "E-mailová adresa" @@ -3051,17 +3051,17 @@ msgid "Create GL entries for stock transactions" msgstr "Vytvořte GL údaje pro obchodů s akciemi" -#: CompanyPreferences.php:519 ConfirmDispatch_Invoice.php:625 -#: ConfirmDispatch_Invoice.php:1653 Credit_Invoice.php:1512 +#: CompanyPreferences.php:519 ConfirmDispatch_Invoice.php:632 +#: ConfirmDispatch_Invoice.php:1660 Credit_Invoice.php:1512 #: FixedAssetItems.php:123 FixedAssetItems.php:625 GLBudgets.php:234 -#: GLTags.php:64 GoodsReceived.php:248 GoodsReceived.php:254 -#: GoodsReceived.php:261 GoodsReceived.php:741 Labels.php:259 +#: GLTags.php:64 GoodsReceived.php:249 GoodsReceived.php:255 +#: GoodsReceived.php:262 GoodsReceived.php:742 Labels.php:259 #: MRPCalendar.php:314 Payments.php:898 PcAuthorizeExpenses.php:288 #: PO_AuthoriseMyOrders.php:138 PricesByCost.php:221 PurchData.php:522 #: ReorderLevelLocation.php:148 SecurityTokens.php:97 #: SelectCreditItems.php:923 SMTPServer.php:63 StockCostUpdate.php:184 #: StockReorderLevel.php:103 Stocks.php:1198 SystemParameters.php:1032 -#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:331 +#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:332 msgid "Update" msgstr "Aktualizace" @@ -3175,22 +3175,22 @@ msgid "This order item could not be retrieved. Please select another order" msgstr "Tato objednat se nepodařilo získat. Prosím, vyberte jiný pořadí" -#: ConfirmDispatch_Invoice.php:252 +#: ConfirmDispatch_Invoice.php:256 msgid "Confirm Invoice" msgstr "Potvrdit faktury" -#: ConfirmDispatch_Invoice.php:253 +#: ConfirmDispatch_Invoice.php:257 msgid "Confirm Dispatch and Invoice" msgstr "Potvrdit Expedice a faktury" -#: ConfirmDispatch_Invoice.php:256 Contracts.php:772 CustLoginSetup.php:31 +#: ConfirmDispatch_Invoice.php:260 Contracts.php:772 CustLoginSetup.php:31 #: CustLoginSetup.php:32 CustomerAllocations.php:327 CustomerBranches.php:363 #: CustomerBranches.php:532 CustomerBranches.php:579 CustomerInquiry.php:126 #: CustomerReceipt.php:899 CustomerReceipt.php:953 CustomerReceipt.php:1101 #: Customers.php:14 Customers.php:325 CustomerTransInquiry.php:101 #: DeliveryDetails.php:804 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305 #: PDFOrderStatus.php:275 PricesByCost.php:153 SalesGraph.php:180 -#: SelectCompletedOrder.php:634 SelectContract.php:154 +#: SelectCompletedOrder.php:601 SelectContract.php:154 #: SelectCreditItems.php:238 SelectCustomer.php:24 SelectCustomer.php:210 #: SelectOrderItems.php:603 SelectRecurringSalesOrder.php:86 #: SelectSalesOrder.php:832 SelectSalesOrder.php:849 StockLocMovements.php:91 @@ -3205,16 +3205,16 @@ msgid "Customer" msgstr "Zákazník" -#: ConfirmDispatch_Invoice.php:256 CustEDISetup.php:93 Customers.php:440 +#: ConfirmDispatch_Invoice.php:260 CustEDISetup.php:93 Customers.php:440 #: Customers.php:659 Customers.php:694 DeliveryDetails.php:804 #: OrderDetails.php:67 SalesAnalRepts.php:27 SalesAnalRepts.php:29 -#: WWW_Users.php:275 WWW_Users.php:494 Z_ChangeBranchCode.php:201 +#: WWW_Users.php:275 WWW_Users.php:498 Z_ChangeBranchCode.php:201 #: includes/PDFStatementPageHeader.inc:112 includes/PDFTransPageHeader.inc:46 #: includes/PDFTransPageHeaderPortrait.inc:55 msgid "Customer Code" msgstr "Kód zákazníka" -#: ConfirmDispatch_Invoice.php:257 CustEDISetup.php:96 CustomerReceipt.php:252 +#: ConfirmDispatch_Invoice.php:261 CustEDISetup.php:96 CustomerReceipt.php:252 #: CustomerReceipt.php:1128 Customers.php:443 Customers.php:700 #: Customers.php:730 DeliveryDetails.php:805 OrderDetails.php:69 #: POReport.php:494 POReport.php:1268 SalesInquiry.php:754 @@ -3225,14 +3225,14 @@ msgid "Customer Name" msgstr "Název zákazníka" -#: ConfirmDispatch_Invoice.php:260 +#: ConfirmDispatch_Invoice.php:264 msgid "Invoice amounts stated in" msgstr "Všechny částky v" -#: ConfirmDispatch_Invoice.php:273 ContractBOM.php:235 ContractCosting.php:79 +#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79 #: ContractCosting.php:85 Contracts.php:959 CounterSales.php:739 #: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:823 -#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:660 +#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:658 #: PO_OrderDetails.php:146 PrintCustTrans.php:860 PrintCustTrans.php:949 #: PrintCustTrans.php:998 PrintCustTransPortrait.php:907 #: PrintCustTransPortrait.php:1005 PrintCustTransPortrait.php:1062 @@ -3242,8 +3242,8 @@ #: StockLocTransfer.php:185 StockLocTransferReceive.php:427 #: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787 #: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175 -#: SuppInvGRNs.php:117 SuppInvGRNs.php:295 SupplierCredit.php:315 -#: SupplierInvoice.php:289 includes/PDFOrderPageHeader_generic.inc:91 +#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315 +#: SupplierInvoice.php:287 includes/PDFOrderPageHeader_generic.inc:91 #: includes/PDFPickingListHeader.inc:72 #: includes/PDFQuotationPageHeader.inc:101 #: includes/PDFQuotationPortraitPageHeader.inc:101 @@ -3254,16 +3254,16 @@ msgid "Item Code" msgstr "Kód položky" -#: ConfirmDispatch_Invoice.php:274 ContractCosting.php:80 +#: ConfirmDispatch_Invoice.php:278 ContractCosting.php:80 #: ContractCosting.php:86 Contracts.php:960 CounterSales.php:740 #: Credit_Invoice.php:270 DeliveryDetails.php:824 DeliveryDetails.php:890 -#: OrderDetails.php:163 PO_Items.php:735 PO_OrderDetails.php:147 +#: OrderDetails.php:163 PO_Items.php:733 PO_OrderDetails.php:147 #: PrintCustTrans.php:861 PrintCustTrans.php:950 PrintCustTrans.php:999 #: PrintCustTransPortrait.php:908 PrintCustTransPortrait.php:1006 #: PrintCustTransPortrait.php:1063 RecurringSalesOrders.php:319 #: ReprintGRN.php:82 SalesInquiry.php:821 SalesInquiry.php:839 #: SalesInquiry.php:938 SelectCreditItems.php:672 SelectOrderItems.php:1332 -#: SpecialOrder.php:614 StockLocTransferReceive.php:428 +#: SpecialOrder.php:615 StockLocTransferReceive.php:428 #: includes/PDFOrderPageHeader_generic.inc:92 #: includes/PDFPickingListHeader.inc:73 #: includes/PDFQuotationPageHeader.inc:102 @@ -3274,28 +3274,28 @@ msgid "Item Description" msgstr "Popis položky" -#: ConfirmDispatch_Invoice.php:275 GoodsReceived.php:100 GoodsReceived.php:104 -#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:391 -#: Shipments.php:473 +#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104 +#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401 +#: Shipments.php:488 msgid "Ordered" msgstr "Objednáno" -#: ConfirmDispatch_Invoice.php:277 FTP_RadioBeacon.php:83 +#: ConfirmDispatch_Invoice.php:281 FTP_RadioBeacon.php:83 #: GoodsReceived.php:102 GoodsReceived.php:106 #, php-format msgid "Already" msgstr "Již" -#: ConfirmDispatch_Invoice.php:277 FTP_RadioBeacon.php:83 +#: ConfirmDispatch_Invoice.php:281 FTP_RadioBeacon.php:83 #, php-format msgid "Sent" msgstr "odesláno" -#: ConfirmDispatch_Invoice.php:278 +#: ConfirmDispatch_Invoice.php:282 msgid "This Dispatch" msgstr "Tato zásilka" -#: ConfirmDispatch_Invoice.php:279 CounterSales.php:744 Credit_Invoice.php:274 +#: ConfirmDispatch_Invoice.php:283 CounterSales.php:744 Credit_Invoice.php:274 #: DeliveryDetails.php:827 DeliveryDetails.php:893 GoodsReceived.php:111 #: OffersReceived.php:107 OffersReceived.php:215 OffersReceived.php:260 #: OrderDetails.php:166 PDFOrdersInvoiced.php:391 PDFPriceList.php:365 @@ -3305,7 +3305,7 @@ #: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009 #: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483 #: RecurringSalesOrders.php:322 SelectCreditItems.php:675 -#: SelectOrderItems.php:1336 Shipments.php:395 StockLocMovements.php:94 +#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94 #: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181 #: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267 #: SupplierTenders.php:494 SuppPriceList.php:292 @@ -3316,7 +3316,7 @@ msgid "Price" msgstr "Cena" -#: ConfirmDispatch_Invoice.php:280 CounterSales.php:745 Credit_Invoice.php:275 +#: ConfirmDispatch_Invoice.php:284 CounterSales.php:745 Credit_Invoice.php:275 #: CustomerReceipt.php:898 DeliveryDetails.php:828 OrderDetails.php:167 #: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003 #: PrintCustTransPortrait.php:912 PrintCustTransPortrait.php:1010 @@ -3329,7 +3329,7 @@ msgid "Discount" msgstr "Sleva" -#: ConfirmDispatch_Invoice.php:281 ConfirmDispatch_Invoice.php:285 +#: ConfirmDispatch_Invoice.php:285 ConfirmDispatch_Invoice.php:289 #: CounterSales.php:749 CounterSales.php:836 Credit_Invoice.php:276 #: Credit_Invoice.php:280 CustomerAllocations.php:331 #: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:829 @@ -3358,21 +3358,21 @@ msgid "Total" msgstr "Celkem" -#: ConfirmDispatch_Invoice.php:281 Credit_Invoice.php:276 +#: ConfirmDispatch_Invoice.php:285 Credit_Invoice.php:276 #: SelectCreditItems.php:678 msgid "Excl Tax" msgstr "bez DPH" -#: ConfirmDispatch_Invoice.php:282 Credit_Invoice.php:277 -#: SelectCreditItems.php:679 SupplierInvoice.php:237 TaxGroups.php:285 +#: ConfirmDispatch_Invoice.php:286 Credit_Invoice.php:277 +#: SelectCreditItems.php:679 SupplierInvoice.php:235 TaxGroups.php:285 msgid "Tax Authority" msgstr "Daňový úřad" -#: ConfirmDispatch_Invoice.php:283 +#: ConfirmDispatch_Invoice.php:287 msgid "Tax %" msgstr "DPH %" -#: ConfirmDispatch_Invoice.php:284 CounterSales.php:748 Credit_Invoice.php:278 +#: ConfirmDispatch_Invoice.php:288 CounterSales.php:748 Credit_Invoice.php:278 #: Credit_Invoice.php:279 PrintCustTrans.php:395 PrintCustTrans.php:1041 #: PrintCustTransPortrait.php:455 PrintCustTransPortrait.php:1105 #: SelectCreditItems.php:680 SelectCreditItems.php:681 @@ -3380,32 +3380,32 @@ msgid "Tax" msgstr "DPH" -#: ConfirmDispatch_Invoice.php:285 CounterSales.php:749 Credit_Invoice.php:280 +#: ConfirmDispatch_Invoice.php:289 CounterSales.php:749 Credit_Invoice.php:280 #: SelectCreditItems.php:682 msgid "Incl Tax" msgstr "včetně DPH" -#: ConfirmDispatch_Invoice.php:396 StockLocTransferReceive.php:481 +#: ConfirmDispatch_Invoice.php:400 StockLocTransferReceive.php:481 msgid "Enter Serial Numbers" msgstr "Vložit sériová čísla" -#: ConfirmDispatch_Invoice.php:398 +#: ConfirmDispatch_Invoice.php:402 msgid "Enter Batch/Roll/Lot #" msgstr "Zadejte Dávkové / role / položka #" -#: ConfirmDispatch_Invoice.php:433 +#: ConfirmDispatch_Invoice.php:437 msgid "There was a problem testing for a default shipper because" msgstr "Tam byl problém testování pro přepravce, protože výchozí" -#: ConfirmDispatch_Invoice.php:439 +#: ConfirmDispatch_Invoice.php:443 msgid "There was a problem testing for a default shipper" msgstr "Tam byl problém testování na výchozí odesílatele" -#: ConfirmDispatch_Invoice.php:445 +#: ConfirmDispatch_Invoice.php:449 msgid "There are no shippers defined" msgstr "Nejsou definováni žádní dopravci" -#: ConfirmDispatch_Invoice.php:445 +#: ConfirmDispatch_Invoice.php:449 msgid "" "Please use the link below to set up shipping freight companies, the system " "expects the shipping company to be selected or a default freight company to " @@ -3415,7 +3415,7 @@ "systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí " "nákladní společnost mají být použity" -#: ConfirmDispatch_Invoice.php:446 DeliveryDetails.php:245 Prices.php:355 +#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 Prices.php:355 #: includes/InputSerialItemsExisting.php:59 #: includes/InputSerialItemsKeyed.php:150 #: includes/InputSerialItemsSequential.php:53 @@ -3423,35 +3423,35 @@ msgid "Enter" msgstr "Vložit" -#: ConfirmDispatch_Invoice.php:446 DeliveryDetails.php:245 +#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 msgid "Amend Freight Companies" msgstr "Mění se Nákladní Firmy" -#: ConfirmDispatch_Invoice.php:457 +#: ConfirmDispatch_Invoice.php:461 msgid "Order Freight Cost" msgstr "Cena za dopravu" -#: ConfirmDispatch_Invoice.php:461 +#: ConfirmDispatch_Invoice.php:465 msgid "Recalculated Freight Cost" msgstr "Přepočítána přepravní náklady" -#: ConfirmDispatch_Invoice.php:471 ConfirmDispatch_Invoice.php:475 +#: ConfirmDispatch_Invoice.php:478 ConfirmDispatch_Invoice.php:482 msgid "Charge Freight Cost inc Tax" msgstr "Účtovat přepravní náklady s DPH" -#: ConfirmDispatch_Invoice.php:539 +#: ConfirmDispatch_Invoice.php:546 msgid "Invoice Totals" msgstr "Faktura celkem" -#: ConfirmDispatch_Invoice.php:569 +#: ConfirmDispatch_Invoice.php:576 msgid "There are no lines on this order with a quantity to invoice" msgstr "Tam nejsou žádné čáry na této objednávky se množství faktury" -#: ConfirmDispatch_Invoice.php:569 +#: ConfirmDispatch_Invoice.php:576 msgid "No further processing has been done" msgstr "Žádné další zpracování bylo provedeno" -#: ConfirmDispatch_Invoice.php:587 CounterSales.php:937 +#: ConfirmDispatch_Invoice.php:594 CounterSales.php:937 msgid "" "Could not retrieve the quantity left at the location once this order is " "invoiced (for the purposes of checking that stock will not go negative " @@ -3460,7 +3460,7 @@ "Nepodařilo se načíst množství vlevo na místě, jakmile toto pořadí je " "fakturováno (za účelem kontroly, zda vozidla nepůjde, protože negativní)" -#: ConfirmDispatch_Invoice.php:592 CounterSales.php:942 +#: ConfirmDispatch_Invoice.php:599 CounterSales.php:942 msgid "" "Invoicing the selected order would result in negative stock. The system " "parameters are set to prohibit negative stocks from occurring. This invoice " @@ -3470,12 +3470,12 @@ "systému jsou nastaveny zakázat negativní zásoby od nastávání. Tato faktura " "může být vytvořena do vyprodání na ruce je opraven." -#: ConfirmDispatch_Invoice.php:592 ConfirmDispatch_Invoice.php:615 +#: ConfirmDispatch_Invoice.php:599 ConfirmDispatch_Invoice.php:622 #: CounterSales.php:942 CounterSales.php:965 WorkOrderReceive.php:157 msgid "Negative Stock Prohibited" msgstr "Negativní Zakázané skladem" -#: ConfirmDispatch_Invoice.php:611 CounterSales.php:961 +#: ConfirmDispatch_Invoice.php:618 CounterSales.php:961 msgid "" "Could not retrieve the component quantity left at the location once the " "assembly item on this order is invoiced (for the purposes of checking that " @@ -3485,7 +3485,7 @@ "na tomto pořadí je fakturováno (za účelem kontroly, zda vozidla nepůjde, " "protože negativní)" -#: ConfirmDispatch_Invoice.php:615 CounterSales.php:965 +#: ConfirmDispatch_Invoice.php:622 CounterSales.php:965 msgid "" "Invoicing the selected order would result in negative stock for a component " "of an assembly item on the order. The system parameters are set to prohibit " @@ -3497,34 +3497,34 @@ "negativní zásoby od nastávání. Tato faktura může být vytvořena do vyprodání " "na ruce je opraven." -#: ConfirmDispatch_Invoice.php:641 +#: ConfirmDispatch_Invoice.php:648 msgid "" "We were unable to load Area where the Sale is to from the BRANCHES table" msgstr "Nebyli jsme schopni načíst oblast, kde Prodej je z tabulky OBORY" -#: ConfirmDispatch_Invoice.php:641 +#: ConfirmDispatch_Invoice.php:648 msgid "Please remedy this" msgstr "Prosím nápravě tohoto" -#: ConfirmDispatch_Invoice.php:652 Credit_Invoice.php:479 -#: GoodsReceived.php:271 +#: ConfirmDispatch_Invoice.php:659 Credit_Invoice.php:479 +#: GoodsReceived.php:272 msgid "The company information and preferences could not be retrieved" msgstr "Informace o společnosti a preference se nepodařilo získat" -#: ConfirmDispatch_Invoice.php:652 Credit_Invoice.php:479 -#: GoodsReceived.php:271 +#: ConfirmDispatch_Invoice.php:659 Credit_Invoice.php:479 +#: GoodsReceived.php:272 msgid "see your system administrator" msgstr "kontaktujte administrátora" -#: ConfirmDispatch_Invoice.php:675 +#: ConfirmDispatch_Invoice.php:682 msgid "Number of rows returned by SQL" msgstr "Počet řádků vrácených SQL dotazem" -#: ConfirmDispatch_Invoice.php:676 +#: ConfirmDispatch_Invoice.php:683 msgid "Count of items in the session" msgstr "Počet položek v relaci" -#: ConfirmDispatch_Invoice.php:680 ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:687 ConfirmDispatch_Invoice.php:704 msgid "" "This order has been changed or invoiced since this delivery was started to " "be confirmed" @@ -3532,15 +3532,15 @@ "Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena " "bude potvrzeno" -#: ConfirmDispatch_Invoice.php:680 GoodsReceived.php:308 +#: ConfirmDispatch_Invoice.php:687 GoodsReceived.php:309 msgid "Processing halted" msgstr "Zpracování zastaveno" -#: ConfirmDispatch_Invoice.php:680 +#: ConfirmDispatch_Invoice.php:687 msgid "To enter and confirm this dispatch" msgstr "Chcete-li zadat a potvrdit tuto expedici" -#: ConfirmDispatch_Invoice.php:680 +#: ConfirmDispatch_Invoice.php:687 msgid "" "invoice the order must be re-selected and re-read again to update the " "changes made by the other user" @@ -3548,31 +3548,31 @@ "faktura příkaz musí být re-vybraný a re-číst a aktualizovat změny provedené " "ostatními uživateli" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "Orig order for" msgstr "Orig aby" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "has a quantity of" msgstr "má množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "and an invoiced qty of" msgstr "a fakturované Množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "the session shows quantity of" msgstr "zasedání ukazuje množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "and quantity invoice of" msgstr "a množství fakturu" -#: ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:704 msgid "Processing halted." msgstr "Zpracování zastaveno." -#: ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:704 msgid "" "To enter and confirm this dispatch, it must be re-selected and re-read again " "to update the changes made by the other user" @@ -3580,33 +3580,33 @@ "Chcete-li zadat a potvrdit tuto expedici, je třeba re-vybraný a re-číst a " "aktualizovat změny provedené ostatními uživateli" -#: ConfirmDispatch_Invoice.php:701 +#: ConfirmDispatch_Invoice.php:708 msgid "Select a sales order for confirming deliveries and invoicing" msgstr "Vyberte prodejní objednávky k potvrzení dodávky a fakturace" -#: ConfirmDispatch_Invoice.php:731 +#: ConfirmDispatch_Invoice.php:738 msgid "Could not update the default shipping carrier for this branch because" msgstr "Nemohu aktualizovat výchozí lodní dopravce pro tento obor, protože" -#: ConfirmDispatch_Invoice.php:732 +#: ConfirmDispatch_Invoice.php:739 msgid "The SQL used to update the branch default carrier was" msgstr "SQL používaných k aktualizaci pobočky výchozí dopravce byl" -#: ConfirmDispatch_Invoice.php:743 ConfirmDispatch_Invoice.php:785 -#: ConfirmDispatch_Invoice.php:801 ConfirmDispatch_Invoice.php:833 -#: ConfirmDispatch_Invoice.php:856 ConfirmDispatch_Invoice.php:884 -#: ConfirmDispatch_Invoice.php:910 ConfirmDispatch_Invoice.php:948 -#: ConfirmDispatch_Invoice.php:966 ConfirmDispatch_Invoice.php:980 -#: ConfirmDispatch_Invoice.php:1020 ConfirmDispatch_Invoice.php:1030 -#: ConfirmDispatch_Invoice.php:1113 ConfirmDispatch_Invoice.php:1134 -#: ConfirmDispatch_Invoice.php:1151 ConfirmDispatch_Invoice.php:1166 -#: ConfirmDispatch_Invoice.php:1290 ConfirmDispatch_Invoice.php:1313 -#: ConfirmDispatch_Invoice.php:1340 ConfirmDispatch_Invoice.php:1362 -#: ConfirmDispatch_Invoice.php:1408 ConfirmDispatch_Invoice.php:1430 -#: ConfirmDispatch_Invoice.php:1452 ConfirmDispatch_Invoice.php:1474 -#: ConfirmDispatch_Invoice.php:1502 ConfirmDispatch_Invoice.php:1511 -#: ConfirmDispatch_Invoice.php:1540 ConfirmDispatch_Invoice.php:1565 -#: ConfirmDispatch_Invoice.php:1587 ContractCosting.php:248 +#: ConfirmDispatch_Invoice.php:750 ConfirmDispatch_Invoice.php:792 +#: ConfirmDispatch_Invoice.php:808 ConfirmDispatch_Invoice.php:840 +#: ConfirmDispatch_Invoice.php:863 ConfirmDispatch_Invoice.php:891 +#: ConfirmDispatch_Invoice.php:917 ConfirmDispatch_Invoice.php:955 +#: ConfirmDispatch_Invoice.php:973 ConfirmDispatch_Invoice.php:987 +#: ConfirmDispatch_Invoice.php:1027 ConfirmDispatch_Invoice.php:1037 +#: ConfirmDispatch_Invoice.php:1120 ConfirmDispatch_Invoice.php:1141 +#: ConfirmDispatch_Invoice.php:1158 ConfirmDispatch_Invoice.php:1173 +#: ConfirmDispatch_Invoice.php:1297 ConfirmDispatch_Invoice.php:1320 +#: ConfirmDispatch_Invoice.php:1347 ConfirmDispatch_Invoice.php:1369 +#: ConfirmDispatch_Invoice.php:1415 ConfirmDispatch_Invoice.php:1437 +#: ConfirmDispatch_Invoice.php:1459 ConfirmDispatch_Invoice.php:1481 +#: ConfirmDispatch_Invoice.php:1509 ConfirmDispatch_Invoice.php:1518 +#: ConfirmDispatch_Invoice.php:1547 ConfirmDispatch_Invoice.php:1572 +#: ConfirmDispatch_Invoice.php:1594 ContractCosting.php:248 #: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330 #: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408 #: ContractCosting.php:415 CounterSales.php:1252 CounterSales.php:1292 @@ -3623,10 +3623,10 @@ #: Credit_Invoice.php:1048 Credit_Invoice.php:1071 Credit_Invoice.php:1243 #: Credit_Invoice.php:1283 Credit_Invoice.php:1310 Credit_Invoice.php:1331 #: Credit_Invoice.php:1360 Credit_Invoice.php:1386 Credit_Invoice.php:1412 -#: GoodsReceived.php:290 GoodsReceived.php:385 GoodsReceived.php:426 -#: GoodsReceived.php:456 GoodsReceived.php:484 GoodsReceived.php:515 -#: GoodsReceived.php:533 GoodsReceived.php:562 GoodsReceived.php:579 -#: GoodsReceived.php:669 GoodsReceived.php:692 PDFStockCheckComparison.php:119 +#: GoodsReceived.php:291 GoodsReceived.php:386 GoodsReceived.php:427 +#: GoodsReceived.php:457 GoodsReceived.php:485 GoodsReceived.php:516 +#: GoodsReceived.php:534 GoodsReceived.php:563 GoodsReceived.php:580 +#: GoodsReceived.php:670 GoodsReceived.php:693 PDFStockCheckComparison.php:119 #: PDFStockCheckComparison.php:127 PDFStockCheckComparison.php:134 #: PDFStockCheckComparison.php:153 PDFStockCheckComparison.php:173 #: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361 @@ -3676,14 +3676,14 @@ #: SupplierCredit.php:1092 SupplierCredit.php:1116 SupplierCredit.php:1148 #: SupplierCredit.php:1164 SupplierCredit.php:1177 SupplierCredit.php:1184 #: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierCredit.php:1288 -#: SupplierInvoice.php:656 SupplierInvoice.php:729 SupplierInvoice.php:757 -#: SupplierInvoice.php:784 SupplierInvoice.php:816 SupplierInvoice.php:849 -#: SupplierInvoice.php:879 SupplierInvoice.php:914 SupplierInvoice.php:939 -#: SupplierInvoice.php:951 SupplierInvoice.php:987 SupplierInvoice.php:1024 -#: SupplierInvoice.php:1049 SupplierInvoice.php:1083 SupplierInvoice.php:1109 -#: SupplierInvoice.php:1140 Sup... [truncated message content] |
From: <dai...@us...> - 2011-12-03 04:18:59
|
Revision: 4762 http://web-erp.svn.sourceforge.net/web-erp/?rev=4762&view=rev Author: daintree Date: 2011-12-03 04:18:47 +0000 (Sat, 03 Dec 2011) Log Message: ----------- pre v 4.06.2 Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/doc/Change.log trunk/includes/ConnectDB.inc trunk/includes/footer.inc 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_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.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/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.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/sql/mysql/upgrade4.05-4.06.sql trunk/sql/mysql/weberp-demo.sql trunk/sql/mysql/weberp-new.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/UpgradeDatabase.php 2011-12-03 04:18:47 UTC (rev 4762) @@ -121,8 +121,9 @@ case '4.05.2': case '4.05.3': case '4.06': + case '4.06.1': $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql'; - case '4.06.1': + case '4.06.2': break; } //end switch } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/doc/Change.log 2011-12-03 04:18:47 UTC (rev 4762) @@ -1,5 +1,8 @@ webERP Change Log +3/12/11 Release 4.06.2 + +2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8 27/11/11 Phil: Removed a load of DB_escape_string() calls as no longer required now the entire $_POST and $_GET array are DB_escape_string()'ed 27/11/11 Tim: PrintCustTransPortrait.php added bank account code 27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/includes/ConnectDB.inc 2011-12-03 04:18:47 UTC (rev 4762) @@ -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.06.1'; //must update manually every time there is a DB change +$Version='4.06.2'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); @@ -31,4 +31,4 @@ include_once($PathPrefix .'includes/ConnectDB_' . $dbType . '.inc'); } -?> +?> \ No newline at end of file Modified: trunk/includes/footer.inc =================================================================== --- trunk/includes/footer.inc 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/includes/footer.inc 2011-12-03 04:18:47 UTC (rev 4762) @@ -20,7 +20,7 @@ echo '<tr> <td class="footer"> </td> - <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org - '.date('Y').'</td> + <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org 2002 - '.date('Y').'</td> </tr>'; if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) { Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 03:03:38 UTC (rev 4761) +++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 04:18:47 UTC (rev 4762) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 3.08\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-19 17:05+1300\n" +"POT-Creation-Date: 2011-12-03 16:31+1300\n" "PO-Revision-Date: 2011-02-07 15:33+0000\n" "Last-Translator: Tim Schofield <Unknown>\n" "Language-Team: Czech <cs...@li...>\n" @@ -147,9 +147,9 @@ #: Locations.php:256 Locations.php:265 Locations.php:274 Locations.php:283 #: Locations.php:292 Locations.php:301 MRPDemandTypes.php:87 #: PaymentMethods.php:138 PaymentTerms.php:146 PaymentTerms.php:153 -#: PcExpenses.php:158 SalesCategories.php:124 SalesCategories.php:131 +#: PcExpenses.php:158 SalesCategories.php:125 SalesCategories.php:132 #: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163 -#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:82 Shippers.php:94 +#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 #: StockCategories.php:181 Stocks.php:615 Stocks.php:624 Stocks.php:632 #: Stocks.php:640 Stocks.php:648 Stocks.php:656 Suppliers.php:612 #: Suppliers.php:621 Suppliers.php:629 SupplierTypes.php:145 @@ -220,7 +220,7 @@ #: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28 #: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17 #: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64 -#: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8 +#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8 #: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258 #: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 #: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17 @@ -231,7 +231,7 @@ #: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533 #: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9 #: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17 -#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8 +#: Shippers.php:122 Shippers.php:158 Shipt_Select.php:8 #: StockLocMovements.php:13 StockLocStatus.php:27 Suppliers.php:302 #: SupplierTenders.php:260 SupplierTenders.php:317 SupplierTransInquiry.php:10 #: TaxGroups.php:15 TaxProvinces.php:11 TopItems.php:77 @@ -278,14 +278,14 @@ #: PaymentMethods.php:275 PcAuthorizeExpenses.php:244 PDFChequeListing.php:63 #: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75 #: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 -#: PO_Header.php:777 PO_PDFPurchOrder.php:382 PO_PDFPurchOrder.php:385 +#: PO_Header.php:783 PO_PDFPurchOrder.php:384 PO_PDFPurchOrder.php:387 #: PurchData.php:189 PurchData.php:514 PurchData.php:517 #: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 #: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418 #: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471 -#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:354 -#: SalesPeople.php:356 SelectProduct.php:381 ShipmentCosting.php:663 +#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355 +#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663 #: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042 #: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412 #: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499 @@ -294,7 +294,7 @@ #: SystemParameters.php:781 SystemParameters.php:916 SystemParameters.php:918 #: SystemParameters.php:928 SystemParameters.php:930 SystemParameters.php:984 #: SystemParameters.php:996 SystemParameters.php:998 TaxGroups.php:307 -#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:632 WWW_Users.php:634 +#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:636 WWW_Users.php:638 msgid "Yes" msgstr "Ano" @@ -313,14 +313,14 @@ #: PaymentMethods.php:276 PcAuthorizeExpenses.php:242 PDFChequeListing.php:62 #: PDFDeliveryDifferences.php:74 PDFDIFOT.php:74 #: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141 -#: PO_Header.php:776 PO_PDFPurchOrder.php:383 PO_PDFPurchOrder.php:386 +#: PO_Header.php:782 PO_PDFPurchOrder.php:385 PO_PDFPurchOrder.php:388 #: PurchData.php:192 PurchData.php:515 PurchData.php:518 #: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484 #: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420 #: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417 #: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470 -#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:359 -#: SalesPeople.php:361 SelectProduct.php:383 ShipmentCosting.php:664 +#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360 +#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664 #: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037 #: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413 #: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500 @@ -329,7 +329,7 @@ #: SystemParameters.php:782 SystemParameters.php:915 SystemParameters.php:919 #: SystemParameters.php:927 SystemParameters.php:931 SystemParameters.php:985 #: SystemParameters.php:995 SystemParameters.php:999 TaxGroups.php:308 -#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:631 WWW_Users.php:635 +#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:635 WWW_Users.php:639 #: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35 msgid "No" msgstr "Ne" @@ -346,11 +346,11 @@ #: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259 #: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234 #: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278 -#: Prices.php:251 PurchData.php:204 SalesCategories.php:255 +#: Prices.php:251 PurchData.php:204 SalesCategories.php:256 #: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232 #: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612 #: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671 -#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:144 +#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:143 #: StockCategories.php:242 SupplierContacts.php:163 SupplierTypes.php:189 #: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182 #: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185 @@ -378,20 +378,20 @@ #: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206 #: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224 #: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173 -#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279 +#: PO_AuthorisationLevels.php:153 PO_Items.php:709 Prices_Customer.php:279 #: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299 -#: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133 +#: SalesAnalRepts.php:303 SalesCategories.php:257 SalesGLPostings.php:133 #: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207 #: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613 #: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672 #: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398 -#: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655 -#: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99 -#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139 +#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656 +#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99 +#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147 #: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90 #: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183 #: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186 -#: WorkCentres.php:142 WOSerialNos.php:319 WWW_Access.php:124 +#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124 #: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58 #: includes/OutputSerialItems.php:99 #, php-format @@ -446,10 +446,10 @@ #: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282 #: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356 #: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416 -#: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581 +#: SalesPeople.php:369 Shippers.php:199 StockCategories.php:584 #: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327 #: TaxCategories.php:237 TaxProvinces.php:235 UnitsOfMeasure.php:240 -#: WorkCentres.php:279 WWW_Users.php:674 +#: WorkCentres.php:279 WWW_Users.php:678 msgid "Enter Information" msgstr "Vložit informace" @@ -560,7 +560,7 @@ #: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69 #: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246 #: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 -#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:374 +#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371 #: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66 #: Stocks.php:497 Suppliers.php:513 SupplierTypes.php:67 msgid "has been updated" @@ -597,12 +597,12 @@ #: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253 #: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15 #: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563 -#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369 -#: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945 +#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:371 +#: PO_PDFPurchOrder.php:374 PrintCustTrans.php:714 PrintCustTrans.php:945 #: PrintCustTrans.php:994 PrintCustTransPortrait.php:753 #: PrintCustTransPortrait.php:999 PrintCustTransPortrait.php:1056 #: SelectCustomer.php:610 SupplierContacts.php:154 SupplierContacts.php:274 -#: UserSettings.php:183 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25 +#: UserSettings.php:184 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25 #: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82 #: includes/PDFTransPageHeaderPortrait.inc:109 #: includes/PO_PDFOrderPageHeader.inc:29 @@ -613,7 +613,7 @@ #: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 #: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214 #: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611 -#: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296 +#: SystemParameters.php:328 WOSerialNos.php:291 WOSerialNos.php:297 msgid "Notes" msgstr "Bere na vědomí" @@ -635,7 +635,7 @@ msgstr "Jméno kontaktní osoby" #: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239 -#: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241 +#: PO_Header.php:992 PO_Header.php:1073 SelectCreditItems.php:241 #: SelectCustomer.php:417 SelectOrderItems.php:606 #: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81 #: includes/PDFTransPageHeaderPortrait.inc:105 @@ -685,7 +685,7 @@ #: PaymentAllocations.php:66 PcAssignCashToTab.php:220 #: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300 #: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386 -#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:476 +#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491 #: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90 #: StockMovements.php:94 StockSerialItemResearch.php:81 #: SupplierAllocations.php:455 SupplierAllocations.php:568 @@ -699,10 +699,10 @@ msgstr "Datum" #: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173 -#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178 -#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187 -#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196 -#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179 +#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188 +#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197 +#: UpgradeDatabase.php:200 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 @@ -850,7 +850,7 @@ #: PDFPriceList.php:128 PDFQuotation.php:270 PDFQuotationPortrait.php:268 #: PDFRemittanceAdvice.php:83 PDFStockCheckComparison.php:37 #: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268 -#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:152 +#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:154 #: PrintCustOrder_generic.php:243 PrintCustOrder.php:220 ReorderLevel.php:63 #: ReorderLevel.php:152 SalesAnalysis_UserDefined.php:28 #: SelectCreditItems.php:30 StockCheck.php:47 StockCheck.php:69 @@ -879,16 +879,16 @@ msgstr "Podrobnosti o nesplacených transakcí pro zákazníka" #: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168 -#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435 -#: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365 -#: SpecialOrder.php:440 StockLocTransferReceive.php:370 +#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:433 +#: PO_Items.php:557 PO_Items.php:582 SalesAnalReptCols.php:365 +#: SpecialOrder.php:441 StockLocTransferReceive.php:370 #: StockQuantityByDate.php:121 includes/SelectOrderItems_IntoCart.inc:54 msgid "could not be retrieved because" msgstr "se nepodařilo získat, protože" #: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95 -#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967 -#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365 +#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974 +#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365 #: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718 #: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709 #: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596 @@ -909,7 +909,7 @@ #: includes/PDFPaymentRun_PymtFooter.php:91 #: includes/PDFPaymentRun_PymtFooter.php:121 #: includes/PDFPaymentRun_PymtFooter.php:158 -#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:81 +#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76 #: includes/ConnectDB_mysql.inc:67 msgid "The SQL that failed was" msgstr "SQL příkaz, který selhal, byl" @@ -1109,7 +1109,7 @@ #: FixedAssetCategories.php:138 GLAccounts.php:197 Locations.php:328 #: MRPDemands.php:248 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126 #: PcExpenses.php:166 PcExpensesTypeTab.php:101 PcTabs.php:166 -#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:135 +#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:136 #: SalesTypes.php:156 StockCategories.php:198 Suppliers.php:638 #: SupplierTypes.php:151 Z_DeleteInvoice.php:146 msgid "has been deleted" @@ -1152,7 +1152,7 @@ #: AuditTrail.php:47 PO_AuthorisationLevels.php:124 #: PO_AuthorisationLevels.php:172 PO_AuthorisationLevels.php:175 -#: UserSettings.php:111 +#: UserSettings.php:112 msgid "User ID" msgstr "ID uživatele" @@ -1163,7 +1163,7 @@ #: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585 #: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144 #: PDFPeriodStockTransListing.php:59 PDFPriceList.php:198 -#: PDFPrintLabel.php:250 PO_Items.php:1023 POReport.php:1567 +#: PDFPrintLabel.php:250 PO_Items.php:1021 POReport.php:1567 #: ReorderLevel.php:181 ReorderLevel.php:183 ReorderLevel.php:213 #: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119 #: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179 @@ -1408,10 +1408,10 @@ #: PcTabs.php:206 PcTabs.php:349 PDFPrintLabel.php:97 #: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:209 #: PO_AuthorisationLevels.php:214 PO_AuthoriseMyOrders.php:115 -#: PO_Header.php:554 PO_SelectOSPurchOrder.php:481 PO_SelectPurchOrder.php:432 +#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432 #: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169 #: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260 -#: SupplierCredit.php:263 SupplierInvoice.php:235 SupplierTransInquiry.php:109 +#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109 #: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42 #: includes/PDFDebtorBalsPageHeader.inc:33 #: includes/PDFSupplierBalsPageHeader.inc:36 @@ -1535,7 +1535,7 @@ #: PDFDeliveryDifferences.php:200 PDFDeliveryDifferences.php:296 #: PDFDIFOT.php:190 PDFDIFOT.php:203 PDFDIFOT.php:307 PDFOrdersInvoiced.php:77 #: PDFOrdersInvoiced.php:274 PDFOrderStatus.php:82 PDFOrderStatus.php:256 -#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:332 +#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:334 #: PricesBasedOnMarkUp.php:213 PricesBasedOnMarkUp.php:352 #: PrintCustStatements.php:43 PrintCustTrans.php:60 PrintCustTrans.php:63 #: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61 @@ -1641,7 +1641,7 @@ msgid "Ref" msgstr "Ref" -#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279 +#: BankMatching.php:264 ConfirmDispatch_Invoice.php:288 Credit_Invoice.php:279 #: CustomerAllocations.php:364 CustomerReceipt.php:897 #: CustomerTransInquiry.php:107 CustWhereAlloc.php:109 #: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030 @@ -1652,8 +1652,8 @@ #: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76 #: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457 #: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421 -#: SupplierCredit.php:460 SupplierInvoice.php:330 SupplierInvoice.php:371 -#: SupplierInvoice.php:411 SupplierInvoice.php:455 +#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369 +#: SupplierInvoice.php:409 SupplierInvoice.php:453 #: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146 #: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191 #: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55 @@ -1663,7 +1663,7 @@ #: BankMatching.php:265 BankReconciliation.php:214 BankReconciliation.php:289 #: PDFOrdersInvoiced.php:351 PDFOrderStatus.php:322 -#: PO_SelectOSPurchOrder.php:233 PO_SelectPurchOrder.php:214 +#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:214 #: Shipt_Select.php:192 SuppCreditGRNs.php:267 #: includes/PDFStatementPageHeader.inc:173 #: includes/PDFStatementPageHeader.inc:180 @@ -1936,13 +1936,13 @@ #: SelectCreditItems.php:673 SelectCreditItems.php:1034 #: SelectOrderItems.php:1333 SelectOrderItems.php:1491 #: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145 -#: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393 -#: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616 +#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403 +#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617 #: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186 #: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12 #: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317 -#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255 -#: WOSerialNos.php:295 includes/InputSerialItems.php:111 +#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256 +#: WOSerialNos.php:296 includes/InputSerialItems.php:111 #: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38 #: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49 #: includes/PDFBOMListingPageHeader.inc:44 @@ -2002,8 +2002,8 @@ #: InventoryQuantities.php:232 MRPPlannedPurchaseOrders.php:303 #: MRPPlannedWorkOrders.php:360 MRPReport.php:813 MRPReschedules.php:177 #: MRPShortages.php:331 PDFOrderStatus.php:305 PDFPriceList.php:337 -#: PDFReceipt.php:31 PO_Header.php:814 PO_PDFPurchOrder.php:61 -#: PO_SelectOSPurchOrder.php:511 ReorderLevel.php:251 StockDispatch.php:355 +#: PDFReceipt.php:31 PO_Header.php:820 PO_PDFPurchOrder.php:61 +#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:251 StockDispatch.php:355 #: SuppPriceList.php:273 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34 #: includes/PDFAgedSuppliersPageHeader.inc:21 #: includes/PDFBalanceSheetPageHeader.inc:25 @@ -2097,9 +2097,9 @@ msgstr "Stavět" #: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856 -#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232 +#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236 #: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70 -#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584 +#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551 #: SelectOrderItems.php:1487 SelectOrderItems.php:1671 #: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191 #: TopItems.php:182 includes/PDFTopItemsHeader.inc:54 @@ -2181,20 +2181,20 @@ #: MRPReschedules.php:189 MRPShortages.php:347 PaymentTerms.php:182 #: PcExpenses.php:187 PcExpenses.php:291 PcExpensesTypeTab.php:169 #: PcReportTab.php:171 PcTypeTabs.php:156 PDFOrdersInvoiced.php:348 -#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:661 -#: PO_Items.php:1073 PO_SelectOSPurchOrder.php:231 PO_SelectPurchOrder.php:212 +#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:659 +#: PO_Items.php:1071 PO_SelectOSPurchOrder.php:235 PO_SelectPurchOrder.php:212 #: PricesByCost.php:152 ReorderLevelLocation.php:67 ReorderLevel.php:266 -#: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94 +#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94 #: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243 -#: SelectCompletedOrder.php:583 SelectContract.php:153 +#: SelectCompletedOrder.php:550 SelectContract.php:153 #: SelectCreditItems.php:988 SelectOrderItems.php:1485 #: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733 #: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190 #: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382 #: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82 -#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:118 -#: SuppInvGRNs.php:296 SupplierCredit.php:316 SupplierCredit.php:384 -#: SupplierInvoice.php:290 SupplierInvoice.php:370 SupplierTenders.php:264 +#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126 +#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384 +#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264 #: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290 #: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127 #: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623 @@ -2272,13 +2272,13 @@ msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku" #: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331 -#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189 +#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:189 #: Shipt_Select.php:168 WorkOrderEntry.php:602 WorkOrderIssue.php:664 msgid "Enter text extracts in the" msgstr "Zadejte text extrakty v" #: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331 -#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189 +#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:189 #: Shipt_Select.php:168 WorkOrderEntry.php:602 WorkOrderIssue.php:664 msgid "description" msgstr "popis" @@ -2289,9 +2289,9 @@ #: DiscountCategories.php:104 DiscountCategories.php:106 #: DiscountCategories.php:110 DiscountCategories.php:112 #: FixedAssetTransfer.php:61 MRPDemands.php:333 MRPDemands.php:336 -#: MRPReport.php:542 PO_Header.php:534 PO_Items.php:1052 PO_Items.php:1056 -#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 PurchData.php:268 -#: SelectAsset.php:94 SelectCompletedOrder.php:562 SelectCreditItems.php:222 +#: MRPReport.php:542 PO_Header.php:538 PO_Items.php:1050 PO_Items.php:1054 +#: PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 PurchData.php:268 +#: SelectAsset.php:94 SelectCompletedOrder.php:529 SelectCreditItems.php:222 #: SelectCreditItems.php:971 SelectCustomer.php:269 SelectCustomer.php:279 #: SelectCustomer.php:288 SelectCustomer.php:298 SelectCustomer.php:344 #: SelectGLAccount.php:90 SelectOrderItems.php:587 SelectOrderItems.php:590 @@ -2303,14 +2303,14 @@ msgstr "nebo" #: BOMInquiry.php:31 BOMs.php:840 MRPDemands.php:334 -#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 +#: PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 #: Shipt_Select.php:173 WorkOrderEntry.php:606 WorkOrderIssue.php:667 msgid "Enter extract of the" msgstr "Zadejte extrakt" #: BOMInquiry.php:31 BOMs.php:840 EmailConfirmation.php:191 MRPDemands.php:334 -#: MRPReport.php:542 PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:194 -#: SalesCategories.php:420 SalesInquiry.php:751 SalesInquiry.php:762 +#: MRPReport.php:542 PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 +#: SalesCategories.php:421 SalesInquiry.php:751 SalesInquiry.php:762 #: SalesInquiry.php:782 SalesInquiry.php:808 SalesInquiry.php:827 #: SalesInquiry.php:937 SalesInquiry.php:1096 SalesInquiry.php:1186 #: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173 @@ -2325,7 +2325,7 @@ #: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764 #: CounterSales.php:2186 CustomerReceipt.php:1116 FixedAssetTransfer.php:72 -#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:541 PO_Items.php:1060 +#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058 #: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:978 #: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595 #: SelectOrderItems.php:1644 SelectProduct.php:531 SelectSupplier.php:219 @@ -2335,7 +2335,7 @@ msgstr "Vyhledat" #: BOMInquiry.php:49 BOMs.php:775 ContractBOM.php:47 MRPDemands.php:56 -#: MRPReport.php:576 PO_Items.php:781 PO_SelectOSPurchOrder.php:63 +#: MRPReport.php:576 PO_Items.php:779 PO_SelectOSPurchOrder.php:63 #: PO_SelectPurchOrder.php:47 SelectCompletedOrder.php:92 #: SelectCreditItems.php:292 SelectProduct.php:544 SelectSalesOrder.php:418 #: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379 @@ -2364,10 +2364,10 @@ #: CounterSales.php:2029 CounterSales.php:2214 CustomerBranches.php:367 #: CustomerReceipt.php:1127 GLCodesInquiry.php:26 MRPDemands.php:90 #: MRPPlannedWorkOrders.php:256 MRPReport.php:746 PDFOrdersInvoiced.php:347 -#: PDFOrderStatus.php:318 PDFPrintLabel.php:247 PO_Header.php:551 -#: PO_Items.php:1072 PO_SelectOSPurchOrder.php:230 PO_SelectPurchOrder.php:211 +#: PDFOrderStatus.php:318 PDFPrintLabel.php:247 PO_Header.php:555 +#: PO_Items.php:1070 PO_SelectOSPurchOrder.php:234 PO_SelectPurchOrder.php:211 #: PricesByCost.php:151 PurchData.php:350 ReorderLevelLocation.php:66 -#: SalesPeople.php:199 SelectCompletedOrder.php:582 SelectCreditItems.php:987 +#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:987 #: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1484 #: SelectOrderItems.php:1668 SelectProduct.php:732 SelectSalesOrder.php:580 #: SelectSupplier.php:258 SelectWorkOrder.php:191 Shipt_Select.php:189 @@ -2378,15 +2378,15 @@ msgid "Code" msgstr "Kód" -#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:276 +#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280 #: ContractBOM.php:347 CounterSales.php:2031 CounterSales.php:2216 #: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105 -#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1076 -#: PO_SelectOSPurchOrder.php:234 PO_SelectPurchOrder.php:215 -#: SelectCompletedOrder.php:587 SelectCreditItems.php:989 +#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1074 +#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:215 +#: SelectCompletedOrder.php:554 SelectCreditItems.php:989 #: SelectOrderItems.php:1486 SelectOrderItems.php:1670 SelectProduct.php:117 #: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194 -#: Shipments.php:392 Shipments.php:474 Shipt_Select.php:193 +#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193 #: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180 #: WorkOrderCosting.php:90 WorkOrderEntry.php:624 WorkOrderIssue.php:693 #: WorkOrderIssue.php:763 includes/DefineLabelClass.php:21 @@ -2422,14 +2422,14 @@ #: BOMInquiry.php:201 ContractBOM.php:239 ContractCosting.php:83 #: ContractCosting.php:89 ContractCosting.php:153 ContractOtherReqts.php:95 #: Contracts.php:963 Contracts.php:998 MRPPlannedWorkOrders.php:261 -#: MRPShortages.php:349 SpecialOrder.php:716 StockAdjustments.php:379 +#: MRPShortages.php:349 SpecialOrder.php:717 StockAdjustments.php:379 msgid "Unit Cost" msgstr "Jednotková cena" #: BOMInquiry.php:202 BOMInquiry.php:250 ContractBOM.php:272 #: ContractCosting.php:84 ContractCosting.php:90 ContractCosting.php:154 #: ContractCosting.php:175 Contracts.php:964 Contracts.php:999 -#: SpecialOrder.php:619 SpecialOrder.php:621 +#: SpecialOrder.php:620 SpecialOrder.php:622 msgid "Total Cost" msgstr "Celková cena" @@ -2512,7 +2512,7 @@ msgstr "Drill-down" #: BOMs.php:120 BOMs.php:126 BOMs.php:134 BOMs.php:873 OrderDetails.php:186 -#: PaymentTerms.php:190 PaymentTerms.php:196 PO_SelectOSPurchOrder.php:516 +#: PaymentTerms.php:190 PaymentTerms.php:196 PO_SelectOSPurchOrder.php:524 #: SalesAnalReptCols.php:285 SelectProduct.php:115 SelectProduct.php:161 #: SelectProduct.php:174 SelectProduct.php:258 SelectProduct.php:259 #: SelectProduct.php:754 @@ -2664,7 +2664,7 @@ msgid "The SQL used to retrieve description of the parent part was" msgstr "SQL slouží k získání popisu mateřské část byla" -#: BOMs.php:405 ConfirmDispatch_Invoice.php:1014 CounterSales.php:1413 +#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413 #: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1453 #: Stocks.php:940 Stocks.php:942 msgid "Assembly" @@ -2995,7 +2995,7 @@ #: CompanyPreferences.php:278 CustLoginSetup.php:161 Customers.php:449 #: Suppliers.php:679 Suppliers.php:856 SuppLoginSetup.php:147 -#: WWW_Users.php:448 +#: WWW_Users.php:452 msgid "Email Address" msgstr "E-mailová adresa" @@ -3051,17 +3051,17 @@ msgid "Create GL entries for stock transactions" msgstr "Vytvořte GL údaje pro obchodů s akciemi" -#: CompanyPreferences.php:519 ConfirmDispatch_Invoice.php:625 -#: ConfirmDispatch_Invoice.php:1653 Credit_Invoice.php:1512 +#: CompanyPreferences.php:519 ConfirmDispatch_Invoice.php:632 +#: ConfirmDispatch_Invoice.php:1660 Credit_Invoice.php:1512 #: FixedAssetItems.php:123 FixedAssetItems.php:625 GLBudgets.php:234 -#: GLTags.php:64 GoodsReceived.php:248 GoodsReceived.php:254 -#: GoodsReceived.php:261 GoodsReceived.php:741 Labels.php:259 +#: GLTags.php:64 GoodsReceived.php:249 GoodsReceived.php:255 +#: GoodsReceived.php:262 GoodsReceived.php:742 Labels.php:259 #: MRPCalendar.php:314 Payments.php:898 PcAuthorizeExpenses.php:288 #: PO_AuthoriseMyOrders.php:138 PricesByCost.php:221 PurchData.php:522 #: ReorderLevelLocation.php:148 SecurityTokens.php:97 #: SelectCreditItems.php:923 SMTPServer.php:63 StockCostUpdate.php:184 #: StockReorderLevel.php:103 Stocks.php:1198 SystemParameters.php:1032 -#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:331 +#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:332 msgid "Update" msgstr "Aktualizace" @@ -3175,22 +3175,22 @@ msgid "This order item could not be retrieved. Please select another order" msgstr "Tato objednat se nepodařilo získat. Prosím, vyberte jiný pořadí" -#: ConfirmDispatch_Invoice.php:252 +#: ConfirmDispatch_Invoice.php:256 msgid "Confirm Invoice" msgstr "Potvrdit faktury" -#: ConfirmDispatch_Invoice.php:253 +#: ConfirmDispatch_Invoice.php:257 msgid "Confirm Dispatch and Invoice" msgstr "Potvrdit Expedice a faktury" -#: ConfirmDispatch_Invoice.php:256 Contracts.php:772 CustLoginSetup.php:31 +#: ConfirmDispatch_Invoice.php:260 Contracts.php:772 CustLoginSetup.php:31 #: CustLoginSetup.php:32 CustomerAllocations.php:327 CustomerBranches.php:363 #: CustomerBranches.php:532 CustomerBranches.php:579 CustomerInquiry.php:126 #: CustomerReceipt.php:899 CustomerReceipt.php:953 CustomerReceipt.php:1101 #: Customers.php:14 Customers.php:325 CustomerTransInquiry.php:101 #: DeliveryDetails.php:804 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305 #: PDFOrderStatus.php:275 PricesByCost.php:153 SalesGraph.php:180 -#: SelectCompletedOrder.php:634 SelectContract.php:154 +#: SelectCompletedOrder.php:601 SelectContract.php:154 #: SelectCreditItems.php:238 SelectCustomer.php:24 SelectCustomer.php:210 #: SelectOrderItems.php:603 SelectRecurringSalesOrder.php:86 #: SelectSalesOrder.php:832 SelectSalesOrder.php:849 StockLocMovements.php:91 @@ -3205,16 +3205,16 @@ msgid "Customer" msgstr "Zákazník" -#: ConfirmDispatch_Invoice.php:256 CustEDISetup.php:93 Customers.php:440 +#: ConfirmDispatch_Invoice.php:260 CustEDISetup.php:93 Customers.php:440 #: Customers.php:659 Customers.php:694 DeliveryDetails.php:804 #: OrderDetails.php:67 SalesAnalRepts.php:27 SalesAnalRepts.php:29 -#: WWW_Users.php:275 WWW_Users.php:494 Z_ChangeBranchCode.php:201 +#: WWW_Users.php:275 WWW_Users.php:498 Z_ChangeBranchCode.php:201 #: includes/PDFStatementPageHeader.inc:112 includes/PDFTransPageHeader.inc:46 #: includes/PDFTransPageHeaderPortrait.inc:55 msgid "Customer Code" msgstr "Kód zákazníka" -#: ConfirmDispatch_Invoice.php:257 CustEDISetup.php:96 CustomerReceipt.php:252 +#: ConfirmDispatch_Invoice.php:261 CustEDISetup.php:96 CustomerReceipt.php:252 #: CustomerReceipt.php:1128 Customers.php:443 Customers.php:700 #: Customers.php:730 DeliveryDetails.php:805 OrderDetails.php:69 #: POReport.php:494 POReport.php:1268 SalesInquiry.php:754 @@ -3225,14 +3225,14 @@ msgid "Customer Name" msgstr "Název zákazníka" -#: ConfirmDispatch_Invoice.php:260 +#: ConfirmDispatch_Invoice.php:264 msgid "Invoice amounts stated in" msgstr "Všechny částky v" -#: ConfirmDispatch_Invoice.php:273 ContractBOM.php:235 ContractCosting.php:79 +#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79 #: ContractCosting.php:85 Contracts.php:959 CounterSales.php:739 #: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:823 -#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:660 +#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:658 #: PO_OrderDetails.php:146 PrintCustTrans.php:860 PrintCustTrans.php:949 #: PrintCustTrans.php:998 PrintCustTransPortrait.php:907 #: PrintCustTransPortrait.php:1005 PrintCustTransPortrait.php:1062 @@ -3242,8 +3242,8 @@ #: StockLocTransfer.php:185 StockLocTransferReceive.php:427 #: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787 #: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175 -#: SuppInvGRNs.php:117 SuppInvGRNs.php:295 SupplierCredit.php:315 -#: SupplierInvoice.php:289 includes/PDFOrderPageHeader_generic.inc:91 +#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315 +#: SupplierInvoice.php:287 includes/PDFOrderPageHeader_generic.inc:91 #: includes/PDFPickingListHeader.inc:72 #: includes/PDFQuotationPageHeader.inc:101 #: includes/PDFQuotationPortraitPageHeader.inc:101 @@ -3254,16 +3254,16 @@ msgid "Item Code" msgstr "Kód položky" -#: ConfirmDispatch_Invoice.php:274 ContractCosting.php:80 +#: ConfirmDispatch_Invoice.php:278 ContractCosting.php:80 #: ContractCosting.php:86 Contracts.php:960 CounterSales.php:740 #: Credit_Invoice.php:270 DeliveryDetails.php:824 DeliveryDetails.php:890 -#: OrderDetails.php:163 PO_Items.php:735 PO_OrderDetails.php:147 +#: OrderDetails.php:163 PO_Items.php:733 PO_OrderDetails.php:147 #: PrintCustTrans.php:861 PrintCustTrans.php:950 PrintCustTrans.php:999 #: PrintCustTransPortrait.php:908 PrintCustTransPortrait.php:1006 #: PrintCustTransPortrait.php:1063 RecurringSalesOrders.php:319 #: ReprintGRN.php:82 SalesInquiry.php:821 SalesInquiry.php:839 #: SalesInquiry.php:938 SelectCreditItems.php:672 SelectOrderItems.php:1332 -#: SpecialOrder.php:614 StockLocTransferReceive.php:428 +#: SpecialOrder.php:615 StockLocTransferReceive.php:428 #: includes/PDFOrderPageHeader_generic.inc:92 #: includes/PDFPickingListHeader.inc:73 #: includes/PDFQuotationPageHeader.inc:102 @@ -3274,28 +3274,28 @@ msgid "Item Description" msgstr "Popis položky" -#: ConfirmDispatch_Invoice.php:275 GoodsReceived.php:100 GoodsReceived.php:104 -#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:391 -#: Shipments.php:473 +#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104 +#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401 +#: Shipments.php:488 msgid "Ordered" msgstr "Objednáno" -#: ConfirmDispatch_Invoice.php:277 FTP_RadioBeacon.php:83 +#: ConfirmDispatch_Invoice.php:281 FTP_RadioBeacon.php:83 #: GoodsReceived.php:102 GoodsReceived.php:106 #, php-format msgid "Already" msgstr "Již" -#: ConfirmDispatch_Invoice.php:277 FTP_RadioBeacon.php:83 +#: ConfirmDispatch_Invoice.php:281 FTP_RadioBeacon.php:83 #, php-format msgid "Sent" msgstr "odesláno" -#: ConfirmDispatch_Invoice.php:278 +#: ConfirmDispatch_Invoice.php:282 msgid "This Dispatch" msgstr "Tato zásilka" -#: ConfirmDispatch_Invoice.php:279 CounterSales.php:744 Credit_Invoice.php:274 +#: ConfirmDispatch_Invoice.php:283 CounterSales.php:744 Credit_Invoice.php:274 #: DeliveryDetails.php:827 DeliveryDetails.php:893 GoodsReceived.php:111 #: OffersReceived.php:107 OffersReceived.php:215 OffersReceived.php:260 #: OrderDetails.php:166 PDFOrdersInvoiced.php:391 PDFPriceList.php:365 @@ -3305,7 +3305,7 @@ #: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009 #: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483 #: RecurringSalesOrders.php:322 SelectCreditItems.php:675 -#: SelectOrderItems.php:1336 Shipments.php:395 StockLocMovements.php:94 +#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94 #: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181 #: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267 #: SupplierTenders.php:494 SuppPriceList.php:292 @@ -3316,7 +3316,7 @@ msgid "Price" msgstr "Cena" -#: ConfirmDispatch_Invoice.php:280 CounterSales.php:745 Credit_Invoice.php:275 +#: ConfirmDispatch_Invoice.php:284 CounterSales.php:745 Credit_Invoice.php:275 #: CustomerReceipt.php:898 DeliveryDetails.php:828 OrderDetails.php:167 #: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003 #: PrintCustTransPortrait.php:912 PrintCustTransPortrait.php:1010 @@ -3329,7 +3329,7 @@ msgid "Discount" msgstr "Sleva" -#: ConfirmDispatch_Invoice.php:281 ConfirmDispatch_Invoice.php:285 +#: ConfirmDispatch_Invoice.php:285 ConfirmDispatch_Invoice.php:289 #: CounterSales.php:749 CounterSales.php:836 Credit_Invoice.php:276 #: Credit_Invoice.php:280 CustomerAllocations.php:331 #: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:829 @@ -3358,21 +3358,21 @@ msgid "Total" msgstr "Celkem" -#: ConfirmDispatch_Invoice.php:281 Credit_Invoice.php:276 +#: ConfirmDispatch_Invoice.php:285 Credit_Invoice.php:276 #: SelectCreditItems.php:678 msgid "Excl Tax" msgstr "bez DPH" -#: ConfirmDispatch_Invoice.php:282 Credit_Invoice.php:277 -#: SelectCreditItems.php:679 SupplierInvoice.php:237 TaxGroups.php:285 +#: ConfirmDispatch_Invoice.php:286 Credit_Invoice.php:277 +#: SelectCreditItems.php:679 SupplierInvoice.php:235 TaxGroups.php:285 msgid "Tax Authority" msgstr "Daňový úřad" -#: ConfirmDispatch_Invoice.php:283 +#: ConfirmDispatch_Invoice.php:287 msgid "Tax %" msgstr "DPH %" -#: ConfirmDispatch_Invoice.php:284 CounterSales.php:748 Credit_Invoice.php:278 +#: ConfirmDispatch_Invoice.php:288 CounterSales.php:748 Credit_Invoice.php:278 #: Credit_Invoice.php:279 PrintCustTrans.php:395 PrintCustTrans.php:1041 #: PrintCustTransPortrait.php:455 PrintCustTransPortrait.php:1105 #: SelectCreditItems.php:680 SelectCreditItems.php:681 @@ -3380,32 +3380,32 @@ msgid "Tax" msgstr "DPH" -#: ConfirmDispatch_Invoice.php:285 CounterSales.php:749 Credit_Invoice.php:280 +#: ConfirmDispatch_Invoice.php:289 CounterSales.php:749 Credit_Invoice.php:280 #: SelectCreditItems.php:682 msgid "Incl Tax" msgstr "včetně DPH" -#: ConfirmDispatch_Invoice.php:396 StockLocTransferReceive.php:481 +#: ConfirmDispatch_Invoice.php:400 StockLocTransferReceive.php:481 msgid "Enter Serial Numbers" msgstr "Vložit sériová čísla" -#: ConfirmDispatch_Invoice.php:398 +#: ConfirmDispatch_Invoice.php:402 msgid "Enter Batch/Roll/Lot #" msgstr "Zadejte Dávkové / role / položka #" -#: ConfirmDispatch_Invoice.php:433 +#: ConfirmDispatch_Invoice.php:437 msgid "There was a problem testing for a default shipper because" msgstr "Tam byl problém testování pro přepravce, protože výchozí" -#: ConfirmDispatch_Invoice.php:439 +#: ConfirmDispatch_Invoice.php:443 msgid "There was a problem testing for a default shipper" msgstr "Tam byl problém testování na výchozí odesílatele" -#: ConfirmDispatch_Invoice.php:445 +#: ConfirmDispatch_Invoice.php:449 msgid "There are no shippers defined" msgstr "Nejsou definováni žádní dopravci" -#: ConfirmDispatch_Invoice.php:445 +#: ConfirmDispatch_Invoice.php:449 msgid "" "Please use the link below to set up shipping freight companies, the system " "expects the shipping company to be selected or a default freight company to " @@ -3415,7 +3415,7 @@ "systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí " "nákladní společnost mají být použity" -#: ConfirmDispatch_Invoice.php:446 DeliveryDetails.php:245 Prices.php:355 +#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 Prices.php:355 #: includes/InputSerialItemsExisting.php:59 #: includes/InputSerialItemsKeyed.php:150 #: includes/InputSerialItemsSequential.php:53 @@ -3423,35 +3423,35 @@ msgid "Enter" msgstr "Vložit" -#: ConfirmDispatch_Invoice.php:446 DeliveryDetails.php:245 +#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 msgid "Amend Freight Companies" msgstr "Mění se Nákladní Firmy" -#: ConfirmDispatch_Invoice.php:457 +#: ConfirmDispatch_Invoice.php:461 msgid "Order Freight Cost" msgstr "Cena za dopravu" -#: ConfirmDispatch_Invoice.php:461 +#: ConfirmDispatch_Invoice.php:465 msgid "Recalculated Freight Cost" msgstr "Přepočítána přepravní náklady" -#: ConfirmDispatch_Invoice.php:471 ConfirmDispatch_Invoice.php:475 +#: ConfirmDispatch_Invoice.php:478 ConfirmDispatch_Invoice.php:482 msgid "Charge Freight Cost inc Tax" msgstr "Účtovat přepravní náklady s DPH" -#: ConfirmDispatch_Invoice.php:539 +#: ConfirmDispatch_Invoice.php:546 msgid "Invoice Totals" msgstr "Faktura celkem" -#: ConfirmDispatch_Invoice.php:569 +#: ConfirmDispatch_Invoice.php:576 msgid "There are no lines on this order with a quantity to invoice" msgstr "Tam nejsou žádné čáry na této objednávky se množství faktury" -#: ConfirmDispatch_Invoice.php:569 +#: ConfirmDispatch_Invoice.php:576 msgid "No further processing has been done" msgstr "Žádné další zpracování bylo provedeno" -#: ConfirmDispatch_Invoice.php:587 CounterSales.php:937 +#: ConfirmDispatch_Invoice.php:594 CounterSales.php:937 msgid "" "Could not retrieve the quantity left at the location once this order is " "invoiced (for the purposes of checking that stock will not go negative " @@ -3460,7 +3460,7 @@ "Nepodařilo se načíst množství vlevo na místě, jakmile toto pořadí je " "fakturováno (za účelem kontroly, zda vozidla nepůjde, protože negativní)" -#: ConfirmDispatch_Invoice.php:592 CounterSales.php:942 +#: ConfirmDispatch_Invoice.php:599 CounterSales.php:942 msgid "" "Invoicing the selected order would result in negative stock. The system " "parameters are set to prohibit negative stocks from occurring. This invoice " @@ -3470,12 +3470,12 @@ "systému jsou nastaveny zakázat negativní zásoby od nastávání. Tato faktura " "může být vytvořena do vyprodání na ruce je opraven." -#: ConfirmDispatch_Invoice.php:592 ConfirmDispatch_Invoice.php:615 +#: ConfirmDispatch_Invoice.php:599 ConfirmDispatch_Invoice.php:622 #: CounterSales.php:942 CounterSales.php:965 WorkOrderReceive.php:157 msgid "Negative Stock Prohibited" msgstr "Negativní Zakázané skladem" -#: ConfirmDispatch_Invoice.php:611 CounterSales.php:961 +#: ConfirmDispatch_Invoice.php:618 CounterSales.php:961 msgid "" "Could not retrieve the component quantity left at the location once the " "assembly item on this order is invoiced (for the purposes of checking that " @@ -3485,7 +3485,7 @@ "na tomto pořadí je fakturováno (za účelem kontroly, zda vozidla nepůjde, " "protože negativní)" -#: ConfirmDispatch_Invoice.php:615 CounterSales.php:965 +#: ConfirmDispatch_Invoice.php:622 CounterSales.php:965 msgid "" "Invoicing the selected order would result in negative stock for a component " "of an assembly item on the order. The system parameters are set to prohibit " @@ -3497,34 +3497,34 @@ "negativní zásoby od nastávání. Tato faktura může být vytvořena do vyprodání " "na ruce je opraven." -#: ConfirmDispatch_Invoice.php:641 +#: ConfirmDispatch_Invoice.php:648 msgid "" "We were unable to load Area where the Sale is to from the BRANCHES table" msgstr "Nebyli jsme schopni načíst oblast, kde Prodej je z tabulky OBORY" -#: ConfirmDispatch_Invoice.php:641 +#: ConfirmDispatch_Invoice.php:648 msgid "Please remedy this" msgstr "Prosím nápravě tohoto" -#: ConfirmDispatch_Invoice.php:652 Credit_Invoice.php:479 -#: GoodsReceived.php:271 +#: ConfirmDispatch_Invoice.php:659 Credit_Invoice.php:479 +#: GoodsReceived.php:272 msgid "The company information and preferences could not be retrieved" msgstr "Informace o společnosti a preference se nepodařilo získat" -#: ConfirmDispatch_Invoice.php:652 Credit_Invoice.php:479 -#: GoodsReceived.php:271 +#: ConfirmDispatch_Invoice.php:659 Credit_Invoice.php:479 +#: GoodsReceived.php:272 msgid "see your system administrator" msgstr "kontaktujte administrátora" -#: ConfirmDispatch_Invoice.php:675 +#: ConfirmDispatch_Invoice.php:682 msgid "Number of rows returned by SQL" msgstr "Počet řádků vrácených SQL dotazem" -#: ConfirmDispatch_Invoice.php:676 +#: ConfirmDispatch_Invoice.php:683 msgid "Count of items in the session" msgstr "Počet položek v relaci" -#: ConfirmDispatch_Invoice.php:680 ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:687 ConfirmDispatch_Invoice.php:704 msgid "" "This order has been changed or invoiced since this delivery was started to " "be confirmed" @@ -3532,15 +3532,15 @@ "Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena " "bude potvrzeno" -#: ConfirmDispatch_Invoice.php:680 GoodsReceived.php:308 +#: ConfirmDispatch_Invoice.php:687 GoodsReceived.php:309 msgid "Processing halted" msgstr "Zpracování zastaveno" -#: ConfirmDispatch_Invoice.php:680 +#: ConfirmDispatch_Invoice.php:687 msgid "To enter and confirm this dispatch" msgstr "Chcete-li zadat a potvrdit tuto expedici" -#: ConfirmDispatch_Invoice.php:680 +#: ConfirmDispatch_Invoice.php:687 msgid "" "invoice the order must be re-selected and re-read again to update the " "changes made by the other user" @@ -3548,31 +3548,31 @@ "faktura příkaz musí být re-vybraný a re-číst a aktualizovat změny provedené " "ostatními uživateli" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "Orig order for" msgstr "Orig aby" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "has a quantity of" msgstr "má množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "and an invoiced qty of" msgstr "a fakturované Množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "the session shows quantity of" msgstr "zasedání ukazuje množství" -#: ConfirmDispatch_Invoice.php:695 +#: ConfirmDispatch_Invoice.php:702 msgid "and quantity invoice of" msgstr "a množství fakturu" -#: ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:704 msgid "Processing halted." msgstr "Zpracování zastaveno." -#: ConfirmDispatch_Invoice.php:697 +#: ConfirmDispatch_Invoice.php:704 msgid "" "To enter and confirm this dispatch, it must be re-selected and re-read again " "to update the changes made by the other user" @@ -3580,33 +3580,33 @@ "Chcete-li zadat a potvrdit tuto expedici, je třeba re-vybraný a re-číst a " "aktualizovat změny provedené ostatními uživateli" -#: ConfirmDispatch_Invoice.php:701 +#: ConfirmDispatch_Invoice.php:708 msgid "Select a sales order for confirming deliveries and invoicing" msgstr "Vyberte prodejní objednávky k potvrzení dodávky a fakturace" -#: ConfirmDispatch_Invoice.php:731 +#: ConfirmDispatch_Invoice.php:738 msgid "Could not update the default shipping carrier for this branch because" msgstr "Nemohu aktualizovat výchozí lodní dopravce pro tento obor, protože" -#: ConfirmDispatch_Invoice.php:732 +#: ConfirmDispatch_Invoice.php:739 msgid "The SQL used to update the branch default carrier was" msgstr "SQL používaných k aktualizaci pobočky výchozí dopravce byl" -#: ConfirmDispatch_Invoice.php:743 ConfirmDispatch_Invoice.php:785 -#: ConfirmDispatch_Invoice.php:801 ConfirmDispatch_Invoice.php:833 -#: ConfirmDispatch_Invoice.php:856 ConfirmDispatch_Invoice.php:884 -#: ConfirmDispatch_Invoice.php:910 ConfirmDispatch_Invoice.php:948 -#: ConfirmDispatch_Invoice.php:966 ConfirmDispatch_Invoice.php:980 -#: ConfirmDispatch_Invoice.php:1020 ConfirmDispatch_Invoice.php:1030 -#: ConfirmDispatch_Invoice.php:1113 ConfirmDispatch_Invoice.php:1134 -#: ConfirmDispatch_Invoice.php:1151 ConfirmDispatch_Invoice.php:1166 -#: ConfirmDispatch_Invoice.php:1290 ConfirmDispatch_Invoice.php:1313 -#: ConfirmDispatch_Invoice.php:1340 ConfirmDispatch_Invoice.php:1362 -#: ConfirmDispatch_Invoice.php:1408 ConfirmDispatch_Invoice.php:1430 -#: ConfirmDispatch_Invoice.php:1452 ConfirmDispatch_Invoice.php:1474 -#: ConfirmDispatch_Invoice.php:1502 ConfirmDispatch_Invoice.php:1511 -#: ConfirmDispatch_Invoice.php:1540 ConfirmDispatch_Invoice.php:1565 -#: ConfirmDispatch_Invoice.php:1587 ContractCosting.php:248 +#: ConfirmDispatch_Invoice.php:750 ConfirmDispatch_Invoice.php:792 +#: ConfirmDispatch_Invoice.php:808 ConfirmDispatch_Invoice.php:840 +#: ConfirmDispatch_Invoice.php:863 ConfirmDispatch_Invoice.php:891 +#: ConfirmDispatch_Invoice.php:917 ConfirmDispatch_Invoice.php:955 +#: ConfirmDispatch_Invoice.php:973 ConfirmDispatch_Invoice.php:987 +#: ConfirmDispatch_Invoice.php:1027 ConfirmDispatch_Invoice.php:1037 +#: ConfirmDispatch_Invoice.php:1120 ConfirmDispatch_Invoice.php:1141 +#: ConfirmDispatch_Invoice.php:1158 ConfirmDispatch_Invoice.php:1173 +#: ConfirmDispatch_Invoice.php:1297 ConfirmDispatch_Invoice.php:1320 +#: ConfirmDispatch_Invoice.php:1347 ConfirmDispatch_Invoice.php:1369 +#: ConfirmDispatch_Invoice.php:1415 ConfirmDispatch_Invoice.php:1437 +#: ConfirmDispatch_Invoice.php:1459 ConfirmDispatch_Invoice.php:1481 +#: ConfirmDispatch_Invoice.php:1509 ConfirmDispatch_Invoice.php:1518 +#: ConfirmDispatch_Invoice.php:1547 ConfirmDispatch_Invoice.php:1572 +#: ConfirmDispatch_Invoice.php:1594 ContractCosting.php:248 #: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330 #: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408 #: ContractCosting.php:415 CounterSales.php:1252 CounterSales.php:1292 @@ -3623,10 +3623,10 @@ #: Credit_Invoice.php:1048 Credit_Invoice.php:1071 Credit_Invoice.php:1243 #: Credit_Invoice.php:1283 Credit_Invoice.php:1310 Credit_Invoice.php:1331 #: Credit_Invoice.php:1360 Credit_Invoice.php:1386 Credit_Invoice.php:1412 -#: GoodsReceived.php:290 GoodsReceived.php:385 GoodsReceived.php:426 -#: GoodsReceived.php:456 GoodsReceived.php:484 GoodsReceived.php:515 -#: GoodsReceived.php:533 GoodsReceived.php:562 GoodsReceived.php:579 -#: GoodsReceived.php:669 GoodsReceived.php:692 PDFStockCheckComparison.php:119 +#: GoodsReceived.php:291 GoodsReceived.php:386 GoodsReceived.php:427 +#: GoodsReceived.php:457 GoodsReceived.php:485 GoodsReceived.php:516 +#: GoodsReceived.php:534 GoodsReceived.php:563 GoodsReceived.php:580 +#: GoodsReceived.php:670 GoodsReceived.php:693 PDFStockCheckComparison.php:119 #: PDFStockCheckComparison.php:127 PDFStockCheckComparison.php:134 #: PDFStockCheckComparison.php:153 PDFStockCheckComparison.php:173 #: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361 @@ -3676,14 +3676,14 @@ #: SupplierCredit.php:1092 SupplierCredit.php:1116 SupplierCredit.php:1148 #: SupplierCredit.php:1164 SupplierCredit.php:1177 SupplierCredit.php:1184 #: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierCredit.php:1288 -#: SupplierInvoice.php:656 SupplierInvoice.php:729 SupplierInvoice.php:757 -#: SupplierInvoice.php:784 SupplierInvoice.php:816 SupplierInvoice.php:849 -#: SupplierInvoice.php:879 SupplierInvoice.php:914 SupplierInvoice.php:939 -#: SupplierInvoice.php:951 SupplierInvoice.php:987 SupplierInvoice.php:1024 -#: SupplierInvoice.php:1049 SupplierInvoice.php:1083 SupplierInvoice.php:1109 -#: SupplierInvoice.php:1140 Sup... [truncated message content] |
From: <dai...@us...> - 2011-12-03 03:03:45
|
Revision: 4761 http://web-erp.svn.sourceforge.net/web-erp/?rev=4761&view=rev Author: daintree Date: 2011-12-03 03:03:38 +0000 (Sat, 03 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/includes/LanguagesArray.php trunk/includes/MiscFunctions.php Added Paths: ----------- trunk/locale/en_IN.utf8/ trunk/locale/en_IN.utf8/LC_MESSAGES/ Modified: trunk/includes/LanguagesArray.php =================================================================== --- trunk/includes/LanguagesArray.php 2011-12-02 21:14:02 UTC (rev 4760) +++ trunk/includes/LanguagesArray.php 2011-12-03 03:03:38 UTC (rev 4761) @@ -11,6 +11,11 @@ $LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.'; $LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ','; +$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India'); +$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in'; +$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.'; +$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ','; + $LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech'); $LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech'; $LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ','; Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760) +++ trunk/includes/MiscFunctions.php 2011-12-03 03:03:38 UTC (rev 4761) @@ -353,10 +353,20 @@ if ($DecimalPlaces !='Variable'){ $DecimalValue= round($DecimalValue,$DecimalPlaces); } - if (strlen(substr($DecimalValue,2))>0){ + if ($DecimalPlaces!='Variable' AND strlen(substr($DecimalValue,2))>0){ + /*If the DecimalValue is longer than '0.' then chop off the leading 0*/ $DecimalValue = substr($DecimalValue,1); + if ($DecimalPlaces > 0){ + $DecimalValue = str_pad($DecimalValue,$DecimalPlaces,'0'); + } else { + $DecimalValue =''; + } } else { - $DecimalValue =''; + if ($DecimalPlaces!='Variable' AND $DecimalPlaces > 0){ + $DecimalValue = '.' . str_pad($DecimalValue,$DecimalPlaces,'0'); + } elseif($DecimalPlaces==0) { + $DecimalValue =''; + } } if(strlen($IntegerNumber)>3){ $LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-12-03 03:03:45
|
Revision: 4761 http://web-erp.svn.sourceforge.net/web-erp/?rev=4761&view=rev Author: daintree Date: 2011-12-03 03:03:38 +0000 (Sat, 03 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/includes/LanguagesArray.php trunk/includes/MiscFunctions.php Added Paths: ----------- trunk/locale/en_IN.utf8/ trunk/locale/en_IN.utf8/LC_MESSAGES/ Modified: trunk/includes/LanguagesArray.php =================================================================== --- trunk/includes/LanguagesArray.php 2011-12-02 21:14:02 UTC (rev 4760) +++ trunk/includes/LanguagesArray.php 2011-12-03 03:03:38 UTC (rev 4761) @@ -11,6 +11,11 @@ $LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.'; $LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ','; +$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India'); +$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in'; +$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.'; +$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ','; + $LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech'); $LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech'; $LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ','; Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760) +++ trunk/includes/MiscFunctions.php 2011-12-03 03:03:38 UTC (rev 4761) @@ -353,10 +353,20 @@ if ($DecimalPlaces !='Variable'){ $DecimalValue= round($DecimalValue,$DecimalPlaces); } - if (strlen(substr($DecimalValue,2))>0){ + if ($DecimalPlaces!='Variable' AND strlen(substr($DecimalValue,2))>0){ + /*If the DecimalValue is longer than '0.' then chop off the leading 0*/ $DecimalValue = substr($DecimalValue,1); + if ($DecimalPlaces > 0){ + $DecimalValue = str_pad($DecimalValue,$DecimalPlaces,'0'); + } else { + $DecimalValue =''; + } } else { - $DecimalValue =''; + if ($DecimalPlaces!='Variable' AND $DecimalPlaces > 0){ + $DecimalValue = '.' . str_pad($DecimalValue,$DecimalPlaces,'0'); + } elseif($DecimalPlaces==0) { + $DecimalValue =''; + } } if(strlen($IntegerNumber)>3){ $LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-12-02 21:14:09
|
Revision: 4760 http://web-erp.svn.sourceforge.net/web-erp/?rev=4760&view=rev Author: daintree Date: 2011-12-02 21:14:02 +0000 (Fri, 02 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/includes/MiscFunctions.php Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2011-11-30 15:20:37 UTC (rev 4759) +++ trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760) @@ -316,14 +316,17 @@ function locale_number_format($Number, $DecimalPlaces=0) { global $DecimalPoint; global $ThousandsSeparator; - - if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){ - $DecimalPlaces = mb_strlen($Number) - mb_strlen(intval($Number)); - if ($DecimalPlaces > 0){ - $DecimalPlaces--; + if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){ + return indian_number_format($Number,$DecimalPlaces); + } else { + if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){ + $DecimalPlaces = mb_strlen($Number) - mb_strlen(intval($Number)); + if ($DecimalPlaces > 0){ + $DecimalPlaces--; + } } + return number_format($Number,$DecimalPlaces,$DecimalPoint,$ThousandsSeparator); } - return number_format($Number,$DecimalPlaces,$DecimalPoint,$ThousandsSeparator); } /* and to parse the input of the user into useable number */ @@ -344,4 +347,31 @@ } +function indian_number_format($Number,$DecimalPlaces){ + $IntegerNumber = intval($Number); + $DecimalValue = $Number - $IntegerNumber; + if ($DecimalPlaces !='Variable'){ + $DecimalValue= round($DecimalValue,$DecimalPlaces); + } + if (strlen(substr($DecimalValue,2))>0){ + $DecimalValue = substr($DecimalValue,1); + } else { + $DecimalValue =''; + } + if(strlen($IntegerNumber)>3){ + $LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber)); + $RestUnits = substr($IntegerNumber, 0, strlen($IntegerNumber)-3); // extracts the last three digits + $RestUnits = (strlen($RestUnits)%2 == 1)?'0'.$RestUnits:$RestUnits; // explodes the remaining digits in 2's formats, adds a zero in the beginning to maintain the 2's grouping. + $FirstPart =''; + $ExplodedUnits = str_split($RestUnits, 2); + for($i=0; $i<sizeof($ExplodedUnits); $i++){ + $FirstPart .= intval($ExplodedUnits[$i]).','; // creates each of the 2's group and adds a comma to the end + } + + return $FirstPart.$LastThreeNumbers.$DecimalValue; + } else { + return $IntegerNumber. $DecimalValue; + } +} + ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-12-02 21:14:09
|
Revision: 4760 http://web-erp.svn.sourceforge.net/web-erp/?rev=4760&view=rev Author: daintree Date: 2011-12-02 21:14:02 +0000 (Fri, 02 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/includes/MiscFunctions.php Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2011-11-30 15:20:37 UTC (rev 4759) +++ trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760) @@ -316,14 +316,17 @@ function locale_number_format($Number, $DecimalPlaces=0) { global $DecimalPoint; global $ThousandsSeparator; - - if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){ - $DecimalPlaces = mb_strlen($Number) - mb_strlen(intval($Number)); - if ($DecimalPlaces > 0){ - $DecimalPlaces--; + if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){ + return indian_number_format($Number,$DecimalPlaces); + } else { + if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){ + $DecimalPlaces = mb_strlen($Number) - mb_strlen(intval($Number)); + if ($DecimalPlaces > 0){ + $DecimalPlaces--; + } } + return number_format($Number,$DecimalPlaces,$DecimalPoint,$ThousandsSeparator); } - return number_format($Number,$DecimalPlaces,$DecimalPoint,$ThousandsSeparator); } /* and to parse the input of the user into useable number */ @@ -344,4 +347,31 @@ } +function indian_number_format($Number,$DecimalPlaces){ + $IntegerNumber = intval($Number); + $DecimalValue = $Number - $IntegerNumber; + if ($DecimalPlaces !='Variable'){ + $DecimalValue= round($DecimalValue,$DecimalPlaces); + } + if (strlen(substr($DecimalValue,2))>0){ + $DecimalValue = substr($DecimalValue,1); + } else { + $DecimalValue =''; + } + if(strlen($IntegerNumber)>3){ + $LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber)); + $RestUnits = substr($IntegerNumber, 0, strlen($IntegerNumber)-3); // extracts the last three digits + $RestUnits = (strlen($RestUnits)%2 == 1)?'0'.$RestUnits:$RestUnits; // explodes the remaining digits in 2's formats, adds a zero in the beginning to maintain the 2's grouping. + $FirstPart =''; + $ExplodedUnits = str_split($RestUnits, 2); + for($i=0; $i<sizeof($ExplodedUnits); $i++){ + $FirstPart .= intval($ExplodedUnits[$i]).','; // creates each of the 2's group and adds a comma to the end + } + + return $FirstPart.$LastThreeNumbers.$DecimalValue; + } else { + return $IntegerNumber. $DecimalValue; + } +} + ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Deb...@us...> - 2011-11-30 15:20:46
|
Revision: 4759 http://web-erp.svn.sourceforge.net/web-erp/?rev=4759&view=rev Author: DebiCates Date: 2011-11-30 15:20:37 +0000 (Wed, 30 Nov 2011) Log Message: ----------- Debi: Correct malformed link (to SelectProduct.php) Modified Paths: -------------- trunk/StockLocStatus.php Modified: trunk/StockLocStatus.php =================================================================== --- trunk/StockLocStatus.php 2011-11-28 09:44:22 UTC (rev 4758) +++ trunk/StockLocStatus.php 2011-11-30 15:20:37 UTC (rev 4759) @@ -263,7 +263,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td class="number"><a target="_blank" href="' . $rootpath . 'SelectProduct.php?StockID=%s">%s</a></td> + <td class="number"><a target="_blank" href="' . $rootpath . '/SelectProduct.php?StockID=%s">%s</a></td> <td class="number">%s</td> </tr>', mb_strtoupper($myrow['stockid']), @@ -295,7 +295,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td class="number"><a target="_blank" href="' . $rootpath . 'SelectProduct.php?StockID=%s">%s</a></td> + <td class="number"><a target="_blank" href="' . $rootpath . '/SelectProduct.php?StockID=%s">%s</a></td> <td class="number">%s</td>', mb_strtoupper($myrow['stockid']), mb_strtoupper($myrow['stockid']), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Deb...@us...> - 2011-11-30 15:20:43
|
Revision: 4759 http://web-erp.svn.sourceforge.net/web-erp/?rev=4759&view=rev Author: DebiCates Date: 2011-11-30 15:20:37 +0000 (Wed, 30 Nov 2011) Log Message: ----------- Debi: Correct malformed link (to SelectProduct.php) Modified Paths: -------------- trunk/StockLocStatus.php Modified: trunk/StockLocStatus.php =================================================================== --- trunk/StockLocStatus.php 2011-11-28 09:44:22 UTC (rev 4758) +++ trunk/StockLocStatus.php 2011-11-30 15:20:37 UTC (rev 4759) @@ -263,7 +263,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td class="number"><a target="_blank" href="' . $rootpath . 'SelectProduct.php?StockID=%s">%s</a></td> + <td class="number"><a target="_blank" href="' . $rootpath . '/SelectProduct.php?StockID=%s">%s</a></td> <td class="number">%s</td> </tr>', mb_strtoupper($myrow['stockid']), @@ -295,7 +295,7 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td class="number"><a target="_blank" href="' . $rootpath . 'SelectProduct.php?StockID=%s">%s</a></td> + <td class="number"><a target="_blank" href="' . $rootpath . '/SelectProduct.php?StockID=%s">%s</a></td> <td class="number">%s</td>', mb_strtoupper($myrow['stockid']), mb_strtoupper($myrow['stockid']), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-28 09:44:34
|
Revision: 4758 http://web-erp.svn.sourceforge.net/web-erp/?rev=4758&view=rev Author: daintree Date: 2011-11-28 09:44:22 +0000 (Mon, 28 Nov 2011) Log Message: ----------- fixes to Special Orders and status comments Modified Paths: -------------- trunk/PO_Header.php trunk/PO_Items.php trunk/PO_PDFPurchOrder.php trunk/PO_SelectOSPurchOrder.php trunk/SpecialOrder.php trunk/includes/PO_ReadInOrder.inc Modified: trunk/PO_Header.php =================================================================== --- trunk/PO_Header.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_Header.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -152,7 +152,7 @@ } $SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "', stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."', - allowprint='".$AllowPrint."' + allowprint='" . $AllowPrint . "' WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'"; $ErrMsg = _('The order status could not be updated because'); @@ -161,7 +161,6 @@ } //end if there is actually a status change the class Status != the POST['Status'] } -/*New order initiated by user clicking on supplier purchasing data from items page */ if (isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])) { @@ -179,7 +178,7 @@ $_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock']; /* set the SupplierID we got */ $_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier']; - $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']); + $_SESSION['PO'.$identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']); $_SESSION['RequireSupplierSelection'] = 0; $_POST['Select'] = $_GET['SelectedSupplier']; @@ -732,7 +731,7 @@ if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') { $_SESSION['PO'.$identifier]->Version += 1; $_POST['Version'] = $_SESSION['PO'.$identifier]->Version; - } elseif (isset($_SESSION['PO'.$identifier]->Version) and $_SESSION['PO'.$identifier]->Version != '') { + } elseif (isset($_SESSION['PO'.$identifier]->Version) AND $_SESSION['PO'.$identifier]->Version != '') { $_POST['Version'] = $_SESSION['PO'.$identifier]->Version; } else { $_POST['Version']='1'; @@ -762,7 +761,9 @@ <td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>'; echo '<tr><td>' . _('Date Printed') . ':</td><td>'; - if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){ + if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) + AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){ + echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted); $Printed = True; } else { Modified: trunk/PO_Items.php =================================================================== --- trunk/PO_Items.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_Items.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -94,7 +94,7 @@ $AuthRow=DB_fetch_array($AuthResult); if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['PO'.$identifier]->Order_Value()) { //user has authority to authrorise as well as create the order - $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />'; + $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'. $_SESSION['PO'.$identifier]->StatusComments.'<br />'; $_SESSION['PO'.$identifier]->AllowPrintPO=1; $_SESSION['PO'.$identifier]->Status = 'Authorised'; } else { // no authority to authorise this order @@ -111,7 +111,7 @@ _('The order will be created with a status of pending and will require authorisation'), 'warn'); $_SESSION['PO'.$identifier]->AllowPrintPO=0; - $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />'; + $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments.'<br />'; $_SESSION['PO'.$identifier]->Status = 'Pending'; } } else { //auto authorise is set to off @@ -186,7 +186,7 @@ '" . Date('Y-m-d') . "', '" . $_SESSION['PO'.$identifier]->DeliveryBy . "', '" . $_SESSION['PO'.$identifier]->Status . "', - '" . $StatusComment . "', + '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "', '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "', '" . $_SESSION['PO'.$identifier]->PaymentTerms. "', '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )"; @@ -244,12 +244,9 @@ } if ($Completed){ $_SESSION['PO'.$identifier]->Status = 'Completed'; - if (IsEmailAddress($_SESSION['UserEmail'])){ - $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName']. '</a>'; - } else { - $UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' '; - } - $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserChangedStatus . '<br />' .$_SESSION['PO'.$identifier]->StatusComments; + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments; + } else { + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order modified by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments; } /*Update the purchase order header with any changes */ @@ -282,7 +279,7 @@ paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "', allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "', status = '" . $_SESSION['PO'.$identifier]->Status . "', - stat_comment = '" . $_SESSION['PO'.$identifier]->StatusComments . "' + stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "' WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'"; $ErrMsg = _('The purchase order could not be updated because'); @@ -375,6 +372,7 @@ if ($_SESSION['PO'.$identifier]->AllowPrintPO==1 AND ($_SESSION['PO'.$identifier]->Status=='Authorised' OR $_SESSION['PO'.$identifier]->Status=='Printed')){ + echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>'; } } /*end of if its a new order or an existing one */ Modified: trunk/PO_PDFPurchOrder.php =================================================================== --- trunk/PO_PDFPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_PDFPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -125,7 +125,9 @@ $POHeader = DB_fetch_array($result); - if ($POHeader['status'] != 'Authorised' AND $POHeader['status'] != 'Printed') { + if ($POHeader['status'] != 'Authorised' + AND $POHeader['status'] != 'Printed') { + include('includes/header.inc'); prnMsg( _('Purchase orders can only be printed once they have been authorised') . '. ' . _('This order is currently at a status of') . ' ' . _($POHeader['status']),'warn'); include('includes/footer.inc'); @@ -333,12 +335,12 @@ } } if ($ViewingOnly==0 AND $Success==1) { - $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . '<a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . $POHeader['stat_comment']; + $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . ' <a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . html_entity_decode($POHeader['stat_comment'],ENT_QUOTES,'UTF-8'); $sql = "UPDATE purchorders SET allowprint = 0, dateprinted = '" . Date('Y-m-d') . "', status = 'Printed', - stat_comment = '" . DB_escape_string($StatusComment) . "' + stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "' WHERE purchorders.orderno = '" . $OrderNo ."'"; $result = DB_query($sql,$db); } Modified: trunk/PO_SelectOSPurchOrder.php =================================================================== --- trunk/PO_SelectOSPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_SelectOSPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -293,29 +293,33 @@ if (isset($OrderNumber) AND $OrderNumber !='') { $SQL = "SELECT purchorders.orderno, - suppliers.suppname, - purchorders.orddate, - purchorders.deliverydate, - purchorders.initiator, - purchorders.status, - purchorders.requisitionno, - purchorders.allowprint, - suppliers.currcode, - SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue - FROM purchorders INNER JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - INNER JOIN suppliers - ON purchorders.supplierno = suppliers.supplierid - WHERE purchorderdetails.completed=0 - AND purchorders.orderno='". $OrderNumber ."' - GROUP BY purchorders.orderno ASC, - suppliers.suppname, - purchorders.orddate, - purchorders.status, - purchorders.initiator, - purchorders.requisitionno, - purchorders.allowprint, - suppliers.currcode"; + purchorders.realorderno, + suppliers.suppname, + purchorders.orddate, + purchorders.deliverydate, + purchorders.initiator, + purchorders.status, + purchorders.requisitionno, + purchorders.allowprint, + suppliers.currcode, + currencies.decimalplaces AS currdecimalplaces, + SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue + FROM purchorders INNER JOIN purchorderdetails + ON purchorders.orderno=purchorderdetails.orderno + INNER JOIN suppliers + ON purchorders.supplierno = suppliers.supplierid + INNER JOIN currencies + ON suppliers.currcode=currencies.currabrev + WHERE purchorderdetails.completed=0 + AND purchorders.orderno='". $OrderNumber ."' + GROUP BY purchorders.orderno ASC, + suppliers.suppname, + purchorders.orddate, + purchorders.status, + purchorders.initiator, + purchorders.requisitionno, + purchorders.allowprint, + suppliers.currcode"; } else { /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */ Modified: trunk/SpecialOrder.php =================================================================== --- trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/SpecialOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -302,7 +302,8 @@ $AuthResult=DB_query($AuthSQL,$db); $AuthRow=DB_fetch_array($AuthResult); - if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order + if (DB_num_rows($AuthResult) > 0 + AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'; $_SESSION['SPL']->AllowPrintPO=1; $_SESSION['SPL']->Status = 'Authorised'; @@ -373,7 +374,7 @@ '" . DB_escape_string($StkLocAddress['deladd6']) . "', '" . DB_escape_string($StkLocAddress['contact']) . "', '" . $_SESSION['SPL']->Status . "', - '" . $StatusComment . "', + '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "', '" . $_SESSION['SPL']->AllowPrintPO . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "')"; Modified: trunk/includes/PO_ReadInOrder.inc =================================================================== --- trunk/includes/PO_ReadInOrder.inc 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/includes/PO_ReadInOrder.inc 2011-11-28 09:44:22 UTC (rev 4758) @@ -96,7 +96,7 @@ $_SESSION['PO'.$identifier]->Version = $myrow['version']; $_SESSION['PO'.$identifier]->Port = $myrow['port']; $_SESSION['PO'.$identifier]->Status = $myrow['status']; - $_SESSION['PO'.$identifier]->StatusComments = $myrow['stat_comment']; + $_SESSION['PO'.$identifier]->StatusComments = html_entity_decode($myrow['stat_comment'],ENT_QUOTES,'UTF-8'); $_SESSION['PO'.$identifier]->DeliveryDate = ConvertSQLDate($myrow['deliverydate']); $_SESSION['ExistingOrder'] = $_SESSION['PO'.$identifier]->OrderNo; $_SESSION['PO'.$identifier]->PaymentTerms= $myrow['paymentterms']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-28 09:44:32
|
Revision: 4758 http://web-erp.svn.sourceforge.net/web-erp/?rev=4758&view=rev Author: daintree Date: 2011-11-28 09:44:22 +0000 (Mon, 28 Nov 2011) Log Message: ----------- fixes to Special Orders and status comments Modified Paths: -------------- trunk/PO_Header.php trunk/PO_Items.php trunk/PO_PDFPurchOrder.php trunk/PO_SelectOSPurchOrder.php trunk/SpecialOrder.php trunk/includes/PO_ReadInOrder.inc Modified: trunk/PO_Header.php =================================================================== --- trunk/PO_Header.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_Header.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -152,7 +152,7 @@ } $SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "', stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."', - allowprint='".$AllowPrint."' + allowprint='" . $AllowPrint . "' WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'"; $ErrMsg = _('The order status could not be updated because'); @@ -161,7 +161,6 @@ } //end if there is actually a status change the class Status != the POST['Status'] } -/*New order initiated by user clicking on supplier purchasing data from items page */ if (isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])) { @@ -179,7 +178,7 @@ $_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock']; /* set the SupplierID we got */ $_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier']; - $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']); + $_SESSION['PO'.$identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']); $_SESSION['RequireSupplierSelection'] = 0; $_POST['Select'] = $_GET['SelectedSupplier']; @@ -732,7 +731,7 @@ if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') { $_SESSION['PO'.$identifier]->Version += 1; $_POST['Version'] = $_SESSION['PO'.$identifier]->Version; - } elseif (isset($_SESSION['PO'.$identifier]->Version) and $_SESSION['PO'.$identifier]->Version != '') { + } elseif (isset($_SESSION['PO'.$identifier]->Version) AND $_SESSION['PO'.$identifier]->Version != '') { $_POST['Version'] = $_SESSION['PO'.$identifier]->Version; } else { $_POST['Version']='1'; @@ -762,7 +761,9 @@ <td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>'; echo '<tr><td>' . _('Date Printed') . ':</td><td>'; - if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){ + if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) + AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){ + echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted); $Printed = True; } else { Modified: trunk/PO_Items.php =================================================================== --- trunk/PO_Items.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_Items.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -94,7 +94,7 @@ $AuthRow=DB_fetch_array($AuthResult); if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['PO'.$identifier]->Order_Value()) { //user has authority to authrorise as well as create the order - $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />'; + $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'. $_SESSION['PO'.$identifier]->StatusComments.'<br />'; $_SESSION['PO'.$identifier]->AllowPrintPO=1; $_SESSION['PO'.$identifier]->Status = 'Authorised'; } else { // no authority to authorise this order @@ -111,7 +111,7 @@ _('The order will be created with a status of pending and will require authorisation'), 'warn'); $_SESSION['PO'.$identifier]->AllowPrintPO=0; - $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />'; + $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments.'<br />'; $_SESSION['PO'.$identifier]->Status = 'Pending'; } } else { //auto authorise is set to off @@ -186,7 +186,7 @@ '" . Date('Y-m-d') . "', '" . $_SESSION['PO'.$identifier]->DeliveryBy . "', '" . $_SESSION['PO'.$identifier]->Status . "', - '" . $StatusComment . "', + '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "', '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "', '" . $_SESSION['PO'.$identifier]->PaymentTerms. "', '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )"; @@ -244,12 +244,9 @@ } if ($Completed){ $_SESSION['PO'.$identifier]->Status = 'Completed'; - if (IsEmailAddress($_SESSION['UserEmail'])){ - $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName']. '</a>'; - } else { - $UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' '; - } - $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserChangedStatus . '<br />' .$_SESSION['PO'.$identifier]->StatusComments; + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments; + } else { + $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order modified by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments; } /*Update the purchase order header with any changes */ @@ -282,7 +279,7 @@ paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "', allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "', status = '" . $_SESSION['PO'.$identifier]->Status . "', - stat_comment = '" . $_SESSION['PO'.$identifier]->StatusComments . "' + stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "' WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'"; $ErrMsg = _('The purchase order could not be updated because'); @@ -375,6 +372,7 @@ if ($_SESSION['PO'.$identifier]->AllowPrintPO==1 AND ($_SESSION['PO'.$identifier]->Status=='Authorised' OR $_SESSION['PO'.$identifier]->Status=='Printed')){ + echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>'; } } /*end of if its a new order or an existing one */ Modified: trunk/PO_PDFPurchOrder.php =================================================================== --- trunk/PO_PDFPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_PDFPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -125,7 +125,9 @@ $POHeader = DB_fetch_array($result); - if ($POHeader['status'] != 'Authorised' AND $POHeader['status'] != 'Printed') { + if ($POHeader['status'] != 'Authorised' + AND $POHeader['status'] != 'Printed') { + include('includes/header.inc'); prnMsg( _('Purchase orders can only be printed once they have been authorised') . '. ' . _('This order is currently at a status of') . ' ' . _($POHeader['status']),'warn'); include('includes/footer.inc'); @@ -333,12 +335,12 @@ } } if ($ViewingOnly==0 AND $Success==1) { - $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . '<a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . $POHeader['stat_comment']; + $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . ' <a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . html_entity_decode($POHeader['stat_comment'],ENT_QUOTES,'UTF-8'); $sql = "UPDATE purchorders SET allowprint = 0, dateprinted = '" . Date('Y-m-d') . "', status = 'Printed', - stat_comment = '" . DB_escape_string($StatusComment) . "' + stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "' WHERE purchorders.orderno = '" . $OrderNo ."'"; $result = DB_query($sql,$db); } Modified: trunk/PO_SelectOSPurchOrder.php =================================================================== --- trunk/PO_SelectOSPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/PO_SelectOSPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -293,29 +293,33 @@ if (isset($OrderNumber) AND $OrderNumber !='') { $SQL = "SELECT purchorders.orderno, - suppliers.suppname, - purchorders.orddate, - purchorders.deliverydate, - purchorders.initiator, - purchorders.status, - purchorders.requisitionno, - purchorders.allowprint, - suppliers.currcode, - SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue - FROM purchorders INNER JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - INNER JOIN suppliers - ON purchorders.supplierno = suppliers.supplierid - WHERE purchorderdetails.completed=0 - AND purchorders.orderno='". $OrderNumber ."' - GROUP BY purchorders.orderno ASC, - suppliers.suppname, - purchorders.orddate, - purchorders.status, - purchorders.initiator, - purchorders.requisitionno, - purchorders.allowprint, - suppliers.currcode"; + purchorders.realorderno, + suppliers.suppname, + purchorders.orddate, + purchorders.deliverydate, + purchorders.initiator, + purchorders.status, + purchorders.requisitionno, + purchorders.allowprint, + suppliers.currcode, + currencies.decimalplaces AS currdecimalplaces, + SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue + FROM purchorders INNER JOIN purchorderdetails + ON purchorders.orderno=purchorderdetails.orderno + INNER JOIN suppliers + ON purchorders.supplierno = suppliers.supplierid + INNER JOIN currencies + ON suppliers.currcode=currencies.currabrev + WHERE purchorderdetails.completed=0 + AND purchorders.orderno='". $OrderNumber ."' + GROUP BY purchorders.orderno ASC, + suppliers.suppname, + purchorders.orddate, + purchorders.status, + purchorders.initiator, + purchorders.requisitionno, + purchorders.allowprint, + suppliers.currcode"; } else { /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */ Modified: trunk/SpecialOrder.php =================================================================== --- trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/SpecialOrder.php 2011-11-28 09:44:22 UTC (rev 4758) @@ -302,7 +302,8 @@ $AuthResult=DB_query($AuthSQL,$db); $AuthRow=DB_fetch_array($AuthResult); - if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order + if (DB_num_rows($AuthResult) > 0 + AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'; $_SESSION['SPL']->AllowPrintPO=1; $_SESSION['SPL']->Status = 'Authorised'; @@ -373,7 +374,7 @@ '" . DB_escape_string($StkLocAddress['deladd6']) . "', '" . DB_escape_string($StkLocAddress['contact']) . "', '" . $_SESSION['SPL']->Status . "', - '" . $StatusComment . "', + '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "', '" . $_SESSION['SPL']->AllowPrintPO . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "')"; Modified: trunk/includes/PO_ReadInOrder.inc =================================================================== --- trunk/includes/PO_ReadInOrder.inc 2011-11-27 09:16:35 UTC (rev 4757) +++ trunk/includes/PO_ReadInOrder.inc 2011-11-28 09:44:22 UTC (rev 4758) @@ -96,7 +96,7 @@ $_SESSION['PO'.$identifier]->Version = $myrow['version']; $_SESSION['PO'.$identifier]->Port = $myrow['port']; $_SESSION['PO'.$identifier]->Status = $myrow['status']; - $_SESSION['PO'.$identifier]->StatusComments = $myrow['stat_comment']; + $_SESSION['PO'.$identifier]->StatusComments = html_entity_decode($myrow['stat_comment'],ENT_QUOTES,'UTF-8'); $_SESSION['PO'.$identifier]->DeliveryDate = ConvertSQLDate($myrow['deliverydate']); $_SESSION['ExistingOrder'] = $_SESSION['PO'.$identifier]->OrderNo; $_SESSION['PO'.$identifier]->PaymentTerms= $myrow['paymentterms']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-27 09:16:44
|
Revision: 4757 http://web-erp.svn.sourceforge.net/web-erp/?rev=4757&view=rev Author: daintree Date: 2011-11-27 09:16:35 +0000 (Sun, 27 Nov 2011) Log Message: ----------- remove DB_escape_string() calls Modified Paths: -------------- trunk/ConfirmDispatch_Invoice.php trunk/CounterSales.php trunk/Credit_Invoice.php trunk/DeliveryDetails.php trunk/GLJournal.php trunk/GLTags.php trunk/Locations.php trunk/MRPDemandTypes.php trunk/PcAuthorizeExpenses.php trunk/PcClaimExpensesFromTab.php trunk/PcExpenses.php trunk/SalesPeople.php trunk/SelectCreditItems.php trunk/Shippers.php trunk/SpecialOrder.php trunk/StockAdjustments.php trunk/StockLocTransferReceive.php trunk/StockTransfers.php trunk/Stocks.php trunk/SupplierContacts.php trunk/SupplierCredit.php trunk/Suppliers.php trunk/TaxAuthorities.php trunk/WOSerialNos.php trunk/WWW_Access.php trunk/WWW_Users.php trunk/WorkCentres.php trunk/WorkOrderEntry.php trunk/WorkOrderIssue.php trunk/WorkOrderReceive.php trunk/doc/Change.log Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/ConfirmDispatch_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1080,7 +1080,7 @@ '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', '" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "', - '" . DB_escape_string($OrderLine->Narrative) . "' )"; + '" . $OrderLine->Narrative . "' )"; } else { // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil if (empty($OrderLine->StandardCost)) { @@ -1113,7 +1113,7 @@ '" . -$OrderLine->QtyDispatched . "', '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', - '" . DB_escape_string($OrderLine->Narrative) . "')"; + '" . $OrderLine->Narrative . "')"; } @@ -1153,7 +1153,7 @@ $SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . " WHERE stockid='" . $OrderLine->StockID . "' AND loccode='" . $_SESSION['Items'.$identifier]->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -1167,7 +1167,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $OrderLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/CounterSales.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1031,12 +1031,12 @@ '" . $OrderNo . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', - '" . Date("Y-m-d H:i") . "', + '". $_SESSION['Items'.$identifier]->CustRef ."', + '". $_SESSION['Items'.$identifier]->Comments ."', + '" . Date('Y-m-d H:i') . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', '" . $_SESSION['Items'.$identifier]->ShipVia . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', + '". $_SESSION['Items'.$identifier]->DeliverTo . "', '" . _('Counter Sale') . "', '" . $_SESSION['Items'.$identifier]->PhoneNo . "', '" . $_SESSION['Items'.$identifier]->Email . "', @@ -1071,7 +1071,7 @@ '". $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . floatval($StockItem->DiscountPercent) . "', - '" . DB_escape_string($StockItem->Narrative) . "', + '" . $StockItem->Narrative . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "', '" . $StockItem->Quantity . "', @@ -1279,13 +1279,13 @@ '" . $DefaultDispatchDate . "', '" . date('Y-m-d H-i-s') . "', '" . $PeriodNo . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->CustRef) . "', + '" . $_SESSION['Items'.$identifier]->CustRef . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', '" . $OrderNo . "', '" . $_SESSION['Items'.$identifier]->total . "', '" . filter_number_format($_POST['TaxTotal']) . "', '" . $ExRate . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->Comments) . "', + '" . $_SESSION['Items'.$identifier]->Comments . "', '" . $_SESSION['Items'.$identifier]->ShipVia . "', '" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "')"; @@ -1472,7 +1472,7 @@ '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', '" . ($QtyOnHandPrior - $OrderLine->Quantity) . "', - '" . DB_escape_string($OrderLine->Narrative) . "' )"; + '" . $OrderLine->Narrative . "' )"; } else { // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil if (empty($OrderLine->StandardCost)) { @@ -1505,7 +1505,7 @@ '" . -$OrderLine->Quantity . "', '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', - '" . DB_escape_string($OrderLine->Narrative) . "')"; + '" . $OrderLine->Narrative . "')"; } $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Credit_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -572,7 +572,7 @@ '" . -$TaxTotal . "', '" . -$_SESSION['CreditItems']->FreightCost . "', '" . $_SESSION['CurrencyRate'] . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . -$Allocate_amount . "', '" . $Settled . "')"; @@ -836,7 +836,7 @@ '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', '" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; } else { $SQL = "INSERT INTO stockmoves (stockid, @@ -866,7 +866,7 @@ '" . $CreditLine->QtyDispatched . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; } $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); @@ -882,7 +882,7 @@ $SQL = "SELECT quantity from stockserialitems WHERE stockid='" . $CreditLine->StockID . "' AND loccode='" . $_SESSION['CreditItems']->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be selected because'); $DbgMsg = _('The following SQL to select the serial stock item record was used'); @@ -896,7 +896,7 @@ VALUES ('" . $CreditLine->StockID . "', '" . $_SESSION['CreditItems']->Location . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '". $Item->BundleQty ."')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); @@ -908,7 +908,7 @@ SET quantity= quantity + " . $Item->BundleQty . " WHERE stockid='" . $CreditLine->StockID . "' AND loccode='" . $_SESSION['CreditItems']->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true); @@ -922,7 +922,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $CreditLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); @@ -965,7 +965,7 @@ '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', '" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); $DbgMsg = _('The following SQL to insert the stock movement records was used'); @@ -1003,7 +1003,7 @@ '" . $CreditLine->StandardCost . "', 0, '" . $QtyOnHandPrior . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); $DbgMsg = _('The following SQL to insert the stock movement records was used'); @@ -1042,7 +1042,7 @@ '" . $CreditLine->StandardCost . "', '" . $QtyOnHandPrior . "', 1, - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); Modified: trunk/DeliveryDetails.php =================================================================== --- trunk/DeliveryDetails.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/DeliveryDetails.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -354,21 +354,21 @@ '". $OrderNo . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', + '". $_SESSION['Items'.$identifier]->CustRef ."', + '". $_SESSION['Items'.$identifier]->Comments ."', '" . Date('Y-m-d H:i') . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', - '" . DB_escape_string($_POST['ShipVia']) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "', + '" . $_POST['ShipVia'] ."', + '". $_SESSION['Items'.$identifier]->DeliverTo . "', + '" . $_SESSION['Items'.$identifier]->BuyerName . "', + '" . $_SESSION['Items'.$identifier]->DelAdd1 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd2 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd3 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd4 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd5 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd6 . "', + '" . $_SESSION['Items'.$identifier]->PhoneNo . "', + '" . $_SESSION['Items'.$identifier]->Email . "', '" . $_SESSION['Items'.$identifier]->FreightCost ."', '" . $_SESSION['Items'.$identifier]->Location ."', '" . $DelDate . "', @@ -403,7 +403,7 @@ '" . $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . floatval($StockItem->DiscountPercent) . "', - '" . DB_escape_string($StockItem->Narrative) . "', + '" . $StockItem->Narrative . "', '" . $StockItem->POLine . "', '" . FormatDateForSQL($StockItem->ItemDue) . "' )"; @@ -712,23 +712,23 @@ $HeaderSQL = "UPDATE salesorders SET debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "', branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "', - customerref = '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - comments = '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', + customerref = '". $_SESSION['Items'.$identifier]->CustRef ."', + comments = '". $_SESSION['Items'.$identifier]->Comments ."', ordertype = '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', shipvia = '" . $_POST['ShipVia'] . "', - deliverydate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->DeliveryDate)) . "', - quotedate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->QuoteDate)) . "', - confirmeddate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->ConfirmedDate)) . "', - deliverto = '" . DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', - buyername = '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "', - deladd1 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "', - deladd2 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "', - deladd3 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "', - deladd4 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "', - deladd5 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "', - deladd6 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "', - contactphone = '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "', - contactemail = '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "', + deliverydate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->DeliveryDate) . "', + quotedate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->QuoteDate) . "', + confirmeddate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->ConfirmedDate) . "', + deliverto = '" . $_SESSION['Items'.$identifier]->DeliverTo . "', + buyername = '" . $_SESSION['Items'.$identifier]->BuyerName . "', + deladd1 = '" . $_SESSION['Items'.$identifier]->DelAdd1 . "', + deladd2 = '" . $_SESSION['Items'.$identifier]->DelAdd2 . "', + deladd3 = '" . $_SESSION['Items'.$identifier]->DelAdd3 . "', + deladd4 = '" . $_SESSION['Items'.$identifier]->DelAdd4 . "', + deladd5 = '" . $_SESSION['Items'.$identifier]->DelAdd5 . "', + deladd6 = '" . $_SESSION['Items'.$identifier]->DelAdd6 . "', + contactphone = '" . $_SESSION['Items'.$identifier]->PhoneNo . "', + contactemail = '" . $_SESSION['Items'.$identifier]->Email . "', freightcost = '" . $_SESSION['Items'.$identifier]->FreightCost ."', fromstkloc = '" . $_SESSION['Items'.$identifier]->Location ."', printedpackingslip = '" . $_POST['ReprintPackingSlip'] . "', Modified: trunk/GLJournal.php =================================================================== --- trunk/GLJournal.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/GLJournal.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -76,7 +76,7 @@ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "', '" . $PeriodNo . "', '" . $JournalItem->GLCode . "', - '" . DB_escape_string($JournalItem->Narrative) . "', + '" . $JournalItem->Narrative . "', '" . $JournalItem->Amount . "', '" . $JournalItem->tag."' )"; @@ -98,7 +98,7 @@ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "', '" . ($PeriodNo + 1) . "', '" . $JournalItem->GLCode . "', - '" . _('Reversal') . " - " . DB_escape_string($JournalItem->Narrative) . "', + '" . _('Reversal') . " - " . $JournalItem->Narrative . "', '" . -($JournalItem->Amount) ."', '".$JournalItem->tag."' )"; @@ -111,7 +111,7 @@ $ErrMsg = _('Cannot commit the changes'); - $result= DB_Txn_Begin($db); + $result= DB_Txn_Commit($db); prnMsg(_('Journal').' ' . $TransNo . ' '._('has been successfully entered'),'success'); Modified: trunk/GLTags.php =================================================================== --- trunk/GLTags.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/GLTags.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -37,12 +37,12 @@ } if (isset($_POST['submit'])) { - $sql = "INSERT INTO tags values(NULL, '" . DB_escape_string($_POST['Description']) . "')"; + $sql = "INSERT INTO tags values(NULL, '" . $_POST['Description'] . "')"; $result= DB_query($sql,$db); } if (isset($_POST['update'])) { - $sql = "UPDATE tags SET tagdescription='".DB_escape_string($_POST['Description']). "' + $sql = "UPDATE tags SET tagdescription='" . $_POST['Description'] . "' WHERE tagref='".$_POST['reference']."'"; $result= DB_query($sql,$db); } Modified: trunk/Locations.php =================================================================== --- trunk/Locations.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Locations.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -55,17 +55,17 @@ } $sql = "UPDATE locations SET loccode='" . $_POST['LocCode'] . "', - locationname='" . DB_escape_string($_POST['LocationName']) . "', - deladd1='" . DB_escape_string($_POST['DelAdd1']) . "', - deladd2='" . DB_escape_string($_POST['DelAdd2']) . "', - deladd3='" . DB_escape_string($_POST['DelAdd3']) . "', - deladd4='" . DB_escape_string($_POST['DelAdd4']) . "', - deladd5='" . DB_escape_string($_POST['DelAdd5']) . "', - deladd6='" . DB_escape_string($_POST['DelAdd6']) . "', - tel='" . DB_escape_string($_POST['Tel']) . "', - fax='" . DB_escape_string($_POST['Fax']) . "', - email='" . DB_escape_string($_POST['Email']) . "', - contact='" . DB_escape_string($_POST['Contact']) . "', + locationname='" . $_POST['LocationName'] . "', + deladd1='" . $_POST['DelAdd1'] . "', + deladd2='" . $_POST['DelAdd2'] . "', + deladd3='" . $_POST['DelAdd3'] . "', + deladd4='" . $_POST['DelAdd4'] . "', + deladd5='" . $_POST['DelAdd5'] . "', + deladd6='" . $_POST['DelAdd6'] . "', + tel='" . $_POST['Tel'] . "', + fax='" . $_POST['Fax'] . "', + email='" . $_POST['Email'] . "', + contact='" . $_POST['Contact'] . "', taxprovinceid = '" . $_POST['TaxProvince'] . "', cashsalecustomer ='" . $_POST['CashSaleCustomer'] . "', cashsalebranch ='" . $_POST['CashSaleBranch'] . "', @@ -124,18 +124,18 @@ cashsalecustomer, cashsalebranch, managed ) - VALUES ('" . DB_escape_string($_POST['LocCode']) . "', - '" . DB_escape_string($_POST['LocationName']) . "', - '" . DB_escape_string($_POST['DelAdd1']) ."', - '" . DB_escape_string($_POST['DelAdd2']) ."', - '" . DB_escape_string($_POST['DelAdd3']) . "', - '" . DB_escape_string($_POST['DelAdd4']) . "', - '" . DB_escape_string($_POST['DelAdd5']) . "', - '" . DB_escape_string($_POST['DelAdd6']) . "', - '" . DB_escape_string($_POST['Tel']) . "', - '" . DB_escape_string($_POST['Fax']) . "', - '" . DB_escape_string($_POST['Email']) . "', - '" . DB_escape_string($_POST['Contact']) . "', + VALUES ('" . $_POST['LocCode'] . "', + '" . $_POST['LocationName'] . "', + '" . $_POST['DelAdd1'] ."', + '" . $_POST['DelAdd2'] ."', + '" . $_POST['DelAdd3'] . "', + '" . $_POST['DelAdd4'] . "', + '" . $_POST['DelAdd5'] . "', + '" . $_POST['DelAdd6'] . "', + '" . $_POST['Tel'] . "', + '" . $_POST['Fax'] . "', + '" . $_POST['Email'] . "', + '" . $_POST['Contact'] . "', '" . $_POST['TaxProvince'] . "', '" . $_POST['CashSaleCustomer'] . "', '" . $_POST['CashSaleBranch'] . "', Modified: trunk/MRPDemandTypes.php =================================================================== --- trunk/MRPDemandTypes.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/MRPDemandTypes.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -58,7 +58,7 @@ $sql = "INSERT INTO mrpdemandtypes (mrpdemandtype, description) VALUES ('" . trim(mb_strtoupper($_POST['MRPDemandType'])) . "', - '" . DB_escape_string($_POST['Description']) . "' + '" . $_POST['Description'] . "' )"; $msg = _('The new demand type has been added to the database'); } Modified: trunk/PcAuthorizeExpenses.php =================================================================== --- trunk/PcAuthorizeExpenses.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcAuthorizeExpenses.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -135,7 +135,7 @@ $typeno = GetNextTransNo($type,$db); //build narrative - $narrative= _('PettyCash') . ' - '.$myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . $myrow['notes'] . ' - ' . $myrow['receipt']; + $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt']; //insert to gltrans DB_Txn_Begin($db); @@ -158,7 +158,7 @@ '".$myrow['date']."', '".$PeriodNo."', '".$AccountFrom."', - '". DB_escape_string($narrative) ."', + '". $Narrative ."', '".-$Amount."', 0, '', @@ -185,7 +185,7 @@ '".$myrow['date']."', '".$PeriodNo."', '".$AccountTo."', - '" . DB_escape_string($narrative) . "', + '" . $Narrative . "', '".$Amount."', 0, '', @@ -209,7 +209,7 @@ VALUES ('". $ReceiptTransNo . "', 1, '" . $AccountFrom . "', - '" . DB_escape_string($narrative) . "', + '" . $Narrative . "', 1, '" . $myrow['rate'] . "', '" . $myrow['date'] . "', Modified: trunk/PcClaimExpensesFromTab.php =================================================================== --- trunk/PcClaimExpensesFromTab.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcClaimExpensesFromTab.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -72,8 +72,8 @@ SET date = '".FormatDateForSQL($_POST['Date'])."', codeexpense = '" . $_POST['SelectedExpense'] . "', amount = '" .-filter_number_format($_POST['amount']) . "', - notes = '" . DB_escape_string($_POST['Notes']) . "', - receipt = '" . DB_escape_string($_POST['Receipt']) . "' + notes = '" . $_POST['Notes'] . "', + receipt = '" . $_POST['Receipt'] . "' WHERE counterindex = '".$SelectedIndex."'"; $msg = _('The Expense Claim on Tab') . ' ' . $SelectedTabs . ' ' . _('has been updated'); @@ -98,8 +98,8 @@ '" . -filter_number_format($_POST['amount']) . "', '', '', - '" . DB_escape_string($_POST['Notes']) . "', - '" . DB_escape_string($_POST['Receipt']) . "' + '" . $_POST['Notes'] . "', + '" . $_POST['Receipt'] . "' )"; $msg = _('The Expense Claim on Tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created'); Modified: trunk/PcExpenses.php =================================================================== --- trunk/PcExpenses.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcExpenses.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -87,7 +87,7 @@ if (isset($SelectedExpense) AND $InputError !=1) { $sql = "UPDATE pcexpenses - SET description = '" . DB_escape_string($_POST['Description']) . "', + SET description = '" . $_POST['Description'] . "', glaccount = '" . $_POST['GLAccount'] . "', tag = '" . $_POST['Tag'] . "' WHERE codeexpense = '" . $SelectedExpense . "'"; @@ -117,7 +117,7 @@ glaccount, tag) VALUES ('" . $_POST['CodeExpense'] . "', - '" . DB_escape_string($_POST['Description']) . "', + '" . $_POST['Description'] . "', '" . $_POST['GLAccount'] . "', '" . $_POST['Tag'] . "')"; Modified: trunk/SalesPeople.php =================================================================== --- trunk/SalesPeople.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SalesPeople.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -85,10 +85,10 @@ /*SelectedSalesPerson could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/ - $sql = "UPDATE salesman SET salesmanname='" . DB_escape_string($_POST['SalesmanName']) . "', + $sql = "UPDATE salesman SET salesmanname='" . $_POST['SalesmanName'] . "', commissionrate1='" . filter_number_format($_POST['CommissionRate1']) . "', - smantel='" . DB_escape_string($_POST['SManTel']) . "', - smanfax='" . DB_escape_string($_POST['SManFax']) . "', + smantel='" . $_POST['SManTel'] . "', + smanfax='" . $_POST['SManFax'] . "', breakpoint='" . filter_number_format($_POST['Breakpoint']) . "', commissionrate2='" . filter_number_format($_POST['CommissionRate2']) . "', current='" . $_POST['Current'] . "' @@ -107,13 +107,13 @@ smantel, smanfax, current) - VALUES ('" . DB_escape_string($_POST['SalesmanCode']) . "', - '" . DB_escape_string($_POST['SalesmanName']) . "', + VALUES ('" . $_POST['SalesmanCode'] . "', + '" . $_POST['SalesmanName'] . "', '" . filter_number_format($_POST['CommissionRate1']) . "', '" . filter_number_format($_POST['CommissionRate2']) . "', '" . filter_number_format($_POST['Breakpoint']) . "', - '" . DB_escape_string($_POST['SManTel']) . "', - '" . DB_escape_string($_POST['SManFax']) . "', + '" . $_POST['SManTel'] . "', + '" . $_POST['SManFax'] . "', '" . $_POST['Current'] . "' )"; @@ -280,7 +280,7 @@ $_POST['SManTel'] = $myrow['smantel']; $_POST['SManFax'] = $myrow['smanfax']; $_POST['CommissionRate1'] = locale_number_format($myrow['commissionrate1'],'Variable'); - $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],'Variable'); + $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],$_SESSION['CompanyRecord']['decimalplaces']); $_POST['CommissionRate2'] = locale_number_format($myrow['commissionrate2'],'Variable'); $_POST['Current'] = $myrow['current']; @@ -290,14 +290,15 @@ echo '<table class="selection"> <tr> <td>' . _('Salesperson code') . ':</td> - <td>' . $_POST['SalesmanCode'] . '</td></tr>'; + <td>' . $_POST['SalesmanCode'] . '</td> + </tr>'; } else { //end of if $SelectedSalesPerson only do the else when a new record is being entered echo '<table class="selection"> <tr> <td>' . _('Salesperson code') . ':</td> - <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size=3 maxlength=3></td> + <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size="3" maxlength="3" /></td> </tr>'; } if (!isset($_POST['SalesmanName'])){ @@ -324,27 +325,27 @@ echo '<tr> <td>' . _('Salesperson Name') . ':</td> - <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 value="' . $_POST['SalesmanName'] . '"></td> + <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size="30" maxlength="30" value="' . $_POST['SalesmanName'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Telephone No') . ':</td> - <td><input type="text" name="SManTel" size=20 maxlength=20 value="' . $_POST['SManTel'] . '"></td> + <td><input type="text" name="SManTel" size="20" maxlength="20" value="' . $_POST['SManTel'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Facsimile No') . ':</td> - <td><input type="text" name="SManFax" size=20 maxlength=20 value="' . $_POST['SManFax'] . '"></td> + <td><input type="text" name="SManFax" size="20" maxlength="20" value="' . $_POST['SManFax'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Commission Rate 1') . ':</td> - <td><input type="text" class="number" name="CommissionRate1" size="5" maxlength="5" value="' . $_POST['CommissionRate1'] . '"></td> + <td><input type="text" class="number" name="CommissionRate1" size="5" maxlength="5" value="' . $_POST['CommissionRate1'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Breakpoint') . ':</td> - <td><input type="text" class="number" name="Breakpoint" size="6" maxlength="6" value="' . $_POST['Breakpoint'] . '"></td> + <td><input type="text" class="number" name="Breakpoint" size="6" maxlength="6" value="' . $_POST['Breakpoint'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Commission Rate 2') . ':</td> - <td><input type="text" class="number" name="CommissionRate2" size="5" maxlength="5" value="' . $_POST['CommissionRate2']. '"></td> + <td><input type="text" class="number" name="CommissionRate2" size="5" maxlength="5" value="' . $_POST['CommissionRate2']. '" /></td> </tr>'; echo '<tr> Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SelectCreditItems.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1120,7 +1120,7 @@ '" . -$TaxTotal . "', '" . -$_SESSION['CreditItems'.$identifier]->FreightCost . "', '" . $_SESSION['CurrencyRate'] . "', - '" . DB_escape_string($_POST['CreditText']) . "' + '" . $_POST['CreditText'] . "' )"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The customer credit note transaction could not be added to the database because'); @@ -1200,7 +1200,7 @@ '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', '" . $PeriodNo . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', @@ -1243,7 +1243,7 @@ '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . ($QtyOnHandPrior + $CreditLine->Quantity) . "', '" . $CreditLine->Narrative . "' )"; @@ -1276,7 +1276,7 @@ '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . $CreditLine->Narrative . "' )"; } @@ -1513,7 +1513,7 @@ '" . -$CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', 0, '" . $QtyOnHandPrior . "', '" . $CreditLine->Narrative . "' @@ -1548,7 +1548,7 @@ '" . -$CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', 0)"; } Modified: trunk/Shippers.php =================================================================== --- trunk/Shippers.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Shippers.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1,8 +1,6 @@ <?php /* $Id$*/ -//$PageSecurity = 15; - include('includes/session.inc'); $title = _('Shipping Company Maintenance'); include('includes/header.inc'); @@ -48,13 +46,14 @@ would not run in this case cos submit is false of course see the delete code below*/ - $sql = "UPDATE shippers SET shippername='" . DB_escape_string($_POST['ShipperName']) . "' WHERE shipper_id = '".$SelectedShipper."'"; + $sql = "UPDATE shippers SET shippername='" . $_POST['ShipperName'] . "' + WHERE shipper_id = '".$SelectedShipper."'"; $msg = _('The shipper record has been updated'); } elseif ($InputError !=1) { /*SelectedShipper is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Shipper form */ - $sql = "INSERT INTO shippers (shippername) VALUES ('" . DB_escape_string($_POST['ShipperName']) . "')"; + $sql = "INSERT INTO shippers (shippername) VALUES ('" . $_POST['ShipperName'] . "')"; $msg = _('The shipper record has been added'); } Modified: trunk/SpecialOrder.php =================================================================== --- trunk/SpecialOrder.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -359,11 +359,11 @@ revised, deliverydate) VALUES ('" . $_SESSION['SPL']->SupplierID . "', - '" . DB_escape_string($_SESSION['SPL']->Comments) . "', + '" . $_SESSION['SPL']->Comments . "', '" . Date('Y-m-d') . "', '" . $_SESSION['SPL']->SuppCurrExRate . "', - '" . DB_escape_string($_SESSION['SPL']->Initiator) . "', - '" . DB_escape_string($_SESSION['SPL']->QuotationRef) . "', + '" . $_SESSION['SPL']->Initiator . "', + '" . $_SESSION['SPL']->QuotationRef . "', '" . $_SESSION['SPL']->StkLocation . "', '" . DB_escape_string($StkLocAddress['deladd1']) . "', '" . DB_escape_string($StkLocAddress['deladd2']) . "', @@ -373,7 +373,7 @@ '" . DB_escape_string($StkLocAddress['deladd6']) . "', '" . DB_escape_string($StkLocAddress['contact']) . "', '" . $_SESSION['SPL']->Status . "', - '" . DB_escape_string($StatusComment) . "', + '" . $StatusComment . "', '" . $_SESSION['SPL']->AllowPrintPO . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "')"; @@ -417,10 +417,10 @@ description, longdescription, materialcost) - VALUES ('" . DB_escape_string($PartCode) . "', + VALUES ('" . $PartCode . "', '" . $SPLLine->StkCat . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', + '" . $SPLLine->ItemDescription . "', + '" . $SPLLine->ItemDescription . "', '" . $SPLLine->Cost . "')"; @@ -430,7 +430,7 @@ $result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true); $sql = "INSERT INTO locstock (loccode, stockid) - SELECT loccode,'" . DB_escape_string($PartCode) . "' FROM locations"; + SELECT loccode,'" . $PartCode . "' FROM locations"; $ErrMsg = _('The item stock locations for the special order line') . " " . $SPLLine->LineNo . " " ._('could not be created because'); $DbgMsg = _('The SQL statement used to insert the location stock records and failed was'); $result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true); @@ -455,9 +455,9 @@ quantityord) VALUES ('"; $sql = $sql . $_SESSION['SPL']->PurchOrderNo . "', - '" . DB_escape_string($PartCode) . "', + '" . $PartCode . "', '" . $OrderDate . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', + '" . $SPLLine->ItemDescription . "', '" . $GLCode . "', '" . $SPLLine->Cost . "', '" . $SPLLine->Quantity . "')"; @@ -517,7 +517,7 @@ VALUES ('" . $OrderNo."', '" . $_SESSION['SPL']->CustomerID . "', '" . $_SESSION['SPL']->BranchCode . "', - '" . DB_escape_string($_SESSION['SPL']->CustRef) ."', + '" . $_SESSION['SPL']->CustRef ."', '" . Date('Y-m-d') . "', '" . $BranchDetails['salestype'] . "', '" . $BranchDetails['defaultshipvia'] ."', @@ -548,7 +548,7 @@ foreach ($_SESSION['SPL']->LineItems as $StockItem) { $LineItemsSQL = $StartOf_LineItemsSQL . ", - '" . DB_escape_string($StockItem->PartCode) . "', + '" . $StockItem->PartCode . "', '". $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . $StockItem->LineNo . "')"; Modified: trunk/StockAdjustments.php =================================================================== --- trunk/StockAdjustments.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockAdjustments.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -168,7 +168,7 @@ '" . $_SESSION['Adjustment']->StockLocation . "', '" . $SQLAdjustmentDate . "', '" . $PeriodNo . "', - '" . DB_escape_string($_SESSION['Adjustment']->Narrative) ."', + '" . $_SESSION['Adjustment']->Narrative ."', '" . $_SESSION['Adjustment']->Quantity . "', '" . ($QtyOnHandPrior + $_SESSION['Adjustment']->Quantity) . "' )"; Modified: trunk/StockLocTransferReceive.php =================================================================== --- trunk/StockLocTransferReceive.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockLocTransferReceive.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -119,7 +119,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $Result = DB_query($SQL,$db,'<br />' . _('Could not determine if the serial item exists') ); $SerialItemExistsRow = DB_fetch_row($Result); @@ -131,7 +131,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -144,7 +144,7 @@ quantity) VALUES ('" . $TrfLine->StockID . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item for the stock being transferred out of the existing location could not be inserted because'); @@ -163,7 +163,7 @@ ) VALUES ( '" . $StkMoveNo . "', '" . $TrfLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "' )"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); @@ -232,7 +232,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $Result = DB_query($SQL,$db,'<br />'. _('Could not determine if the serial item exists') ); $SerialItemExistsRow = DB_fetch_row($Result); @@ -245,7 +245,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated for the quantity coming in because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -258,7 +258,7 @@ quantity) VALUES ('" . $TrfLine->StockID . "', '" . $_SESSION['Transfer']->StockLocationTo . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record for the stock coming in could not be added because'); @@ -276,7 +276,7 @@ moveqty) VALUES (" . $StkMoveNo . ", '" . $TrfLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); Modified: trunk/StockTransfers.php =================================================================== --- trunk/StockTransfers.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockTransfers.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -259,7 +259,7 @@ expirationdate='" . FormatDateForSQL($Item->ExpiryDate) . "' WHERE stockid='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -273,7 +273,7 @@ quantity) VALUES ('" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . FormatDateForSQL($Item->ExpiryDate) . "', '" . -$Item->BundleQty . "')"; @@ -293,7 +293,7 @@ VALUES ( '" . $StkMoveNo . "', '" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "' )"; @@ -372,7 +372,7 @@ expirationdate='" . FormatDateForSQL($Item->ExpiryDate) . "' WHERE stockid='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -386,7 +386,7 @@ quantity) VALUES ('" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', '" . $_SESSION['Transfer']->StockLocationTo . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . FormatDateForSQL($Item->ExpiryDate) . "', '" . $Item->BundleQty . "')"; @@ -404,7 +404,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); Modified: trunk/Stocks.php =================================================================== --- trunk/Stocks.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Stocks.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -390,13 +390,13 @@ if ($_POST['PropNumeric' .$i]==1){ $_POST['PropValue' . $i]=filter_number_format($_POST['PropValue' . $i]); } else { - $_POST['PropValue' . $i]=DB_escape_string($_POST['PropValue' . $i]); + $_POST['PropValue' . $i]=$_POST['PropValue' . $i]; } $result = DB_query("INSERT INTO stockitemproperties (stockid, stkcatpropid, value) VALUES ('" . $StockID . "', - '" . DB_escape_string($_POST['PropID' . $i]) . "', + '" . $_POST['PropID' . $i] . "', '" . $_POST['PropValue' . $i] . "')", $db,$ErrMsg,$DbgMsg,true); } //end of loop around properties defined for the category Modified: trunk/SupplierContacts.php =================================================================== --- trunk/SupplierContacts.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SupplierContacts.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -59,11 +59,11 @@ /*SelectedContact could also exist if submit had not been clicked this code would not run in this case 'cos submit is false of course see the delete code below*/ - $sql = "UPDATE suppliercontacts SET position='" . DB_escape_string($_POST['Position']) . "', - tel='" . DB_escape_string($_POST['Tel']) . "', - fax='" . DB_escape_string($_POST['Fax']) . "', - email='" . DB_escape_string($_POST['Email']) . "', - mobile = '". DB_escape_string($_POST['Mobile']) . "' + $sql = "UPDATE suppliercontacts SET position='" . $_POST['Position'] . "', + tel='" . $_POST['Tel'] . "', + fax='" . $_POST['Fax'] . "', + email='" . $_POST['Email'] . "', + mobile = '". $_POST['Mobile'] . "' WHERE contact='".$SelectedContact."' AND supplierid='".$SupplierID."'"; @@ -81,12 +81,12 @@ email, mobile) VALUES ('" . $SupplierID . "', - '" . DB_escape_string($_POST['Contact']) . "', - '" . DB_escape_string($_POST['Position']) . "', - '" . DB_escape_string($_POST['Tel']) . "', - '" . DB_escape_string($_POST['Fax']) . "', - '" . DB_escape_string($_POST['Email']) . "', - '" . DB_escape_string($_POST['Mobile']) . "')"; + '" . $_POST['Contact'] . "', + '" . $_POST['Position'] . "', + '" . $_POST['Tel'] . "', + '" . $_POST['Fax'] . "', + '" . $_POST['Email'] . "', + '" . $_POST['Mobile'] . "')"; $msg = _('The new supplier contact has been added to the database'); } Modified: trunk/SupplierCredit.php =================================================================== --- trunk/SupplierCredit.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SupplierCredit.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -723,7 +723,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $EnteredGLCode->GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . " " . $EnteredGLCode->Narrative) . "', + '" . $_SESSION['SuppTrans']->SupplierID . " " . $EnteredGLCode->Narrative . "', '" . -$EnteredGLCode->Amount/$_SESSION['SuppTrans']->ExRate ."', '' )"; @@ -753,7 +753,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment credit against') . ' ' . $ShiptChg->ShiptRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment credit against') . ' ' . $ShiptChg->ShiptRef . "', '" . -$ShiptChg->Amount/$_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') . ' ' . $ShiptChg->ShiptRef . ' ' . _('could not be added because'); @@ -779,7 +779,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '". $AssetAddition->CostAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Credit') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Credit') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description . "', '" . -$AssetAddition->Amount/ $_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the asset addition could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); @@ -812,7 +812,7 @@ '" . $SQLCreditNoteDate. "', '" . $PeriodNo . "', '". $WIPAccount . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Contract charge against') . ' ' . $Contract->ContractRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Contract charge against') . ' ' . $Contract->ContractRef . "', '" . (-$Contract->Amount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the contract') . ' ' . $Contract->ContractRef . ' ' . _('could not be added because'); @@ -846,7 +846,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . _('std cost of') . ' ' . $EnteredGRN->StdCostUnit) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . _('std cost of') . ' ' . $EnteredGRN->StdCostUnit . "', '" . (-$EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -915,7 +915,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['purchpricevaract'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo .' - ' . $EnteredGRN->ItemCode . ' x ' . ($EnteredGRN->This_QuantityInv-$TotalQuantityOnHand) . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) ."', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo .' - ' . $EnteredGRN->ItemCode . ' x ' . ($EnteredGRN->This_QuantityInv-$TotalQuantityOnHand) . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) ."', '" . (-$WriteOffToVariances) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -938,9 +938,9 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['stockact'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . ' - ' . $EnteredGRN->ItemCode . ' x ' . $TotalQuantityOnHand . ' x ' . - locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-($PurchPriceVar - $WriteOffToVariances)) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -988,7 +988,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['purchpricevaract'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-$PurchPriceVar) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -1027,8 +1027,8 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemDescription . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var') . - ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemDescription . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var') . + ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-$PurchPriceVar) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -1053,7 +1053,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') .' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . $_SESSION['SuppTrans']->CurrCode .' ' . $EnteredGRN->ChgPrice . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') .' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . $_SESSION['SuppTrans']->CurrCode .' ' . $EnteredGRN->ChgPrice . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', '" . (-$EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv / $_SESSION['SuppTrans']->ExRate) . "' )"; @@ -1086,7 +1086,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $Tax->TaxGLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . $Tax->TaxOvAmount . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . $Tax->TaxOvAmount . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', '" . (-$Tax->TaxOvAmount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the tax could not be added because'); @@ -1110,7 +1110,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->CreditorsAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit Note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . locale_number_format($_SESSION['SuppTrans']->OvAmount + $_SESSION['SuppTrans']->OvGST,$_SESSION['SuppTrans']->CurrDecimalPlaces) . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit Note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . locale_number_format($_SESSION['SuppTrans']->OvAmount + $_SESSION['SuppTrans']->OvGST,$_SESSION['SuppTrans']... [truncated message content] |
From: <dai...@us...> - 2011-11-27 09:16:44
|
Revision: 4757 http://web-erp.svn.sourceforge.net/web-erp/?rev=4757&view=rev Author: daintree Date: 2011-11-27 09:16:35 +0000 (Sun, 27 Nov 2011) Log Message: ----------- remove DB_escape_string() calls Modified Paths: -------------- trunk/ConfirmDispatch_Invoice.php trunk/CounterSales.php trunk/Credit_Invoice.php trunk/DeliveryDetails.php trunk/GLJournal.php trunk/GLTags.php trunk/Locations.php trunk/MRPDemandTypes.php trunk/PcAuthorizeExpenses.php trunk/PcClaimExpensesFromTab.php trunk/PcExpenses.php trunk/SalesPeople.php trunk/SelectCreditItems.php trunk/Shippers.php trunk/SpecialOrder.php trunk/StockAdjustments.php trunk/StockLocTransferReceive.php trunk/StockTransfers.php trunk/Stocks.php trunk/SupplierContacts.php trunk/SupplierCredit.php trunk/Suppliers.php trunk/TaxAuthorities.php trunk/WOSerialNos.php trunk/WWW_Access.php trunk/WWW_Users.php trunk/WorkCentres.php trunk/WorkOrderEntry.php trunk/WorkOrderIssue.php trunk/WorkOrderReceive.php trunk/doc/Change.log Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/ConfirmDispatch_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1080,7 +1080,7 @@ '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', '" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "', - '" . DB_escape_string($OrderLine->Narrative) . "' )"; + '" . $OrderLine->Narrative . "' )"; } else { // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil if (empty($OrderLine->StandardCost)) { @@ -1113,7 +1113,7 @@ '" . -$OrderLine->QtyDispatched . "', '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', - '" . DB_escape_string($OrderLine->Narrative) . "')"; + '" . $OrderLine->Narrative . "')"; } @@ -1153,7 +1153,7 @@ $SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . " WHERE stockid='" . $OrderLine->StockID . "' AND loccode='" . $_SESSION['Items'.$identifier]->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -1167,7 +1167,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $OrderLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/CounterSales.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1031,12 +1031,12 @@ '" . $OrderNo . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', - '" . Date("Y-m-d H:i") . "', + '". $_SESSION['Items'.$identifier]->CustRef ."', + '". $_SESSION['Items'.$identifier]->Comments ."', + '" . Date('Y-m-d H:i') . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', '" . $_SESSION['Items'.$identifier]->ShipVia . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', + '". $_SESSION['Items'.$identifier]->DeliverTo . "', '" . _('Counter Sale') . "', '" . $_SESSION['Items'.$identifier]->PhoneNo . "', '" . $_SESSION['Items'.$identifier]->Email . "', @@ -1071,7 +1071,7 @@ '". $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . floatval($StockItem->DiscountPercent) . "', - '" . DB_escape_string($StockItem->Narrative) . "', + '" . $StockItem->Narrative . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "', '" . $StockItem->Quantity . "', @@ -1279,13 +1279,13 @@ '" . $DefaultDispatchDate . "', '" . date('Y-m-d H-i-s') . "', '" . $PeriodNo . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->CustRef) . "', + '" . $_SESSION['Items'.$identifier]->CustRef . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', '" . $OrderNo . "', '" . $_SESSION['Items'.$identifier]->total . "', '" . filter_number_format($_POST['TaxTotal']) . "', '" . $ExRate . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->Comments) . "', + '" . $_SESSION['Items'.$identifier]->Comments . "', '" . $_SESSION['Items'.$identifier]->ShipVia . "', '" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "')"; @@ -1472,7 +1472,7 @@ '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', '" . ($QtyOnHandPrior - $OrderLine->Quantity) . "', - '" . DB_escape_string($OrderLine->Narrative) . "' )"; + '" . $OrderLine->Narrative . "' )"; } else { // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil if (empty($OrderLine->StandardCost)) { @@ -1505,7 +1505,7 @@ '" . -$OrderLine->Quantity . "', '" . $OrderLine->DiscountPercent . "', '" . $OrderLine->StandardCost . "', - '" . DB_escape_string($OrderLine->Narrative) . "')"; + '" . $OrderLine->Narrative . "')"; } $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Credit_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -572,7 +572,7 @@ '" . -$TaxTotal . "', '" . -$_SESSION['CreditItems']->FreightCost . "', '" . $_SESSION['CurrencyRate'] . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . -$Allocate_amount . "', '" . $Settled . "')"; @@ -836,7 +836,7 @@ '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', '" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; } else { $SQL = "INSERT INTO stockmoves (stockid, @@ -866,7 +866,7 @@ '" . $CreditLine->QtyDispatched . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; } $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); @@ -882,7 +882,7 @@ $SQL = "SELECT quantity from stockserialitems WHERE stockid='" . $CreditLine->StockID . "' AND loccode='" . $_SESSION['CreditItems']->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be selected because'); $DbgMsg = _('The following SQL to select the serial stock item record was used'); @@ -896,7 +896,7 @@ VALUES ('" . $CreditLine->StockID . "', '" . $_SESSION['CreditItems']->Location . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '". $Item->BundleQty ."')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); @@ -908,7 +908,7 @@ SET quantity= quantity + " . $Item->BundleQty . " WHERE stockid='" . $CreditLine->StockID . "' AND loccode='" . $_SESSION['CreditItems']->Location . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true); @@ -922,7 +922,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $CreditLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); @@ -965,7 +965,7 @@ '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', '" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); $DbgMsg = _('The following SQL to insert the stock movement records was used'); @@ -1003,7 +1003,7 @@ '" . $CreditLine->StandardCost . "', 0, '" . $QtyOnHandPrior . "', - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); $DbgMsg = _('The following SQL to insert the stock movement records was used'); @@ -1042,7 +1042,7 @@ '" . $CreditLine->StandardCost . "', '" . $QtyOnHandPrior . "', 1, - '" . DB_escape_string($CreditLine->Narrative) . "')"; + '" . $CreditLine->Narrative . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because'); Modified: trunk/DeliveryDetails.php =================================================================== --- trunk/DeliveryDetails.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/DeliveryDetails.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -354,21 +354,21 @@ '". $OrderNo . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', - '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', + '". $_SESSION['Items'.$identifier]->CustRef ."', + '". $_SESSION['Items'.$identifier]->Comments ."', '" . Date('Y-m-d H:i') . "', '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', - '" . DB_escape_string($_POST['ShipVia']) ."', - '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "', - '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "', + '" . $_POST['ShipVia'] ."', + '". $_SESSION['Items'.$identifier]->DeliverTo . "', + '" . $_SESSION['Items'.$identifier]->BuyerName . "', + '" . $_SESSION['Items'.$identifier]->DelAdd1 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd2 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd3 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd4 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd5 . "', + '" . $_SESSION['Items'.$identifier]->DelAdd6 . "', + '" . $_SESSION['Items'.$identifier]->PhoneNo . "', + '" . $_SESSION['Items'.$identifier]->Email . "', '" . $_SESSION['Items'.$identifier]->FreightCost ."', '" . $_SESSION['Items'.$identifier]->Location ."', '" . $DelDate . "', @@ -403,7 +403,7 @@ '" . $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . floatval($StockItem->DiscountPercent) . "', - '" . DB_escape_string($StockItem->Narrative) . "', + '" . $StockItem->Narrative . "', '" . $StockItem->POLine . "', '" . FormatDateForSQL($StockItem->ItemDue) . "' )"; @@ -712,23 +712,23 @@ $HeaderSQL = "UPDATE salesorders SET debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "', branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "', - customerref = '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."', - comments = '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."', + customerref = '". $_SESSION['Items'.$identifier]->CustRef ."', + comments = '". $_SESSION['Items'.$identifier]->Comments ."', ordertype = '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "', shipvia = '" . $_POST['ShipVia'] . "', - deliverydate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->DeliveryDate)) . "', - quotedate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->QuoteDate)) . "', - confirmeddate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->ConfirmedDate)) . "', - deliverto = '" . DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "', - buyername = '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "', - deladd1 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "', - deladd2 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "', - deladd3 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "', - deladd4 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "', - deladd5 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "', - deladd6 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "', - contactphone = '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "', - contactemail = '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "', + deliverydate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->DeliveryDate) . "', + quotedate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->QuoteDate) . "', + confirmeddate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->ConfirmedDate) . "', + deliverto = '" . $_SESSION['Items'.$identifier]->DeliverTo . "', + buyername = '" . $_SESSION['Items'.$identifier]->BuyerName . "', + deladd1 = '" . $_SESSION['Items'.$identifier]->DelAdd1 . "', + deladd2 = '" . $_SESSION['Items'.$identifier]->DelAdd2 . "', + deladd3 = '" . $_SESSION['Items'.$identifier]->DelAdd3 . "', + deladd4 = '" . $_SESSION['Items'.$identifier]->DelAdd4 . "', + deladd5 = '" . $_SESSION['Items'.$identifier]->DelAdd5 . "', + deladd6 = '" . $_SESSION['Items'.$identifier]->DelAdd6 . "', + contactphone = '" . $_SESSION['Items'.$identifier]->PhoneNo . "', + contactemail = '" . $_SESSION['Items'.$identifier]->Email . "', freightcost = '" . $_SESSION['Items'.$identifier]->FreightCost ."', fromstkloc = '" . $_SESSION['Items'.$identifier]->Location ."', printedpackingslip = '" . $_POST['ReprintPackingSlip'] . "', Modified: trunk/GLJournal.php =================================================================== --- trunk/GLJournal.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/GLJournal.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -76,7 +76,7 @@ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "', '" . $PeriodNo . "', '" . $JournalItem->GLCode . "', - '" . DB_escape_string($JournalItem->Narrative) . "', + '" . $JournalItem->Narrative . "', '" . $JournalItem->Amount . "', '" . $JournalItem->tag."' )"; @@ -98,7 +98,7 @@ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "', '" . ($PeriodNo + 1) . "', '" . $JournalItem->GLCode . "', - '" . _('Reversal') . " - " . DB_escape_string($JournalItem->Narrative) . "', + '" . _('Reversal') . " - " . $JournalItem->Narrative . "', '" . -($JournalItem->Amount) ."', '".$JournalItem->tag."' )"; @@ -111,7 +111,7 @@ $ErrMsg = _('Cannot commit the changes'); - $result= DB_Txn_Begin($db); + $result= DB_Txn_Commit($db); prnMsg(_('Journal').' ' . $TransNo . ' '._('has been successfully entered'),'success'); Modified: trunk/GLTags.php =================================================================== --- trunk/GLTags.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/GLTags.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -37,12 +37,12 @@ } if (isset($_POST['submit'])) { - $sql = "INSERT INTO tags values(NULL, '" . DB_escape_string($_POST['Description']) . "')"; + $sql = "INSERT INTO tags values(NULL, '" . $_POST['Description'] . "')"; $result= DB_query($sql,$db); } if (isset($_POST['update'])) { - $sql = "UPDATE tags SET tagdescription='".DB_escape_string($_POST['Description']). "' + $sql = "UPDATE tags SET tagdescription='" . $_POST['Description'] . "' WHERE tagref='".$_POST['reference']."'"; $result= DB_query($sql,$db); } Modified: trunk/Locations.php =================================================================== --- trunk/Locations.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Locations.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -55,17 +55,17 @@ } $sql = "UPDATE locations SET loccode='" . $_POST['LocCode'] . "', - locationname='" . DB_escape_string($_POST['LocationName']) . "', - deladd1='" . DB_escape_string($_POST['DelAdd1']) . "', - deladd2='" . DB_escape_string($_POST['DelAdd2']) . "', - deladd3='" . DB_escape_string($_POST['DelAdd3']) . "', - deladd4='" . DB_escape_string($_POST['DelAdd4']) . "', - deladd5='" . DB_escape_string($_POST['DelAdd5']) . "', - deladd6='" . DB_escape_string($_POST['DelAdd6']) . "', - tel='" . DB_escape_string($_POST['Tel']) . "', - fax='" . DB_escape_string($_POST['Fax']) . "', - email='" . DB_escape_string($_POST['Email']) . "', - contact='" . DB_escape_string($_POST['Contact']) . "', + locationname='" . $_POST['LocationName'] . "', + deladd1='" . $_POST['DelAdd1'] . "', + deladd2='" . $_POST['DelAdd2'] . "', + deladd3='" . $_POST['DelAdd3'] . "', + deladd4='" . $_POST['DelAdd4'] . "', + deladd5='" . $_POST['DelAdd5'] . "', + deladd6='" . $_POST['DelAdd6'] . "', + tel='" . $_POST['Tel'] . "', + fax='" . $_POST['Fax'] . "', + email='" . $_POST['Email'] . "', + contact='" . $_POST['Contact'] . "', taxprovinceid = '" . $_POST['TaxProvince'] . "', cashsalecustomer ='" . $_POST['CashSaleCustomer'] . "', cashsalebranch ='" . $_POST['CashSaleBranch'] . "', @@ -124,18 +124,18 @@ cashsalecustomer, cashsalebranch, managed ) - VALUES ('" . DB_escape_string($_POST['LocCode']) . "', - '" . DB_escape_string($_POST['LocationName']) . "', - '" . DB_escape_string($_POST['DelAdd1']) ."', - '" . DB_escape_string($_POST['DelAdd2']) ."', - '" . DB_escape_string($_POST['DelAdd3']) . "', - '" . DB_escape_string($_POST['DelAdd4']) . "', - '" . DB_escape_string($_POST['DelAdd5']) . "', - '" . DB_escape_string($_POST['DelAdd6']) . "', - '" . DB_escape_string($_POST['Tel']) . "', - '" . DB_escape_string($_POST['Fax']) . "', - '" . DB_escape_string($_POST['Email']) . "', - '" . DB_escape_string($_POST['Contact']) . "', + VALUES ('" . $_POST['LocCode'] . "', + '" . $_POST['LocationName'] . "', + '" . $_POST['DelAdd1'] ."', + '" . $_POST['DelAdd2'] ."', + '" . $_POST['DelAdd3'] . "', + '" . $_POST['DelAdd4'] . "', + '" . $_POST['DelAdd5'] . "', + '" . $_POST['DelAdd6'] . "', + '" . $_POST['Tel'] . "', + '" . $_POST['Fax'] . "', + '" . $_POST['Email'] . "', + '" . $_POST['Contact'] . "', '" . $_POST['TaxProvince'] . "', '" . $_POST['CashSaleCustomer'] . "', '" . $_POST['CashSaleBranch'] . "', Modified: trunk/MRPDemandTypes.php =================================================================== --- trunk/MRPDemandTypes.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/MRPDemandTypes.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -58,7 +58,7 @@ $sql = "INSERT INTO mrpdemandtypes (mrpdemandtype, description) VALUES ('" . trim(mb_strtoupper($_POST['MRPDemandType'])) . "', - '" . DB_escape_string($_POST['Description']) . "' + '" . $_POST['Description'] . "' )"; $msg = _('The new demand type has been added to the database'); } Modified: trunk/PcAuthorizeExpenses.php =================================================================== --- trunk/PcAuthorizeExpenses.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcAuthorizeExpenses.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -135,7 +135,7 @@ $typeno = GetNextTransNo($type,$db); //build narrative - $narrative= _('PettyCash') . ' - '.$myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . $myrow['notes'] . ' - ' . $myrow['receipt']; + $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt']; //insert to gltrans DB_Txn_Begin($db); @@ -158,7 +158,7 @@ '".$myrow['date']."', '".$PeriodNo."', '".$AccountFrom."', - '". DB_escape_string($narrative) ."', + '". $Narrative ."', '".-$Amount."', 0, '', @@ -185,7 +185,7 @@ '".$myrow['date']."', '".$PeriodNo."', '".$AccountTo."', - '" . DB_escape_string($narrative) . "', + '" . $Narrative . "', '".$Amount."', 0, '', @@ -209,7 +209,7 @@ VALUES ('". $ReceiptTransNo . "', 1, '" . $AccountFrom . "', - '" . DB_escape_string($narrative) . "', + '" . $Narrative . "', 1, '" . $myrow['rate'] . "', '" . $myrow['date'] . "', Modified: trunk/PcClaimExpensesFromTab.php =================================================================== --- trunk/PcClaimExpensesFromTab.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcClaimExpensesFromTab.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -72,8 +72,8 @@ SET date = '".FormatDateForSQL($_POST['Date'])."', codeexpense = '" . $_POST['SelectedExpense'] . "', amount = '" .-filter_number_format($_POST['amount']) . "', - notes = '" . DB_escape_string($_POST['Notes']) . "', - receipt = '" . DB_escape_string($_POST['Receipt']) . "' + notes = '" . $_POST['Notes'] . "', + receipt = '" . $_POST['Receipt'] . "' WHERE counterindex = '".$SelectedIndex."'"; $msg = _('The Expense Claim on Tab') . ' ' . $SelectedTabs . ' ' . _('has been updated'); @@ -98,8 +98,8 @@ '" . -filter_number_format($_POST['amount']) . "', '', '', - '" . DB_escape_string($_POST['Notes']) . "', - '" . DB_escape_string($_POST['Receipt']) . "' + '" . $_POST['Notes'] . "', + '" . $_POST['Receipt'] . "' )"; $msg = _('The Expense Claim on Tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created'); Modified: trunk/PcExpenses.php =================================================================== --- trunk/PcExpenses.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/PcExpenses.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -87,7 +87,7 @@ if (isset($SelectedExpense) AND $InputError !=1) { $sql = "UPDATE pcexpenses - SET description = '" . DB_escape_string($_POST['Description']) . "', + SET description = '" . $_POST['Description'] . "', glaccount = '" . $_POST['GLAccount'] . "', tag = '" . $_POST['Tag'] . "' WHERE codeexpense = '" . $SelectedExpense . "'"; @@ -117,7 +117,7 @@ glaccount, tag) VALUES ('" . $_POST['CodeExpense'] . "', - '" . DB_escape_string($_POST['Description']) . "', + '" . $_POST['Description'] . "', '" . $_POST['GLAccount'] . "', '" . $_POST['Tag'] . "')"; Modified: trunk/SalesPeople.php =================================================================== --- trunk/SalesPeople.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SalesPeople.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -85,10 +85,10 @@ /*SelectedSalesPerson could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/ - $sql = "UPDATE salesman SET salesmanname='" . DB_escape_string($_POST['SalesmanName']) . "', + $sql = "UPDATE salesman SET salesmanname='" . $_POST['SalesmanName'] . "', commissionrate1='" . filter_number_format($_POST['CommissionRate1']) . "', - smantel='" . DB_escape_string($_POST['SManTel']) . "', - smanfax='" . DB_escape_string($_POST['SManFax']) . "', + smantel='" . $_POST['SManTel'] . "', + smanfax='" . $_POST['SManFax'] . "', breakpoint='" . filter_number_format($_POST['Breakpoint']) . "', commissionrate2='" . filter_number_format($_POST['CommissionRate2']) . "', current='" . $_POST['Current'] . "' @@ -107,13 +107,13 @@ smantel, smanfax, current) - VALUES ('" . DB_escape_string($_POST['SalesmanCode']) . "', - '" . DB_escape_string($_POST['SalesmanName']) . "', + VALUES ('" . $_POST['SalesmanCode'] . "', + '" . $_POST['SalesmanName'] . "', '" . filter_number_format($_POST['CommissionRate1']) . "', '" . filter_number_format($_POST['CommissionRate2']) . "', '" . filter_number_format($_POST['Breakpoint']) . "', - '" . DB_escape_string($_POST['SManTel']) . "', - '" . DB_escape_string($_POST['SManFax']) . "', + '" . $_POST['SManTel'] . "', + '" . $_POST['SManFax'] . "', '" . $_POST['Current'] . "' )"; @@ -280,7 +280,7 @@ $_POST['SManTel'] = $myrow['smantel']; $_POST['SManFax'] = $myrow['smanfax']; $_POST['CommissionRate1'] = locale_number_format($myrow['commissionrate1'],'Variable'); - $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],'Variable'); + $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],$_SESSION['CompanyRecord']['decimalplaces']); $_POST['CommissionRate2'] = locale_number_format($myrow['commissionrate2'],'Variable'); $_POST['Current'] = $myrow['current']; @@ -290,14 +290,15 @@ echo '<table class="selection"> <tr> <td>' . _('Salesperson code') . ':</td> - <td>' . $_POST['SalesmanCode'] . '</td></tr>'; + <td>' . $_POST['SalesmanCode'] . '</td> + </tr>'; } else { //end of if $SelectedSalesPerson only do the else when a new record is being entered echo '<table class="selection"> <tr> <td>' . _('Salesperson code') . ':</td> - <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size=3 maxlength=3></td> + <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size="3" maxlength="3" /></td> </tr>'; } if (!isset($_POST['SalesmanName'])){ @@ -324,27 +325,27 @@ echo '<tr> <td>' . _('Salesperson Name') . ':</td> - <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 value="' . $_POST['SalesmanName'] . '"></td> + <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size="30" maxlength="30" value="' . $_POST['SalesmanName'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Telephone No') . ':</td> - <td><input type="text" name="SManTel" size=20 maxlength=20 value="' . $_POST['SManTel'] . '"></td> + <td><input type="text" name="SManTel" size="20" maxlength="20" value="' . $_POST['SManTel'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Facsimile No') . ':</td> - <td><input type="text" name="SManFax" size=20 maxlength=20 value="' . $_POST['SManFax'] . '"></td> + <td><input type="text" name="SManFax" size="20" maxlength="20" value="' . $_POST['SManFax'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Commission Rate 1') . ':</td> - <td><input type="text" class="number" name="CommissionRate1" size="5" maxlength="5" value="' . $_POST['CommissionRate1'] . '"></td> + <td><input type="text" class="number" name="CommissionRate1" size="5" maxlength="5" value="' . $_POST['CommissionRate1'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Breakpoint') . ':</td> - <td><input type="text" class="number" name="Breakpoint" size="6" maxlength="6" value="' . $_POST['Breakpoint'] . '"></td> + <td><input type="text" class="number" name="Breakpoint" size="6" maxlength="6" value="' . $_POST['Breakpoint'] . '" /></td> </tr>'; echo '<tr> <td>' . _('Commission Rate 2') . ':</td> - <td><input type="text" class="number" name="CommissionRate2" size="5" maxlength="5" value="' . $_POST['CommissionRate2']. '"></td> + <td><input type="text" class="number" name="CommissionRate2" size="5" maxlength="5" value="' . $_POST['CommissionRate2']. '" /></td> </tr>'; echo '<tr> Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SelectCreditItems.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1120,7 +1120,7 @@ '" . -$TaxTotal . "', '" . -$_SESSION['CreditItems'.$identifier]->FreightCost . "', '" . $_SESSION['CurrencyRate'] . "', - '" . DB_escape_string($_POST['CreditText']) . "' + '" . $_POST['CreditText'] . "' )"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The customer credit note transaction could not be added to the database because'); @@ -1200,7 +1200,7 @@ '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', '" . $PeriodNo . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', @@ -1243,7 +1243,7 @@ '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . ($QtyOnHandPrior + $CreditLine->Quantity) . "', '" . $CreditLine->Narrative . "' )"; @@ -1276,7 +1276,7 @@ '" . $CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', '" . $CreditLine->Narrative . "' )"; } @@ -1513,7 +1513,7 @@ '" . -$CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', 0, '" . $QtyOnHandPrior . "', '" . $CreditLine->Narrative . "' @@ -1548,7 +1548,7 @@ '" . -$CreditLine->Quantity . "', '" . $CreditLine->DiscountPercent . "', '" . $CreditLine->StandardCost . "', - '" . DB_escape_string($_POST['CreditText']) . "', + '" . $_POST['CreditText'] . "', 0)"; } Modified: trunk/Shippers.php =================================================================== --- trunk/Shippers.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Shippers.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -1,8 +1,6 @@ <?php /* $Id$*/ -//$PageSecurity = 15; - include('includes/session.inc'); $title = _('Shipping Company Maintenance'); include('includes/header.inc'); @@ -48,13 +46,14 @@ would not run in this case cos submit is false of course see the delete code below*/ - $sql = "UPDATE shippers SET shippername='" . DB_escape_string($_POST['ShipperName']) . "' WHERE shipper_id = '".$SelectedShipper."'"; + $sql = "UPDATE shippers SET shippername='" . $_POST['ShipperName'] . "' + WHERE shipper_id = '".$SelectedShipper."'"; $msg = _('The shipper record has been updated'); } elseif ($InputError !=1) { /*SelectedShipper is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Shipper form */ - $sql = "INSERT INTO shippers (shippername) VALUES ('" . DB_escape_string($_POST['ShipperName']) . "')"; + $sql = "INSERT INTO shippers (shippername) VALUES ('" . $_POST['ShipperName'] . "')"; $msg = _('The shipper record has been added'); } Modified: trunk/SpecialOrder.php =================================================================== --- trunk/SpecialOrder.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -359,11 +359,11 @@ revised, deliverydate) VALUES ('" . $_SESSION['SPL']->SupplierID . "', - '" . DB_escape_string($_SESSION['SPL']->Comments) . "', + '" . $_SESSION['SPL']->Comments . "', '" . Date('Y-m-d') . "', '" . $_SESSION['SPL']->SuppCurrExRate . "', - '" . DB_escape_string($_SESSION['SPL']->Initiator) . "', - '" . DB_escape_string($_SESSION['SPL']->QuotationRef) . "', + '" . $_SESSION['SPL']->Initiator . "', + '" . $_SESSION['SPL']->QuotationRef . "', '" . $_SESSION['SPL']->StkLocation . "', '" . DB_escape_string($StkLocAddress['deladd1']) . "', '" . DB_escape_string($StkLocAddress['deladd2']) . "', @@ -373,7 +373,7 @@ '" . DB_escape_string($StkLocAddress['deladd6']) . "', '" . DB_escape_string($StkLocAddress['contact']) . "', '" . $_SESSION['SPL']->Status . "', - '" . DB_escape_string($StatusComment) . "', + '" . $StatusComment . "', '" . $_SESSION['SPL']->AllowPrintPO . "', '" . Date('Y-m-d') . "', '" . Date('Y-m-d') . "')"; @@ -417,10 +417,10 @@ description, longdescription, materialcost) - VALUES ('" . DB_escape_string($PartCode) . "', + VALUES ('" . $PartCode . "', '" . $SPLLine->StkCat . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', + '" . $SPLLine->ItemDescription . "', + '" . $SPLLine->ItemDescription . "', '" . $SPLLine->Cost . "')"; @@ -430,7 +430,7 @@ $result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true); $sql = "INSERT INTO locstock (loccode, stockid) - SELECT loccode,'" . DB_escape_string($PartCode) . "' FROM locations"; + SELECT loccode,'" . $PartCode . "' FROM locations"; $ErrMsg = _('The item stock locations for the special order line') . " " . $SPLLine->LineNo . " " ._('could not be created because'); $DbgMsg = _('The SQL statement used to insert the location stock records and failed was'); $result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true); @@ -455,9 +455,9 @@ quantityord) VALUES ('"; $sql = $sql . $_SESSION['SPL']->PurchOrderNo . "', - '" . DB_escape_string($PartCode) . "', + '" . $PartCode . "', '" . $OrderDate . "', - '" . DB_escape_string($SPLLine->ItemDescription) . "', + '" . $SPLLine->ItemDescription . "', '" . $GLCode . "', '" . $SPLLine->Cost . "', '" . $SPLLine->Quantity . "')"; @@ -517,7 +517,7 @@ VALUES ('" . $OrderNo."', '" . $_SESSION['SPL']->CustomerID . "', '" . $_SESSION['SPL']->BranchCode . "', - '" . DB_escape_string($_SESSION['SPL']->CustRef) ."', + '" . $_SESSION['SPL']->CustRef ."', '" . Date('Y-m-d') . "', '" . $BranchDetails['salestype'] . "', '" . $BranchDetails['defaultshipvia'] ."', @@ -548,7 +548,7 @@ foreach ($_SESSION['SPL']->LineItems as $StockItem) { $LineItemsSQL = $StartOf_LineItemsSQL . ", - '" . DB_escape_string($StockItem->PartCode) . "', + '" . $StockItem->PartCode . "', '". $StockItem->Price . "', '" . $StockItem->Quantity . "', '" . $StockItem->LineNo . "')"; Modified: trunk/StockAdjustments.php =================================================================== --- trunk/StockAdjustments.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockAdjustments.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -168,7 +168,7 @@ '" . $_SESSION['Adjustment']->StockLocation . "', '" . $SQLAdjustmentDate . "', '" . $PeriodNo . "', - '" . DB_escape_string($_SESSION['Adjustment']->Narrative) ."', + '" . $_SESSION['Adjustment']->Narrative ."', '" . $_SESSION['Adjustment']->Quantity . "', '" . ($QtyOnHandPrior + $_SESSION['Adjustment']->Quantity) . "' )"; Modified: trunk/StockLocTransferReceive.php =================================================================== --- trunk/StockLocTransferReceive.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockLocTransferReceive.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -119,7 +119,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $Result = DB_query($SQL,$db,'<br />' . _('Could not determine if the serial item exists') ); $SerialItemExistsRow = DB_fetch_row($Result); @@ -131,7 +131,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -144,7 +144,7 @@ quantity) VALUES ('" . $TrfLine->StockID . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item for the stock being transferred out of the existing location could not be inserted because'); @@ -163,7 +163,7 @@ ) VALUES ( '" . $StkMoveNo . "', '" . $TrfLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . -$Item->BundleQty . "' )"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); @@ -232,7 +232,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $Result = DB_query($SQL,$db,'<br />'. _('Could not determine if the serial item exists') ); $SerialItemExistsRow = DB_fetch_row($Result); @@ -245,7 +245,7 @@ WHERE stockid='" . $TrfLine->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated for the quantity coming in because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -258,7 +258,7 @@ quantity) VALUES ('" . $TrfLine->StockID . "', '" . $_SESSION['Transfer']->StockLocationTo . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record for the stock coming in could not be added because'); @@ -276,7 +276,7 @@ moveqty) VALUES (" . $StkMoveNo . ", '" . $TrfLine->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); Modified: trunk/StockTransfers.php =================================================================== --- trunk/StockTransfers.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/StockTransfers.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -259,7 +259,7 @@ expirationdate='" . FormatDateForSQL($Item->ExpiryDate) . "' WHERE stockid='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationFrom . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -273,7 +273,7 @@ quantity) VALUES ('" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . FormatDateForSQL($Item->ExpiryDate) . "', '" . -$Item->BundleQty . "')"; @@ -293,7 +293,7 @@ VALUES ( '" . $StkMoveNo . "', '" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "' )"; @@ -372,7 +372,7 @@ expirationdate='" . FormatDateForSQL($Item->ExpiryDate) . "' WHERE stockid='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "' AND loccode='" . $_SESSION['Transfer']->StockLocationTo . "' - AND serialno='" . DB_escape_string($Item->BundleRef) . "'"; + AND serialno='" . $Item->BundleRef . "'"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because'); $DbgMsg = _('The following SQL to update the serial stock item record was used'); @@ -386,7 +386,7 @@ quantity) VALUES ('" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', '" . $_SESSION['Transfer']->StockLocationTo . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . FormatDateForSQL($Item->ExpiryDate) . "', '" . $Item->BundleQty . "')"; @@ -404,7 +404,7 @@ moveqty) VALUES ('" . $StkMoveNo . "', '" . $_SESSION['Transfer']->TransferItem[0]->StockID . "', - '" . DB_escape_string($Item->BundleRef) . "', + '" . $Item->BundleRef . "', '" . $Item->BundleQty . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because'); $DbgMsg = _('The following SQL to insert the serial stock movement records was used'); Modified: trunk/Stocks.php =================================================================== --- trunk/Stocks.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/Stocks.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -390,13 +390,13 @@ if ($_POST['PropNumeric' .$i]==1){ $_POST['PropValue' . $i]=filter_number_format($_POST['PropValue' . $i]); } else { - $_POST['PropValue' . $i]=DB_escape_string($_POST['PropValue' . $i]); + $_POST['PropValue' . $i]=$_POST['PropValue' . $i]; } $result = DB_query("INSERT INTO stockitemproperties (stockid, stkcatpropid, value) VALUES ('" . $StockID . "', - '" . DB_escape_string($_POST['PropID' . $i]) . "', + '" . $_POST['PropID' . $i] . "', '" . $_POST['PropValue' . $i] . "')", $db,$ErrMsg,$DbgMsg,true); } //end of loop around properties defined for the category Modified: trunk/SupplierContacts.php =================================================================== --- trunk/SupplierContacts.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SupplierContacts.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -59,11 +59,11 @@ /*SelectedContact could also exist if submit had not been clicked this code would not run in this case 'cos submit is false of course see the delete code below*/ - $sql = "UPDATE suppliercontacts SET position='" . DB_escape_string($_POST['Position']) . "', - tel='" . DB_escape_string($_POST['Tel']) . "', - fax='" . DB_escape_string($_POST['Fax']) . "', - email='" . DB_escape_string($_POST['Email']) . "', - mobile = '". DB_escape_string($_POST['Mobile']) . "' + $sql = "UPDATE suppliercontacts SET position='" . $_POST['Position'] . "', + tel='" . $_POST['Tel'] . "', + fax='" . $_POST['Fax'] . "', + email='" . $_POST['Email'] . "', + mobile = '". $_POST['Mobile'] . "' WHERE contact='".$SelectedContact."' AND supplierid='".$SupplierID."'"; @@ -81,12 +81,12 @@ email, mobile) VALUES ('" . $SupplierID . "', - '" . DB_escape_string($_POST['Contact']) . "', - '" . DB_escape_string($_POST['Position']) . "', - '" . DB_escape_string($_POST['Tel']) . "', - '" . DB_escape_string($_POST['Fax']) . "', - '" . DB_escape_string($_POST['Email']) . "', - '" . DB_escape_string($_POST['Mobile']) . "')"; + '" . $_POST['Contact'] . "', + '" . $_POST['Position'] . "', + '" . $_POST['Tel'] . "', + '" . $_POST['Fax'] . "', + '" . $_POST['Email'] . "', + '" . $_POST['Mobile'] . "')"; $msg = _('The new supplier contact has been added to the database'); } Modified: trunk/SupplierCredit.php =================================================================== --- trunk/SupplierCredit.php 2011-11-27 02:36:47 UTC (rev 4756) +++ trunk/SupplierCredit.php 2011-11-27 09:16:35 UTC (rev 4757) @@ -723,7 +723,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $EnteredGLCode->GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . " " . $EnteredGLCode->Narrative) . "', + '" . $_SESSION['SuppTrans']->SupplierID . " " . $EnteredGLCode->Narrative . "', '" . -$EnteredGLCode->Amount/$_SESSION['SuppTrans']->ExRate ."', '' )"; @@ -753,7 +753,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment credit against') . ' ' . $ShiptChg->ShiptRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment credit against') . ' ' . $ShiptChg->ShiptRef . "', '" . -$ShiptChg->Amount/$_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') . ' ' . $ShiptChg->ShiptRef . ' ' . _('could not be added because'); @@ -779,7 +779,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '". $AssetAddition->CostAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Credit') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Credit') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description . "', '" . -$AssetAddition->Amount/ $_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the asset addition could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); @@ -812,7 +812,7 @@ '" . $SQLCreditNoteDate. "', '" . $PeriodNo . "', '". $WIPAccount . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Contract charge against') . ' ' . $Contract->ContractRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Contract charge against') . ' ' . $Contract->ContractRef . "', '" . (-$Contract->Amount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the contract') . ' ' . $Contract->ContractRef . ' ' . _('could not be added because'); @@ -846,7 +846,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . _('std cost of') . ' ' . $EnteredGRN->StdCostUnit) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . _('std cost of') . ' ' . $EnteredGRN->StdCostUnit . "', '" . (-$EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -915,7 +915,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['purchpricevaract'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo .' - ' . $EnteredGRN->ItemCode . ' x ' . ($EnteredGRN->This_QuantityInv-$TotalQuantityOnHand) . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) ."', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN Credit Note') . ' ' . $EnteredGRN->GRNNo .' - ' . $EnteredGRN->ItemCode . ' x ' . ($EnteredGRN->This_QuantityInv-$TotalQuantityOnHand) . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) ."', '" . (-$WriteOffToVariances) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -938,9 +938,9 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['stockact'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . ' - ' . $EnteredGRN->ItemCode . ' x ' . $TotalQuantityOnHand . ' x ' . - locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-($PurchPriceVar - $WriteOffToVariances)) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -988,7 +988,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $StockGLCode['purchpricevaract'] . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var of') . ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-$PurchPriceVar) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -1027,8 +1027,8 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemDescription . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var') . - ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces'])) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemDescription . ' x ' . $EnteredGRN->This_QuantityInv . ' x ' . _('price var') . + ' ' . locale_number_format(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . (-$PurchPriceVar) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -1053,7 +1053,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') .' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . $_SESSION['SuppTrans']->CurrCode .' ' . $EnteredGRN->ChgPrice . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') .' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . $_SESSION['SuppTrans']->CurrCode .' ' . $EnteredGRN->ChgPrice . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', '" . (-$EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv / $_SESSION['SuppTrans']->ExRate) . "' )"; @@ -1086,7 +1086,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $Tax->TaxGLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . $Tax->TaxOvAmount . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . $Tax->TaxOvAmount . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', '" . (-$Tax->TaxOvAmount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the tax could not be added because'); @@ -1110,7 +1110,7 @@ '" . $SQLCreditNoteDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->CreditorsAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit Note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . locale_number_format($_SESSION['SuppTrans']->OvAmount + $_SESSION['SuppTrans']->OvGST,$_SESSION['SuppTrans']->CurrDecimalPlaces) . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit Note') . ' ' . $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . locale_number_format($_SESSION['SuppTrans']->OvAmount + $_SESSION['SuppTrans']->OvGST,$_SESSION['SuppTrans']... [truncated message content] |
From: <dai...@us...> - 2011-11-27 02:36:53
|
Revision: 4756 http://web-erp.svn.sourceforge.net/web-erp/?rev=4756&view=rev Author: daintree Date: 2011-11-27 02:36:47 +0000 (Sun, 27 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755) +++ trunk/PrintCustTransPortrait.php 2011-11-27 02:36:47 UTC (rev 4756) @@ -164,7 +164,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') { $sql = $sql . " AND debtorsmaster.ediinvoices=0"; @@ -217,7 +217,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No'){ @@ -260,7 +260,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } else { /* only credit notes to be retrieved */ @@ -279,7 +279,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } // end else @@ -657,7 +657,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; } else { //its a credit note $sql = "SELECT debtortrans.trandate, @@ -697,7 +697,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; } @@ -842,7 +842,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } else { /* then its a credit note */ @@ -885,7 +885,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } @@ -1037,7 +1037,7 @@ } echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font> <br /> - <font size=1>' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td> + <font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</font></td> </tr> </table>'; @@ -1093,23 +1093,23 @@ } else { $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']); $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']); - $DisplayTax = locale_number_format(-$myrow['ovgst'],2); + $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']); $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']); } /*Print out the invoice text entered */ echo '<table class="table1"><tr> <td class="number">' . _('Sub Total') . '</td> - <td class="number" bgcolor="#EEEEEE" WIDTH="15%">' . $DisplaySubTot . '</td></tr>'; + <td class="number" bgcolor="#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>'; echo '<tr><td class="number">' . _('Freight') . '</td> <td class="number" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>'; echo '<tr><td class="number">' . _('Tax') . '</td> <td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>'; if ($InvOrCredit=='Invoice'){ echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td> - <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>'; + <td class="number" bgcolor="#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>'; } else { - echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> - <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>'; + echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td> + <td class="number" bgcolor="#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>'; } echo '</table>'; } /* end of check to see that there was an invoice record to print */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-27 02:36:53
|
Revision: 4756 http://web-erp.svn.sourceforge.net/web-erp/?rev=4756&view=rev Author: daintree Date: 2011-11-27 02:36:47 +0000 (Sun, 27 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755) +++ trunk/PrintCustTransPortrait.php 2011-11-27 02:36:47 UTC (rev 4756) @@ -164,7 +164,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') { $sql = $sql . " AND debtorsmaster.ediinvoices=0"; @@ -217,7 +217,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No'){ @@ -260,7 +260,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } else { /* only credit notes to be retrieved */ @@ -279,7 +279,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } // end else @@ -657,7 +657,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; } else { //its a credit note $sql = "SELECT debtortrans.trandate, @@ -697,7 +697,7 @@ INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 - AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; + AND debtortrans.transno='" . $FromTransNo . "'"; } @@ -842,7 +842,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } else { /* then its a credit note */ @@ -885,7 +885,7 @@ FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 - AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' + AND stockmoves.transno='" . $FromTransNo . "' AND stockmoves.show_on_inv_crds=1"; } @@ -1037,7 +1037,7 @@ } echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font> <br /> - <font size=1>' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td> + <font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</font></td> </tr> </table>'; @@ -1093,23 +1093,23 @@ } else { $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']); $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']); - $DisplayTax = locale_number_format(-$myrow['ovgst'],2); + $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']); $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']); } /*Print out the invoice text entered */ echo '<table class="table1"><tr> <td class="number">' . _('Sub Total') . '</td> - <td class="number" bgcolor="#EEEEEE" WIDTH="15%">' . $DisplaySubTot . '</td></tr>'; + <td class="number" bgcolor="#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>'; echo '<tr><td class="number">' . _('Freight') . '</td> <td class="number" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>'; echo '<tr><td class="number">' . _('Tax') . '</td> <td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>'; if ($InvOrCredit=='Invoice'){ echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td> - <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>'; + <td class="number" bgcolor="#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>'; } else { - echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> - <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>'; + echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td> + <td class="number" bgcolor="#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>'; } echo '</table>'; } /* end of check to see that there was an invoice record to print */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2011-11-26 21:46:17
|
Revision: 4755 http://web-erp.svn.sourceforge.net/web-erp/?rev=4755&view=rev Author: tim_schofield Date: 2011-11-26 21:46:11 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Correct typos in html Modified Paths: -------------- trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2011-11-26 20:51:02 UTC (rev 4754) +++ trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755) @@ -76,8 +76,8 @@ nobble the invoice reprints */ // check if the user has set a default bank account for invoices, if not leave it blank - $sql = "SELECT bankaccounts.invoice, - bankaccounts.bankaccountnumber, + $sql = "SELECT bankaccounts.invoice, + bankaccounts.bankaccountnumber, bankaccounts.bankaccountcode FROM bankaccounts WHERE bankaccounts.invoice = '1'"; @@ -146,22 +146,22 @@ debtortrans.debtorno, debtortrans.branchcode, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesorders + INNER JOIN salesorders ON debtortrans.order_ = salesorders.orderno - INNER JOIN shippers - ON debtortrans.shipvia=shippers.shipper_id - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN locations - ON salesorders.fromstkloc=locations.loccode - INNER JOIN paymentterms + INNER JOIN shippers + ON debtortrans.shipvia=shippers.shipper_id + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN locations + ON salesorders.fromstkloc=locations.loccode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -205,16 +205,16 @@ debtortrans.branchcode, paymentterms.terms, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN paymentterms + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -257,7 +257,7 @@ stockmaster.units, stockmoves.stkmoveno, stockmaster.decimalplaces - FROM stockmoves INNER JOIN stockmaster + FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' @@ -276,7 +276,7 @@ stockmaster.units, stockmoves.stkmoveno, stockmaster.decimalplaces - FROM stockmoves INNER JOIN stockmaster + FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' @@ -332,7 +332,7 @@ if ($myrow2['controlled']==1){ - $GetControlMovts = DB_query("SELECT moveqty, + $GetControlMovts = DB_query("SELECT moveqty, serialno FROM stockserialmoves WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'",$db); @@ -493,7 +493,7 @@ $FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf'; $pdf->Output($FileName,'F'); $mail = new htmlMimeMail(); - + $Attachment = $mail->getFile($FileName); $mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] ); $mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']); @@ -511,7 +511,7 @@ } else { //its not an email just print the invoice to PDF $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf'); - + } $pdf->__destruct(); } else { /*The option to print PDF was not hit */ @@ -525,14 +525,14 @@ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - + echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>'; - + echo '<table class="selection"> <tr> <td>' . _('Print Invoices or Credit Notes') . '</td> <td><select name="InvOrCredit">'; - + if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){ echo '<option selected value="Invoice">' . _('Invoices') . '</option>'; @@ -547,7 +547,7 @@ echo '<tr> <td>' . _('Print EDI Transactions') . '</td> <td><select name="PrintEDI">'; - + if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){ echo '<option selected value="No">' . _('Do not Print PDF EDI Transactions') . '</option>'; @@ -639,22 +639,22 @@ salesman.salesmanname, debtortrans.debtorno, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesorders + INNER JOIN salesorders ON debtortrans.order_ = salesorders.orderno - INNER JOIN shippers - ON debtortrans.shipvia=shippers.shipper_id - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN locations - ON salesorders.fromstkloc=locations.loccode - INNER JOIN paymentterms + INNER JOIN shippers + ON debtortrans.shipvia=shippers.shipper_id + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN locations + ON salesorders.fromstkloc=locations.loccode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -685,16 +685,16 @@ salesman.salesmanname, debtortrans.debtorno, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN paymentterms + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -763,14 +763,14 @@ </tr> <tr> <td bgcolor="#eee">'; - echo $myrow['name'] . - '<br />' . $myrow['address1'] . - '<br />' . $myrow['address2'] . - '<br />' . $myrow['address3'] . - '<br />' . $myrow['address4'] . - '<br />' . $myrow['address5'] . + echo $myrow['name'] . + '<br />' . $myrow['address1'] . + '<br />' . $myrow['address2'] . + '<br />' . $myrow['address3'] . + '<br />' . $myrow['address4'] . + '<br />' . $myrow['address5'] . '<br />' . $myrow['address6']; - + echo '</td> </tr> </table>'; @@ -789,22 +789,22 @@ <td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td> </tr>'; echo '<tr> - <td bgcolor="#eee">' .$myrow['brname'] . - '<br />' . $myrow['braddress1'] . - '<br />' . $myrow['braddress2'] . - '<br />' . $myrow['braddress3'] . - '<br />' . $myrow['braddress4'] . - '<br />' . $myrow['braddress5'] . - '<br />' . $myrow['braddress6'] . + <td bgcolor="#eee">' .$myrow['brname'] . + '<br />' . $myrow['braddress1'] . + '<br />' . $myrow['braddress2'] . + '<br />' . $myrow['braddress3'] . + '<br />' . $myrow['braddress4'] . + '<br />' . $myrow['braddress5'] . + '<br />' . $myrow['braddress6'] . '</td>'; - echo '<td bgcolor="#eee">' . $myrow['deliverto'] . - '<br />' . $myrow['deladd1'] . - '<br />' . $myrow['deladd2'] . - '<br />' . $myrow['deladd3'] . - '<br />' . $myrow['deladd4'] . - '<br />' . $myrow['deladd5'] . - '<br />' . $myrow['deladd6'] . + echo '<td bgcolor="#eee">' . $myrow['deliverto'] . + '<br />' . $myrow['deladd1'] . + '<br />' . $myrow['deladd2'] . + '<br />' . $myrow['deladd3'] . + '<br />' . $myrow['deladd4'] . + '<br />' . $myrow['deladd5'] . + '<br />' . $myrow['deladd6'] . '</td>'; echo '</tr> </table><hr>'; @@ -844,7 +844,7 @@ WHERE stockmoves.type=10 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' AND stockmoves.show_on_inv_crds=1"; - + } else { /* then its a credit note */ echo '<table width="50%"> @@ -852,13 +852,13 @@ <td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td> </tr>'; echo '<tr> - <td bgcolor="#EEEEEE">' . $myrow['brname'] . - '<br />' . $myrow['braddress1'] . - '<br />' . $myrow['braddress2'] . - '<br />' . $myrow['braddress3'] . - '<br />' . $myrow['braddress4'] . - '<br />' . $myrow['braddress5'] . - '<br />' . $myrow['braddress6'] . + <td bgcolor="#EEEEEE">' . $myrow['brname'] . + '<br />' . $myrow['braddress1'] . + '<br />' . $myrow['braddress2'] . + '<br />' . $myrow['braddress3'] . + '<br />' . $myrow['braddress4'] . + '<br />' . $myrow['braddress5'] . + '<br />' . $myrow['braddress6'] . '</td> </tr></table>'; echo '<hr> @@ -953,9 +953,9 @@ $DisplayPrice, $DisplayDiscount, $DisplayNet); - + if (mb_strlen($myrow2['narrative'])>1){ - echo $RowStarter . + echo $RowStarter . '<td></td> <td colspan=6>' . $myrow2['narrative'] . '</td> </tr>'; @@ -974,7 +974,7 @@ <tr> <td valign="top"><img src="' . $_SESSION['LogoFile'] . '"></td> <td bgcolor="#bbb"><b>'; - + if ($InvOrCredit=='Invoice') { echo '<font size="4">' . _('TAX INVOICE') . ' '; } else { @@ -997,7 +997,7 @@ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />'; echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />'; echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />'; - echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td> + echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td> </tr> </table>'; echo '<table class="table1"> @@ -1054,7 +1054,7 @@ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />'; echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />'; echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />'; - echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td> + echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td> </tr> </table>'; echo '<table class="table1"> @@ -1108,7 +1108,7 @@ echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td> <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>'; } else { - echo '<tr><td class+"number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> + echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>'; } echo '</table>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2011-11-26 21:46:17
|
Revision: 4755 http://web-erp.svn.sourceforge.net/web-erp/?rev=4755&view=rev Author: tim_schofield Date: 2011-11-26 21:46:11 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Correct typos in html Modified Paths: -------------- trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2011-11-26 20:51:02 UTC (rev 4754) +++ trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755) @@ -76,8 +76,8 @@ nobble the invoice reprints */ // check if the user has set a default bank account for invoices, if not leave it blank - $sql = "SELECT bankaccounts.invoice, - bankaccounts.bankaccountnumber, + $sql = "SELECT bankaccounts.invoice, + bankaccounts.bankaccountnumber, bankaccounts.bankaccountcode FROM bankaccounts WHERE bankaccounts.invoice = '1'"; @@ -146,22 +146,22 @@ debtortrans.debtorno, debtortrans.branchcode, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesorders + INNER JOIN salesorders ON debtortrans.order_ = salesorders.orderno - INNER JOIN shippers - ON debtortrans.shipvia=shippers.shipper_id - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN locations - ON salesorders.fromstkloc=locations.loccode - INNER JOIN paymentterms + INNER JOIN shippers + ON debtortrans.shipvia=shippers.shipper_id + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN locations + ON salesorders.fromstkloc=locations.loccode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -205,16 +205,16 @@ debtortrans.branchcode, paymentterms.terms, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN paymentterms + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -257,7 +257,7 @@ stockmaster.units, stockmoves.stkmoveno, stockmaster.decimalplaces - FROM stockmoves INNER JOIN stockmaster + FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=10 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' @@ -276,7 +276,7 @@ stockmaster.units, stockmoves.stkmoveno, stockmaster.decimalplaces - FROM stockmoves INNER JOIN stockmaster + FROM stockmoves INNER JOIN stockmaster ON stockmoves.stockid = stockmaster.stockid WHERE stockmoves.type=11 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' @@ -332,7 +332,7 @@ if ($myrow2['controlled']==1){ - $GetControlMovts = DB_query("SELECT moveqty, + $GetControlMovts = DB_query("SELECT moveqty, serialno FROM stockserialmoves WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'",$db); @@ -493,7 +493,7 @@ $FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf'; $pdf->Output($FileName,'F'); $mail = new htmlMimeMail(); - + $Attachment = $mail->getFile($FileName); $mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] ); $mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']); @@ -511,7 +511,7 @@ } else { //its not an email just print the invoice to PDF $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf'); - + } $pdf->__destruct(); } else { /*The option to print PDF was not hit */ @@ -525,14 +525,14 @@ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - + echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>'; - + echo '<table class="selection"> <tr> <td>' . _('Print Invoices or Credit Notes') . '</td> <td><select name="InvOrCredit">'; - + if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){ echo '<option selected value="Invoice">' . _('Invoices') . '</option>'; @@ -547,7 +547,7 @@ echo '<tr> <td>' . _('Print EDI Transactions') . '</td> <td><select name="PrintEDI">'; - + if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){ echo '<option selected value="No">' . _('Do not Print PDF EDI Transactions') . '</option>'; @@ -639,22 +639,22 @@ salesman.salesmanname, debtortrans.debtorno, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesorders + INNER JOIN salesorders ON debtortrans.order_ = salesorders.orderno - INNER JOIN shippers - ON debtortrans.shipvia=shippers.shipper_id - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN locations - ON salesorders.fromstkloc=locations.loccode - INNER JOIN paymentterms + INNER JOIN shippers + ON debtortrans.shipvia=shippers.shipper_id + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN locations + ON salesorders.fromstkloc=locations.loccode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=10 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -685,16 +685,16 @@ salesman.salesmanname, debtortrans.debtorno, currencies.decimalplaces - FROM debtortrans INNER JOIN debtorsmaster - ON debtortrans.debtorno=debtorsmaster.debtorno - INNER JOIN custbranch - ON debtortrans.debtorno=custbranch.debtorno + FROM debtortrans INNER JOIN debtorsmaster + ON debtortrans.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch + ON debtortrans.debtorno=custbranch.debtorno AND debtortrans.branchcode=custbranch.branchcode - INNER JOIN salesman - ON custbranch.salesman=salesman.salesmancode - INNER JOIN paymentterms + INNER JOIN salesman + ON custbranch.salesman=salesman.salesmancode + INNER JOIN paymentterms ON debtorsmaster.paymentterms=paymentterms.termsindicator - INNER JOIN currencies + INNER JOIN currencies ON debtorsmaster.currcode=currencies.currabrev WHERE debtortrans.type=11 AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'"; @@ -763,14 +763,14 @@ </tr> <tr> <td bgcolor="#eee">'; - echo $myrow['name'] . - '<br />' . $myrow['address1'] . - '<br />' . $myrow['address2'] . - '<br />' . $myrow['address3'] . - '<br />' . $myrow['address4'] . - '<br />' . $myrow['address5'] . + echo $myrow['name'] . + '<br />' . $myrow['address1'] . + '<br />' . $myrow['address2'] . + '<br />' . $myrow['address3'] . + '<br />' . $myrow['address4'] . + '<br />' . $myrow['address5'] . '<br />' . $myrow['address6']; - + echo '</td> </tr> </table>'; @@ -789,22 +789,22 @@ <td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td> </tr>'; echo '<tr> - <td bgcolor="#eee">' .$myrow['brname'] . - '<br />' . $myrow['braddress1'] . - '<br />' . $myrow['braddress2'] . - '<br />' . $myrow['braddress3'] . - '<br />' . $myrow['braddress4'] . - '<br />' . $myrow['braddress5'] . - '<br />' . $myrow['braddress6'] . + <td bgcolor="#eee">' .$myrow['brname'] . + '<br />' . $myrow['braddress1'] . + '<br />' . $myrow['braddress2'] . + '<br />' . $myrow['braddress3'] . + '<br />' . $myrow['braddress4'] . + '<br />' . $myrow['braddress5'] . + '<br />' . $myrow['braddress6'] . '</td>'; - echo '<td bgcolor="#eee">' . $myrow['deliverto'] . - '<br />' . $myrow['deladd1'] . - '<br />' . $myrow['deladd2'] . - '<br />' . $myrow['deladd3'] . - '<br />' . $myrow['deladd4'] . - '<br />' . $myrow['deladd5'] . - '<br />' . $myrow['deladd6'] . + echo '<td bgcolor="#eee">' . $myrow['deliverto'] . + '<br />' . $myrow['deladd1'] . + '<br />' . $myrow['deladd2'] . + '<br />' . $myrow['deladd3'] . + '<br />' . $myrow['deladd4'] . + '<br />' . $myrow['deladd5'] . + '<br />' . $myrow['deladd6'] . '</td>'; echo '</tr> </table><hr>'; @@ -844,7 +844,7 @@ WHERE stockmoves.type=10 AND stockmoves.transno='" . filter_number_format($FromTransNo) . "' AND stockmoves.show_on_inv_crds=1"; - + } else { /* then its a credit note */ echo '<table width="50%"> @@ -852,13 +852,13 @@ <td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td> </tr>'; echo '<tr> - <td bgcolor="#EEEEEE">' . $myrow['brname'] . - '<br />' . $myrow['braddress1'] . - '<br />' . $myrow['braddress2'] . - '<br />' . $myrow['braddress3'] . - '<br />' . $myrow['braddress4'] . - '<br />' . $myrow['braddress5'] . - '<br />' . $myrow['braddress6'] . + <td bgcolor="#EEEEEE">' . $myrow['brname'] . + '<br />' . $myrow['braddress1'] . + '<br />' . $myrow['braddress2'] . + '<br />' . $myrow['braddress3'] . + '<br />' . $myrow['braddress4'] . + '<br />' . $myrow['braddress5'] . + '<br />' . $myrow['braddress6'] . '</td> </tr></table>'; echo '<hr> @@ -953,9 +953,9 @@ $DisplayPrice, $DisplayDiscount, $DisplayNet); - + if (mb_strlen($myrow2['narrative'])>1){ - echo $RowStarter . + echo $RowStarter . '<td></td> <td colspan=6>' . $myrow2['narrative'] . '</td> </tr>'; @@ -974,7 +974,7 @@ <tr> <td valign="top"><img src="' . $_SESSION['LogoFile'] . '"></td> <td bgcolor="#bbb"><b>'; - + if ($InvOrCredit=='Invoice') { echo '<font size="4">' . _('TAX INVOICE') . ' '; } else { @@ -997,7 +997,7 @@ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />'; echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />'; echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />'; - echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td> + echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td> </tr> </table>'; echo '<table class="table1"> @@ -1054,7 +1054,7 @@ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />'; echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />'; echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />'; - echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td> + echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td> </tr> </table>'; echo '<table class="table1"> @@ -1108,7 +1108,7 @@ echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td> <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>'; } else { - echo '<tr><td class+"number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> + echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td> <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>'; } echo '</table>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-26 20:51:08
|
Revision: 4754 http://web-erp.svn.sourceforge.net/web-erp/?rev=4754&view=rev Author: daintree Date: 2011-11-26 20:51:02 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/GLTagProfit_Loss.php trunk/doc/Change.log Modified: trunk/GLTagProfit_Loss.php =================================================================== --- trunk/GLTagProfit_Loss.php 2011-11-26 07:58:19 UTC (rev 4753) +++ trunk/GLTagProfit_Loss.php 2011-11-26 20:51:02 UTC (rev 4754) @@ -655,7 +655,7 @@ </tr>', $Sections[$Section], locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces'])); - $TotalIncome -= $SectionPrdActual; + } else { echo '<tr> <td colspan="2"></td> @@ -669,6 +669,10 @@ $Sections[$Section], locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces'])); } + if ($Section==1) { + $TotalIncome+=$SectionPrdActual; + } + if ($Section==2){ /*Cost of Sales - need sub total for Gross Profit*/ echo '<tr> <td colspan="2"></td> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-26 07:58:19 UTC (rev 4753) +++ trunk/doc/Change.log 2011-11-26 20:51:02 UTC (rev 4754) @@ -1,5 +1,11 @@ webERP Change Log +27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed +26/11/11 Phil: SupplierInvoice.php attempt to update salesanalysis cost if goods sold prior to purchase invoice being entered +26/11/11 Phil: Added missing images to aguapop theme - for customer inquiry +26/11/11 Phil: ConfirmDispatchControlledInvoice.php now uses $identifier in session variable name to ensure uniqueness +26/11/11 Phil: PcAssignCashToTab.php removed unecssary DB_escape_string() calls +26/11/11 Phil: StockCostUpdate.php fix link to StockStatus.php 23/11/11 Phil: UserSettings.php - now only checks password if != '' 22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties 22/11/11 Felix Lim: StockSerialItems.php closing quote typo. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-26 20:51:08
|
Revision: 4754 http://web-erp.svn.sourceforge.net/web-erp/?rev=4754&view=rev Author: daintree Date: 2011-11-26 20:51:02 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/GLTagProfit_Loss.php trunk/doc/Change.log Modified: trunk/GLTagProfit_Loss.php =================================================================== --- trunk/GLTagProfit_Loss.php 2011-11-26 07:58:19 UTC (rev 4753) +++ trunk/GLTagProfit_Loss.php 2011-11-26 20:51:02 UTC (rev 4754) @@ -655,7 +655,7 @@ </tr>', $Sections[$Section], locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces'])); - $TotalIncome -= $SectionPrdActual; + } else { echo '<tr> <td colspan="2"></td> @@ -669,6 +669,10 @@ $Sections[$Section], locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces'])); } + if ($Section==1) { + $TotalIncome+=$SectionPrdActual; + } + if ($Section==2){ /*Cost of Sales - need sub total for Gross Profit*/ echo '<tr> <td colspan="2"></td> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-26 07:58:19 UTC (rev 4753) +++ trunk/doc/Change.log 2011-11-26 20:51:02 UTC (rev 4754) @@ -1,5 +1,11 @@ webERP Change Log +27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed +26/11/11 Phil: SupplierInvoice.php attempt to update salesanalysis cost if goods sold prior to purchase invoice being entered +26/11/11 Phil: Added missing images to aguapop theme - for customer inquiry +26/11/11 Phil: ConfirmDispatchControlledInvoice.php now uses $identifier in session variable name to ensure uniqueness +26/11/11 Phil: PcAssignCashToTab.php removed unecssary DB_escape_string() calls +26/11/11 Phil: StockCostUpdate.php fix link to StockStatus.php 23/11/11 Phil: UserSettings.php - now only checks password if != '' 22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties 22/11/11 Felix Lim: StockSerialItems.php closing quote typo. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-26 07:58:30
|
Revision: 4753 http://web-erp.svn.sourceforge.net/web-erp/?rev=4753&view=rev Author: daintree Date: 2011-11-26 07:58:19 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/ConfirmDispatchControlled_Invoice.php trunk/ConfirmDispatch_Invoice.php trunk/PO_PDFPurchOrder.php trunk/PO_SelectOSPurchOrder.php trunk/PcAssignCashToTab.php trunk/SelectCompletedOrder.php trunk/StockCostUpdate.php trunk/SuppInvGRNs.php trunk/SupplierInvoice.php trunk/doc/README.txt trunk/includes/ConnectDB_mysqli.inc trunk/includes/SQL_CommonFunctions.inc 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_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.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/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.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/sql/mysql/weberp-demo.sql trunk/sql/mysql/weberp-new.sql Added Paths: ----------- trunk/css/aguapop/images/allocation.gif trunk/css/aguapop/images/bank.gif trunk/css/aguapop/images/credit.gif trunk/css/aguapop/images/email.gif trunk/css/aguapop/images/folders.gif trunk/css/aguapop/images/inventory.gif trunk/css/aguapop/images/maintenance.gif trunk/css/aguapop/images/preview.gif trunk/css/aguapop/images/reports.gif trunk/css/aguapop/images/transactions.gif Modified: trunk/ConfirmDispatchControlled_Invoice.php =================================================================== --- trunk/ConfirmDispatchControlled_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/ConfirmDispatchControlled_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -33,7 +33,7 @@ exit; } -if (!isset($_SESSION['Items']) OR !isset($_SESSION['ProcessingOrder'])) { +if (!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['ProcessingOrder'])) { /* This page can only be called with a sales order number to invoice */ echo '<div class="centre"> <a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Select a sales order to invoice') . '</a> @@ -46,7 +46,7 @@ /*Save some typing by referring to the line item class object in short form */ -$LineItem = &$_SESSION['Items']->LineItems[$LineNo]; +$LineItem = &$_SESSION['Items'.$identifier]->LineItems[$LineNo]; //Make sure this item is really controlled @@ -63,15 +63,15 @@ ********************************************/ echo '<div class="centre">'; -echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>'; +echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>'; -echo '<br /><font size=2><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items']->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items']->CustomerName . '</b></font></div>'; +echo '<br /><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>'; /** vars needed by InputSerialItem : **/ $StockID = $LineItem->StockID; $RecvQty = $LineItem->Quantity-$LineItem->QtyInv; $ItemMustExist = true; /*Can only invoice valid batches/serial numbered items that exist */ -$LocationOut = $_SESSION['Items']->Location; +$LocationOut = $_SESSION['Items'.$identifier]->Location; $InOutModifier=1; $ShowExisting=false; @@ -79,7 +79,7 @@ /*TotalQuantity set inside this include file from the sum of the bundles of the item selected for dispatch */ -$_SESSION['Items']->LineItems[$LineNo]->QtyDispatched = $TotalQuantity; +$_SESSION['Items'.$identifier]->LineItems[$LineNo]->QtyDispatched = $TotalQuantity; include('includes/footer.inc'); exit; Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/ConfirmDispatch_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -232,8 +232,12 @@ foreach ($Itm->SerialItems as $SerialItem) { //calculate QtyDispatched from bundle quantities $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched += $SerialItem->BundleQty; } - } else if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ])) AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){ - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces); + } else if (isset($_POST[$Itm->LineNumber . '_QtyDispatched' ])){ + if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ])) + AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){ + + $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces); + } } foreach ($Itm->Taxes as $TaxLine) { if (isset($_POST[$Itm->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])){ @@ -449,7 +453,7 @@ } } -if (isset($_POST['ChargeFreightCost']) and !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){ +if (isset($_POST['ChargeFreightCost']) AND !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){ $_POST['ChargeFreightCost'] = 0; } @@ -467,7 +471,10 @@ if (!isset($_POST['ChargeFreightCost'])) { $_POST['ChargeFreightCost']=0; } -if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1 and (!isset($_SESSION['Items'.$identifier]->FreightCost) or $_POST['ChargeFreightCost']==0)) { +if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1 + AND (!isset($_SESSION['Items'.$identifier]->FreightCost) + OR $_POST['ChargeFreightCost']==0)) { + echo '<td colspan="2" class="number">'. _('Charge Freight Cost inc Tax').'</td> <td><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="0"></td>'; $_SESSION['Items'.$identifier]->FreightCost=0; @@ -478,7 +485,7 @@ } else { echo '<td class="number"><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="' . locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>'; } - $_POST['ChargeFreightCost'] = $_SESSION['Items'.$identifier]->FreightCost; + $_POST['ChargeFreightCost'] = locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); } $FreightTaxTotal =0; //initialise tax total Modified: trunk/PO_PDFPurchOrder.php =================================================================== --- trunk/PO_PDFPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PO_PDFPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -305,7 +305,7 @@ $Success = 1; //assume the best and email goes - has to be set to 1 to allow update status if ($MakePDFThenDisplayIt){ $pdf->OutputD($_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' . date('Y-m-d') . '.pdf'); - $pdf->__destruct(); //UldisN + $pdf->__destruct(); } else { /* must be MakingPDF to email it */ $PdfFileName = $_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' .date('Y-m-d') . '.pdf'; Modified: trunk/PO_SelectOSPurchOrder.php =================================================================== --- trunk/PO_SelectOSPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PO_SelectOSPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -131,7 +131,11 @@ */ if (!isset($OrderNumber) or $OrderNumber=='' ){ - echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>'; + if (isset($SelectedSupplier)){ + echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $SelectedSupplier . '">' . _('Add Purchase Order') . '</a>'; + } else { + echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>'; + } echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'</p>'; echo '<table class=selection> <tr> Modified: trunk/PcAssignCashToTab.php =================================================================== --- trunk/PcAssignCashToTab.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PcAssignCashToTab.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -82,8 +82,8 @@ SET date = '".FormatDateForSQL($_POST['Date'])."', amount = '" . filter_number_format($_POST['Amount']) . "', authorized = '0000-00-00', - notes = '" . DB_escape_string($_POST['Notes']) . "', - receipt = '" . DB_escape_string($_POST['Receipt']) . "' + notes = '" . $_POST['Notes'] . "', + receipt = '" . $_POST['Receipt'] . "' WHERE counterindex = '" . $SelectedIndex . "'"; $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated'); @@ -106,8 +106,8 @@ '" . filter_number_format($_POST['Amount']) . "', authorized = '0000-00-00', '0', - '" . DB_escape_string($_POST['Notes']) . "', - '" . DB_escape_string($_POST['Receipt']) . "' + '" . $_POST['Notes'] . "', + '" . $_POST['Receipt'] . "' )"; $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created'); } @@ -173,8 +173,8 @@ echo '</td></tr></table>'; // close main table echo '<p> <div class="centre"> - <input type=submit name="process" value="' . _('Accept') . '" /> - <input type=submit name="Cancel" value="' . _('Cancel') . '" /> + <input type="submit" name="process" value="' . _('Accept') . '" /> + <input type="submit" name="Cancel" value="' . _('Cancel') . '" /> </div>'; echo '</form>'; } @@ -321,10 +321,10 @@ $_POST['Notes'] = $myrow['notes']; $_POST['Receipt'] = $myrow['receipt']; - echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '">'; - echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '">'; - echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '">'; - echo '<input type=hidden name="Days" value="' . $Days . '">'; + echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />'; + echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '" />'; + echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '" />'; + echo '<input type=hidden name="Days" value="' . $Days . '" />'; } /* Ricard: needs revision of this date initialization */ Modified: trunk/SelectCompletedOrder.php =================================================================== --- trunk/SelectCompletedOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SelectCompletedOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -235,68 +235,35 @@ //figure out the SQL required from the inputs available if (isset($OrderNumber)) { - if (isset($SelectedCustomer)) { - $SQL = "SELECT salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto, - currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders INNER JOIN salesorderdetails - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN debtorsmaster - ON salesorders.debtorno = debtorsmaster.debtorno - INNER JOIN custbranch - ON salesorders.branchcode = custbranch.branchcode - AND salesorders.debtorno = custbranch.debtorno - INNER JOIN currencies - ON debtorsmaster.currcode = currencies.currabrev - WHERE salesorders.debtorno='" . $SelectedCustomer ."' - AND salesorders.orderno='". $OrderNumber ."' - AND salesorders.quotation=0 - AND salesorderdetails.completed".$Completed." - GROUP BY salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - currencies.decimalplaces, - salesorders.deliverto - ORDER BY salesorders.orderno"; - } else { //Set order number and SelectedCustomer not set - $SQL = "SELECT salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto, - currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders INNER JOIN salesorderdetails - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN debtorsmaster - ON salesorders.debtorno = debtorsmaster.debtorno - INNER JOIN custbranch - ON salesorders.branchcode = custbranch.branchcode - AND salesorders.debtorno = custbranch.debtorno - INNER JOIN currencies - ON debtorsmaster.currcode = currencies.currabrev - WHERE salesorders.orderno='". $OrderNumber ."' - AND salesorders.quotation=0 - AND salesorderdetails.completed " . $Completed ." - GROUP BY salesorders.orderno, - debtorsmaster.name, - currencies.decimalplaces, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto - ORDER BY salesorders.orderno"; - } + $SQL = "SELECT salesorders.orderno, + debtorsmaster.name, + custbranch.brname, + salesorders.customerref, + salesorders.orddate, + salesorders.deliverydate, + salesorders.deliverto, + currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue + FROM salesorders INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + INNER JOIN debtorsmaster + ON salesorders.debtorno = debtorsmaster.debtorno + INNER JOIN custbranch + ON salesorders.branchcode = custbranch.branchcode + AND salesorders.debtorno = custbranch.debtorno + INNER JOIN currencies + ON debtorsmaster.currcode = currencies.currabrev + WHERE salesorders.orderno='". $OrderNumber ."' + AND salesorders.quotation=0 + AND salesorderdetails.completed " . $Completed ." + GROUP BY salesorders.orderno, + debtorsmaster.name, + currencies.decimalplaces, + custbranch.brname, + salesorders.customerref, + salesorders.orddate, + salesorders.deliverydate, + salesorders.deliverto + ORDER BY salesorders.orderno"; } elseif (isset($CustomerRef)) { if (isset($SelectedCustomer)) { $SQL = "SELECT salesorders.orderno, Modified: trunk/StockCostUpdate.php =================================================================== --- trunk/StockCostUpdate.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/StockCostUpdate.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -186,7 +186,7 @@ <br />'; } if ($myrow['mbflag']!='D'){ - echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '>' . _('Show Stock Status') . '</a>'; + echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>'; echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a>'; echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Stock Usage') .'</a>'; echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>'; Modified: trunk/SuppInvGRNs.php =================================================================== --- trunk/SuppInvGRNs.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SuppInvGRNs.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -62,6 +62,9 @@ } else { $Complete = False; } + + /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */ + /* if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) { if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){ prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' . @@ -69,6 +72,11 @@ $Hold = True; } } + */ + if (filter_number_format($_POST['This_QuantityInv'])+$_POST['Prev_QuantityInv']-$_POST['QtyRecd'] > 0){ + prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn'); + $InputError = True; + } if (!is_numeric(filter_number_format($_POST['ChgPrice'])) AND filter_number_format($_POST['ChgPrice'])<0){ $InputError = True; prnMsg(_('The price charged in the suppliers currency is either not numeric or negative') . '. ' . _('The goods received cannot be invoiced at this price'),'error'); Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SupplierInvoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -16,8 +16,6 @@ include('includes/header.inc'); include('includes/SQL_CommonFunctions.inc'); -//this is available from the menu on this page already -//echo "<a href='" . $rootpath . '/SelectSupplier.php?' . SID . "'>" . _('Back to Suppliers') . '</a><br />'; if (!isset($_SESSION['SuppTrans']->SupplierName)) { $sql="SELECT suppname FROM suppliers WHERE supplierid='" . $_GET['SupplierID'] . "'"; @@ -723,7 +721,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $EnteredGLCode->GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "', '" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -751,7 +749,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "', '" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') . @@ -779,7 +777,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '". $AssetAddition->CostAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description . "', '" . ($AssetAddition->Amount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the asset addition could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); @@ -842,8 +840,8 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . - _('std cost of') . ' ' . $EnteredGRN->StdCostUnit) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . + _('std cost of') . ' ' . $EnteredGRN->StdCostUnit . "', '" . ($EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -892,10 +890,11 @@ if ($EnteredGRN->This_QuantityInv > $TotalQuantityOnHand){ /*So we need to write off some of the variance to variances and only the balance of the quantity in stock to go to stock value */ - - $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) - * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); - + + /*if the TotalQuantityOnHand is negative then this variance to write off is inflated by the negative quantity - which makes sense */ + + $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); + $SQL = "INSERT INTO gltrans (type, typeno, trandate, @@ -916,7 +915,63 @@ $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True); - } + + /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior. + + The assumption here is that the goods have been sold prior to the purchase invocie being entered so it is necessary to back track on the sales analysis cost. + * + Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis*/ + + $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv; + $CostVarPerUnit = (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); + $PeriodAllocated = $PeriodNo; + + while ($QuantityVarianceAllocated >0) { + $SalesAnalResult=DB_query("SELECT cust, + custbranch, + typeabbrev, + periodno, + stkcategory, + area, + salesperson, + cost, + qty + FROM salesanalysis + WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "' + AND salesanalysis.budgetoractual=1 + AND periodno='" . $PeriodAllocated . "'", + $db); + if (DB_num_rows($SalesAnalResult)>0){ + while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){ + if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){ + $QuantityVarianceAllocated -= $SalesAnalRow['qty']; + $QuantityAllocated = $SalesAnalRow['qty']; + } else { + $QuantityAllocated = $QuantityVarianceAllocated; + $QuantityVarianceAllocated=0; + } + $UpdSalAnalResult = DB_query("UPDATE salesanalysis + SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . " + WHERE cust ='" . $SalesAnalRow['cust'] . "' + AND stockid='" . $EnteredGRN->ItemCode . "' + AND custbranch='" . $SalesAnalRow['custbranch'] . "' + AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "' + AND periodno='" . $PeriodAllocated . "' + AND area='" . $SalesAnalRow['area'] . "' + AND salesperson='" . $SalesAnalRow['salesperson'] . "' + AND stkcategory='" . $SalesAnalRow['stkcategory'] . "' + AND budgetoractual=1", + $db); + } + } //end if there were sales in that period + $PeriodAllocated--; //decrement the period + if ($PeriodNo - $PeriodAllocated >6) { + /*if more than 6 months ago when sales were made then forget it */ + break; + } + } //end loop around different periods to see which sales analysis records to update + } // end if the quantity being invoiced here is greater than the current stock on hand + /*Now post any remaining price variance to stock rather than price variances */ $SQL = "INSERT INTO gltrans (type, @@ -933,7 +988,7 @@ '" . $StockGLCode['stockact'] . "', '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . ' - ' . $EnteredGRN->ItemCode . ' x ' . $TotalQuantityOnHand . ' x ' . - round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,2) . "', + round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . ($PurchPriceVar - $WriteOffToVariances) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -959,7 +1014,8 @@ materialcost=materialcost+" . $CostIncrement . " WHERE stockid='" . $EnteredGRN->ItemCode . "'"; $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True); - } else { + } else { + /* if stock is negative then update the cost to this cost */ $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost, materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "' WHERE stockid='" . $EnteredGRN->ItemCode . "'"; @@ -1109,6 +1165,8 @@ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the control total could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True); + + EnsureGLEntriesBalance(20, $InvoiceNo, $db); } /*Thats the end of the GL postings */ /*Now insert the invoice into the SuppTrans table*/ @@ -1276,7 +1334,7 @@ '20', '" . $InvoiceNo . "', '" . $Contract->Amount/ $_SESSION['SuppTrans']->ExRate . "', - '" . DB_escape_string($Contract->Narrative) . "', + '" . $Contract->Narrative . "', '" . $Anticipated . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The contract charge record for contract') . ' ' . $Contract->ContractRef . ' ' . _('could not be added because'); Added: trunk/css/aguapop/images/allocation.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/allocation.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/bank.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/bank.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/credit.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/credit.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/email.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/email.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/folders.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/folders.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/inventory.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/inventory.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/maintenance.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/maintenance.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/preview.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/preview.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/reports.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/reports.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/transactions.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/transactions.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/doc/README.txt =================================================================== --- trunk/doc/README.txt 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/doc/README.txt 2011-11-26 07:58:19 UTC (rev 4753) @@ -22,6 +22,8 @@ 6. A significant push has been made to try to reduce the number of bugs, with a great deal of testing from all quarters. +7. Numbers can now be entered in the language format the user has selected and all numbers now display in the users language format - as of version 4.06.1 + The change log shows descriptions and dates of all changes made. Installation instructions are in the file INSTALL.txt in the doc directory. It is important to read the INSTALL.txt file in its entirety before proceeding. A printout is recommended. Modified: trunk/includes/ConnectDB_mysqli.inc =================================================================== --- trunk/includes/ConnectDB_mysqli.inc 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/includes/ConnectDB_mysqli.inc 2011-11-26 07:58:19 UTC (rev 4753) @@ -69,11 +69,6 @@ global $debug; global $PathPrefix; -/* PeterMoulding.com -20071102 Change from mysql to mysqli; - $result=mysql_query($SQL,$Conn); -*/ - $result=mysqli_query($Conn, $SQL); $_SESSION['LastInsertId'] = mysqli_insert_id($Conn); Modified: trunk/includes/SQL_CommonFunctions.inc =================================================================== --- trunk/includes/SQL_CommonFunctions.inc 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/includes/SQL_CommonFunctions.inc 2011-11-26 07:58:19 UTC (rev 4753) @@ -141,10 +141,9 @@ $sql = "SELECT SUM(salesorderdetails.unitprice * (salesorderdetails.quantity - salesorderdetails.qtyinvoiced) * (1 - salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders, - salesorderdetails - WHERE salesorders.orderno = salesorderdetails.orderno - AND salesorders.debtorno = '" . $DebtorNo . "' + FROM salesorders INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + WHERE salesorders.debtorno = '" . $DebtorNo . "' AND salesorderdetails.completed = 0 AND salesorders.quotation = 0"; @@ -154,7 +153,7 @@ $myrow = DB_fetch_array($GetOSOrdersResult); $CreditAvailable -= $myrow['ordervalue']; - Return $CreditAvailable; + return $CreditAvailable; } function ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $QOH) { Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-11-26 07:58:19 UTC (rev 4753) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 3.08\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-13 10:46+1300\n" +"POT-Creation-Date: 2011-11-19 17:05+1300\n" "PO-Revision-Date: 2011-02-07 15:33+0000\n" "Last-Translator: Tim Schofield <Unknown>\n" "Language-Team: Czech <cs...@li...>\n" @@ -202,12 +202,12 @@ #: AccountGroups.php:223 AccountSections.php:175 AddCustomerContacts.php:25 #: AddCustomerContacts.php:28 AddCustomerNotes.php:103 -#: AddCustomerTypeNotes.php:97 AgedDebtors.php:451 AgedSuppliers.php:278 +#: AddCustomerTypeNotes.php:97 AgedDebtors.php:450 AgedSuppliers.php:278 #: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13 #: BOMExtendedQty.php:261 BOMIndented.php:246 BOMIndentedReverse.php:235 #: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:213 BOMs.php:832 -#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2014 -#: CounterSales.php:2140 Credit_Invoice.php:255 CreditStatus.php:21 +#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2025 +#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21 #: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11 #: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10 #: DiscountCategories.php:131 DiscountMatrix.php:16 EDIMessageFormat.php:104 @@ -221,14 +221,14 @@ #: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17 #: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64 #: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8 -#: Prices_Customer.php:34 Prices.php:30 PurchData.php:137 PurchData.php:258 +#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258 #: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 #: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17 #: SalesGraph.php:34 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45 #: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:215 #: SelectCreditItems.php:286 SelectCustomer.php:260 SelectGLAccount.php:17 -#: SelectGLAccount.php:77 SelectOrderItems.php:575 SelectOrderItems.php:1468 -#: SelectOrderItems.php:1592 SelectProduct.php:496 SelectSalesOrder.php:533 +#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1479 +#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533 #: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9 #: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17 #: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8 @@ -269,8 +269,8 @@ #: CompanyPreferences.php:476 CompanyPreferences.php:478 #: CompanyPreferences.php:491 CompanyPreferences.php:493 #: CompanyPreferences.php:506 CompanyPreferences.php:508 -#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:577 -#: Customers.php:925 Customers.php:934 Customers.php:937 +#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:593 +#: Customers.php:941 Customers.php:950 Customers.php:953 #: DeliveryDetails.php:1079 DeliveryDetails.php:1118 DeliveryDetails.php:1121 #: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533 #: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198 @@ -304,8 +304,8 @@ #: BOMs.php:749 CompanyPreferences.php:475 CompanyPreferences.php:479 #: CompanyPreferences.php:490 CompanyPreferences.php:494 #: CompanyPreferences.php:505 CompanyPreferences.php:509 -#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:576 -#: Customers.php:920 Customers.php:933 Customers.php:936 +#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:592 +#: Customers.php:936 Customers.php:949 Customers.php:952 #: DeliveryDetails.php:1080 DeliveryDetails.php:1119 DeliveryDetails.php:1122 #: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531 #: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198 @@ -338,14 +338,14 @@ #: AddCustomerNotes.php:141 AddCustomerTypeNotes.php:128 Areas.php:164 #: BankAccounts.php:223 BOMs.php:149 COGSGLPostings.php:108 #: COGSGLPostings.php:206 CreditStatus.php:174 Currencies.php:272 -#: CustomerBranches.php:414 Customers.php:1011 Customers.php:1045 +#: CustomerBranches.php:414 Customers.php:1027 Customers.php:1061 #: CustomerTypes.php:202 EDIMessageFormat.php:150 Factors.php:329 #: FixedAssetCategories.php:186 FixedAssetLocations.php:107 #: FreightCosts.php:240 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:91 #: Labels.php:411 Locations.php:382 MRPDemands.php:306 MRPDemandTypes.php:120 #: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259 #: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234 -#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:277 +#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278 #: Prices.php:251 PurchData.php:204 SalesCategories.php:255 #: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232 #: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612 @@ -369,8 +369,8 @@ #: AddCustomerNotes.php:142 AddCustomerTypeNotes.php:129 Areas.php:165 #: BankAccounts.php:224 BOMs.php:151 COGSGLPostings.php:109 #: COGSGLPostings.php:207 ContractBOM.php:266 ContractOtherReqts.php:119 -#: CounterSales.php:813 Credit_Invoice.php:381 CreditStatus.php:175 -#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1046 +#: CounterSales.php:821 Credit_Invoice.php:381 CreditStatus.php:175 +#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1062 #: CustomerTypes.php:203 DiscountCategories.php:219 DiscountMatrix.php:182 #: EDIMessageFormat.php:151 FixedAssetCategories.php:187 FreightCosts.php:241 #: GeocodeSetup.php:174 GLAccounts.php:313 GLJournal.php:427 GLTags.php:92 @@ -378,13 +378,13 @@ #: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206 #: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224 #: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173 -#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:278 +#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279 #: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299 #: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133 #: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207 #: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613 #: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672 -#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1387 +#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398 #: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655 #: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99 #: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139 @@ -444,7 +444,7 @@ #: FreightCosts.php:339 GeocodeSetup.php:270 GLAccounts.php:262 #: Locations.php:597 MRPDemands.php:419 MRPDemandTypes.php:187 #: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282 -#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:354 +#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356 #: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416 #: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581 #: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327 @@ -575,7 +575,7 @@ msgstr "Kontakt záznam byl odstraněn" #: AddCustomerContacts.php:128 CompanyPreferences.php:223 -#: CustomerBranches.php:368 Customers.php:998 Customers.php:1006 +#: CustomerBranches.php:368 Customers.php:1014 Customers.php:1022 #: SalesPeople.php:200 SelectCustomer.php:607 StockDispatch.php:187 #: StockDispatch.php:199 SupplierContacts.php:150 SuppTransGLAnalysis.php:105 #: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124 @@ -583,8 +583,8 @@ msgid "Name" msgstr "Název" -#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:999 -#: Customers.php:1007 SelectCustomer.php:608 WWW_Access.php:107 +#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:1015 +#: Customers.php:1023 SelectCustomer.php:608 WWW_Access.php:107 #: WWW_Access.php:169 msgid "Role" msgstr "Roli" @@ -595,7 +595,7 @@ #: AddCustomerContacts.php:131 AddCustomerContacts.php:240 #: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253 -#: Customers.php:1001 Customers.php:1009 EmailCustTrans.php:15 +#: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15 #: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563 #: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369 #: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945 @@ -609,8 +609,8 @@ msgid "Email" msgstr "E-mail" -#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1002 -#: Customers.php:1010 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 +#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1018 +#: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 #: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214 #: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611 #: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296 @@ -636,7 +636,7 @@ #: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239 #: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241 -#: SelectCustomer.php:417 SelectOrderItems.php:604 +#: SelectCustomer.php:417 SelectOrderItems.php:606 #: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81 #: includes/PDFTransPageHeaderPortrait.inc:105 msgid "Phone" @@ -699,14 +699,15 @@ msgstr "Datum" #: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173 -#: Stocks.php:1019 UpgradeDatabase.php:174 UpgradeDatabase.php:177 -#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186 -#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195 -#: 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 Z_Upgrade_3.11-4.00.php:70 -#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78 +#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178 +#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187 +#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196 +#: UpgradeDatabase.php:199 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 +#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74 +#: Z_Upgrade_3.11-4.00.php:78 msgid "Note" msgstr "Poznámka:" @@ -789,11 +790,11 @@ msgid "Aged Customer Balances" msgstr "Zákazník ve věku Váhy" -#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434 +#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433 msgid "Aged Customer Account Analysis" msgstr "Ve věku od zákaznického účtu analýza" -#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434 +#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433 #: AgedSuppliers.php:111 BOMExtendedQty.php:149 BOMIndented.php:150 #: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52 #: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:100 @@ -817,12 +818,12 @@ msgid "Problem Report" msgstr "Problém" -#: AgedDebtors.php:272 CustomerInquiry.php:85 CustomerInquiry.php:109 +#: AgedDebtors.php:271 CustomerInquiry.php:85 CustomerInquiry.php:109 #: DebtorsAtPeriodEnd.php:59 msgid "The customer details could not be retrieved by the SQL because" msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože" -#: AgedDebtors.php:273 AgedDebtors.php:372 AgedDebtors.php:437 +#: AgedDebtors.php:272 AgedDebtors.php:371 AgedDebtors.php:436 #: AgedSuppliers.php:114 AgedSuppliers.php:199 BOMExtendedQty.php:152 #: BOMExtendedQty.php:248 BOMIndented.php:153 BOMIndented.php:234 #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44 @@ -873,11 +874,11 @@ msgid "Back to the menu" msgstr "Zpět do menu" -#: AgedDebtors.php:371 +#: AgedDebtors.php:370 msgid "The details of outstanding transactions for customer" msgstr "Podrobnosti o nesplacených transakcí pro zákazníka" -#: AgedDebtors.php:371 AgedSuppliers.php:198 GLAccountCSV.php:168 +#: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168 #: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435 #: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365 #: SpecialOrder.php:440 StockLocTransferReceive.php:370 @@ -885,10 +886,10 @@ msgid "could not be retrieved because" msgstr "se nepodařilo získat, protože" -#: AgedDebtors.php:374 AgedSuppliers.php:201 Areas.php:95 -#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:959 -#: ConfirmDispatch_Invoice.php:973 Contracts.php:580 CounterSales.php:1354 -#: CounterSales.php:1368 Credit_Invoice.php:697 Credit_Invoice.php:718 +#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95 +#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967 +#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365 +#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718 #: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709 #: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596 #: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85 @@ -913,66 +914,66 @@ msgid "The SQL that failed was" msgstr "SQL příkaz, který selhal, byl" -#: AgedDebtors.php:436 +#: AgedDebtors.php:435 #, fuzzy msgid "" "There are no customers meeting the criteria specified with balances to list" msgstr "Nejsou žádné zákazníky, splňující kritéria uvedená na seznamu" -#: AgedDebtors.php:447 +#: AgedDebtors.php:446 msgid "Aged Debtor Analysis" msgstr "Ve věku dlužníka analýza" -#: AgedDebtors.php:461 DebtorsAtPeriodEnd.php:137 +#: AgedDebtors.php:460 DebtorsAtPeriodEnd.php:137 msgid "From Customer Code" msgstr "Od kódu zákazníka" -#: AgedDebtors.php:465 DebtorsAtPeriodEnd.php:141 +#: AgedDebtors.php:464 DebtorsAtPeriodEnd.php:141 msgid "To Customer Code" msgstr "Do kódu zákazníka" -#: AgedDebtors.php:469 AgedSuppliers.php:296 +#: AgedDebtors.php:468 AgedSuppliers.php:296 msgid "All balances or overdues only" msgstr "Všechny zůstatky nebo overdues pouze" -#: AgedDebtors.php:471 +#: AgedDebtors.php:470 msgid "All customers with balances" msgstr "Všichni zákazníci s bilancí" -#: AgedDebtors.php:472 AgedSuppliers.php:299 +#: AgedDebtors.php:471 AgedSuppliers.php:299 msgid "Overdue accounts only" msgstr "Po lhůtě splatnosti účtů" -#: AgedDebtors.php:473 +#: AgedDebtors.php:472 msgid "Held accounts only" msgstr "Účtů, pouze" -#: AgedDebtors.php:478 +#: AgedDebtors.php:477 msgid "Only Show Customers Of" msgstr "Zobrazit jen zákazníky" -#: AgedDebtors.php:484 +#: AgedDebtors.php:483 #, fuzzy msgid "All Sales people" msgstr "Všechny Prodejci" -#: AgedDebtors.php:491 +#: AgedDebtors.php:490 msgid "Only show customers trading in" msgstr "Zobrazovat pouze zákazníkům obchodování" -#: AgedDebtors.php:507 +#: AgedDebtors.php:506 msgid "Summary or detailed report" msgstr "Souhrn nebo podrobné zprávy" -#: AgedDebtors.php:509 AgedSuppliers.php:321 InventoryValuation.php:261 +#: AgedDebtors.php:508 AgedSuppliers.php:321 InventoryValuation.php:261 msgid "Summary Report" msgstr "Souhrnná zpráva" -#: AgedDebtors.php:510 AgedSuppliers.php:322 InventoryValuation.php:262 +#: AgedDebtors.php:509 AgedSuppliers.php:322 InventoryValuation.php:262 msgid "Detailed Report" msgstr "Podrobná zpráva" -#: AgedDebtors.php:517 AgedSuppliers.php:328 BOMExtendedQty.php:295 +#: AgedDebtors.php:516 AgedSuppliers.php:328 BOMExtendedQty.php:295 #: BOMIndented.php:276 BOMIndentedReverse.php:255 BOMListing.php:129 #: DebtorsAtPeriodEnd.php:163 InventoryPlanning.php:445 #: InventoryPlanningPrefSupplier.php:516 InventoryQuantities.php:209 @@ -1156,7 +1157,7 @@ msgstr "ID uživatele" #: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298 -#: CounterSales.php:2146 CounterSales.php:2149 CustomerTransInquiry.php:31 +#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31 #: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56 #: FixedAssetRegister.php:65 InventoryQuantities.php:167 #: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585 @@ -1167,7 +1168,7 @@ #: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119 #: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179 #: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952 -#: SelectOrderItems.php:1598 SelectOrderItems.php:1601 SelectProduct.php:504 +#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504 #: SelectProduct.php:506 StockDispatch.php:298 StockDispatch.php:300 #: StockLocStatus.php:69 StockLocStatus.php:71 StockLocStatus.php:89 #: StockLocStatus.php:93 StockLocStatus.php:97 StockQuantityByDate.php:24 @@ -1526,7 +1527,7 @@ msgid "from" msgstr "od" -#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:60 +#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:68 #: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280 #: GLAccountCSV.php:171 GLAccountReport.php:103 Payments.php:733 #: PcReportTab.php:102 PDFChequeListing.php:114 PDFChequeListing.php:124 @@ -1640,7 +1641,7 @@ msgid "Ref" msgstr "Ref" -#: BankMatching.php:264 ConfirmDispatch_Invoice.php:276 Credit_Invoice.php:279 +#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279 #: CustomerAllocations.php:364 CustomerReceipt.php:897 #: CustomerTransInquiry.php:107 CustWhereAlloc.php:109 #: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030 @@ -1848,8 +1849,8 @@ "zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu " "měny bankovního účtu" -#: BankReconciliation.php:354 CounterSales.php:813 Customers.php:1075 -#: SelectOrderItems.php:1398 Stocks.php:1204 WorkOrderCosting.php:540 +#: BankReconciliation.php:354 CounterSales.php:821 Customers.php:1091 +#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540 #: WorkOrderEntry.php:569 msgid "Are You Sure?" msgstr "Opravdu provést?" @@ -1916,8 +1917,8 @@ #: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:532 BOMs.php:709 #: ContractBOM.php:237 ContractBOM.php:349 ContractCosting.php:81 #: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94 -#: Contracts.php:961 Contracts.php:997 CounterSales.php:733 -#: CounterSales.php:2025 CounterSales.php:2210 CounterSales.php:2336 +#: Contracts.php:961 Contracts.php:997 CounterSales.php:741 +#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347 #: Credit_Invoice.php:273 DeliveryDetails.php:825 DeliveryDetails.php:891 #: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107 #: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246 @@ -1933,16 +1934,16 @@ #: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188 #: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223 #: SelectCreditItems.php:673 SelectCreditItems.php:1034 -#: SelectOrderItems.php:1322 SelectOrderItems.php:1480 -#: SelectOrderItems.php:1664 SelectOrderItems.php:1791 ShipmentCosting.php:145 +#: SelectOrderItems.php:1333 SelectOrderItems.php:1491 +#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145 #: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393 #: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616 #: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186 #: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12 #: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317 #: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255 -#: WOSerialNos.php:295 includes/InputSerialItems.php:104 -#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:38 +#: WOSerialNos.php:295 includes/InputSerialItems.php:111 +#: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38 #: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49 #: includes/PDFBOMListingPageHeader.inc:44 #: includes/PDFDeliveryDifferencesPageHeader.inc:43 @@ -2096,10 +2097,10 @@ msgstr "Stavět" #: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856 -#: CounterSales.php:2021 CounterSales.php:2206 PO_SelectOSPurchOrder.php:232 +#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232 #: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70 #: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584 -#: SelectOrderItems.php:1476 SelectOrderItems.php:1660 +#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 #: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191 #: TopItems.php:182 includes/PDFTopItemsHeader.inc:54 msgid "On Hand" @@ -2168,8 +2169,8 @@ #: BOMIndented.php:312 BOMIndentedReverse.php:292 BOMInquiry.php:113 #: BOMInquiry.php:199 BOMs.php:529 BOMs.php:855 ContractBOM.php:236 -#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2019 -#: CounterSales.php:2204 CreditStatus.php:152 CreditStatus.php:241 +#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2030 +#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241 #: EmailConfirmation.php:192 FixedAssetCategories.php:163 #: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83 #: FixedAssetRegister.php:372 FixedAssetTransfer.php:50 @@ -2186,8 +2187,8 @@ #: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94 #: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243 #: SelectCompletedOrder.php:583 SelectContract.php:153 -#: SelectCreditItems.php:988 SelectOrderItems.php:1474 -#: SelectOrderItems.php:1658 SelectProduct.php:516 SelectProduct.php:733 +#: SelectCreditItems.php:988 SelectOrderItems.php:1485 +#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733 #: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190 #: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382 #: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82 @@ -2283,7 +2284,7 @@ msgstr "popis" #: BOMInquiry.php:30 BOMs.php:839 ContractBOM.php:324 ContractBOM.php:329 -#: Contracts.php:756 Contracts.php:759 CounterSales.php:2171 +#: Contracts.php:756 Contracts.php:759 CounterSales.php:2182 #: CustomerReceipt.php:1106 CustomerReceipt.php:1109 #: DiscountCategories.php:104 DiscountCategories.php:106 #: DiscountCategories.php:110 DiscountCategories.php:112 @@ -2293,8 +2... [truncated message content] |
From: <dai...@us...> - 2011-11-26 07:58:29
|
Revision: 4753 http://web-erp.svn.sourceforge.net/web-erp/?rev=4753&view=rev Author: daintree Date: 2011-11-26 07:58:19 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Modified Paths: -------------- trunk/ConfirmDispatchControlled_Invoice.php trunk/ConfirmDispatch_Invoice.php trunk/PO_PDFPurchOrder.php trunk/PO_SelectOSPurchOrder.php trunk/PcAssignCashToTab.php trunk/SelectCompletedOrder.php trunk/StockCostUpdate.php trunk/SuppInvGRNs.php trunk/SupplierInvoice.php trunk/doc/README.txt trunk/includes/ConnectDB_mysqli.inc trunk/includes/SQL_CommonFunctions.inc 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_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.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/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.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/sql/mysql/weberp-demo.sql trunk/sql/mysql/weberp-new.sql Added Paths: ----------- trunk/css/aguapop/images/allocation.gif trunk/css/aguapop/images/bank.gif trunk/css/aguapop/images/credit.gif trunk/css/aguapop/images/email.gif trunk/css/aguapop/images/folders.gif trunk/css/aguapop/images/inventory.gif trunk/css/aguapop/images/maintenance.gif trunk/css/aguapop/images/preview.gif trunk/css/aguapop/images/reports.gif trunk/css/aguapop/images/transactions.gif Modified: trunk/ConfirmDispatchControlled_Invoice.php =================================================================== --- trunk/ConfirmDispatchControlled_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/ConfirmDispatchControlled_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -33,7 +33,7 @@ exit; } -if (!isset($_SESSION['Items']) OR !isset($_SESSION['ProcessingOrder'])) { +if (!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['ProcessingOrder'])) { /* This page can only be called with a sales order number to invoice */ echo '<div class="centre"> <a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Select a sales order to invoice') . '</a> @@ -46,7 +46,7 @@ /*Save some typing by referring to the line item class object in short form */ -$LineItem = &$_SESSION['Items']->LineItems[$LineNo]; +$LineItem = &$_SESSION['Items'.$identifier]->LineItems[$LineNo]; //Make sure this item is really controlled @@ -63,15 +63,15 @@ ********************************************/ echo '<div class="centre">'; -echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>'; +echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>'; -echo '<br /><font size=2><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items']->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items']->CustomerName . '</b></font></div>'; +echo '<br /><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>'; /** vars needed by InputSerialItem : **/ $StockID = $LineItem->StockID; $RecvQty = $LineItem->Quantity-$LineItem->QtyInv; $ItemMustExist = true; /*Can only invoice valid batches/serial numbered items that exist */ -$LocationOut = $_SESSION['Items']->Location; +$LocationOut = $_SESSION['Items'.$identifier]->Location; $InOutModifier=1; $ShowExisting=false; @@ -79,7 +79,7 @@ /*TotalQuantity set inside this include file from the sum of the bundles of the item selected for dispatch */ -$_SESSION['Items']->LineItems[$LineNo]->QtyDispatched = $TotalQuantity; +$_SESSION['Items'.$identifier]->LineItems[$LineNo]->QtyDispatched = $TotalQuantity; include('includes/footer.inc'); exit; Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/ConfirmDispatch_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -232,8 +232,12 @@ foreach ($Itm->SerialItems as $SerialItem) { //calculate QtyDispatched from bundle quantities $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched += $SerialItem->BundleQty; } - } else if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ])) AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){ - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces); + } else if (isset($_POST[$Itm->LineNumber . '_QtyDispatched' ])){ + if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ])) + AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){ + + $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces); + } } foreach ($Itm->Taxes as $TaxLine) { if (isset($_POST[$Itm->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])){ @@ -449,7 +453,7 @@ } } -if (isset($_POST['ChargeFreightCost']) and !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){ +if (isset($_POST['ChargeFreightCost']) AND !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){ $_POST['ChargeFreightCost'] = 0; } @@ -467,7 +471,10 @@ if (!isset($_POST['ChargeFreightCost'])) { $_POST['ChargeFreightCost']=0; } -if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1 and (!isset($_SESSION['Items'.$identifier]->FreightCost) or $_POST['ChargeFreightCost']==0)) { +if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1 + AND (!isset($_SESSION['Items'.$identifier]->FreightCost) + OR $_POST['ChargeFreightCost']==0)) { + echo '<td colspan="2" class="number">'. _('Charge Freight Cost inc Tax').'</td> <td><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="0"></td>'; $_SESSION['Items'.$identifier]->FreightCost=0; @@ -478,7 +485,7 @@ } else { echo '<td class="number"><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="' . locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>'; } - $_POST['ChargeFreightCost'] = $_SESSION['Items'.$identifier]->FreightCost; + $_POST['ChargeFreightCost'] = locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); } $FreightTaxTotal =0; //initialise tax total Modified: trunk/PO_PDFPurchOrder.php =================================================================== --- trunk/PO_PDFPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PO_PDFPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -305,7 +305,7 @@ $Success = 1; //assume the best and email goes - has to be set to 1 to allow update status if ($MakePDFThenDisplayIt){ $pdf->OutputD($_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' . date('Y-m-d') . '.pdf'); - $pdf->__destruct(); //UldisN + $pdf->__destruct(); } else { /* must be MakingPDF to email it */ $PdfFileName = $_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' .date('Y-m-d') . '.pdf'; Modified: trunk/PO_SelectOSPurchOrder.php =================================================================== --- trunk/PO_SelectOSPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PO_SelectOSPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -131,7 +131,11 @@ */ if (!isset($OrderNumber) or $OrderNumber=='' ){ - echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>'; + if (isset($SelectedSupplier)){ + echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $SelectedSupplier . '">' . _('Add Purchase Order') . '</a>'; + } else { + echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>'; + } echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'</p>'; echo '<table class=selection> <tr> Modified: trunk/PcAssignCashToTab.php =================================================================== --- trunk/PcAssignCashToTab.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/PcAssignCashToTab.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -82,8 +82,8 @@ SET date = '".FormatDateForSQL($_POST['Date'])."', amount = '" . filter_number_format($_POST['Amount']) . "', authorized = '0000-00-00', - notes = '" . DB_escape_string($_POST['Notes']) . "', - receipt = '" . DB_escape_string($_POST['Receipt']) . "' + notes = '" . $_POST['Notes'] . "', + receipt = '" . $_POST['Receipt'] . "' WHERE counterindex = '" . $SelectedIndex . "'"; $msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated'); @@ -106,8 +106,8 @@ '" . filter_number_format($_POST['Amount']) . "', authorized = '0000-00-00', '0', - '" . DB_escape_string($_POST['Notes']) . "', - '" . DB_escape_string($_POST['Receipt']) . "' + '" . $_POST['Notes'] . "', + '" . $_POST['Receipt'] . "' )"; $msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created'); } @@ -173,8 +173,8 @@ echo '</td></tr></table>'; // close main table echo '<p> <div class="centre"> - <input type=submit name="process" value="' . _('Accept') . '" /> - <input type=submit name="Cancel" value="' . _('Cancel') . '" /> + <input type="submit" name="process" value="' . _('Accept') . '" /> + <input type="submit" name="Cancel" value="' . _('Cancel') . '" /> </div>'; echo '</form>'; } @@ -321,10 +321,10 @@ $_POST['Notes'] = $myrow['notes']; $_POST['Receipt'] = $myrow['receipt']; - echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '">'; - echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '">'; - echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '">'; - echo '<input type=hidden name="Days" value="' . $Days . '">'; + echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />'; + echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '" />'; + echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '" />'; + echo '<input type=hidden name="Days" value="' . $Days . '" />'; } /* Ricard: needs revision of this date initialization */ Modified: trunk/SelectCompletedOrder.php =================================================================== --- trunk/SelectCompletedOrder.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SelectCompletedOrder.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -235,68 +235,35 @@ //figure out the SQL required from the inputs available if (isset($OrderNumber)) { - if (isset($SelectedCustomer)) { - $SQL = "SELECT salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto, - currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders INNER JOIN salesorderdetails - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN debtorsmaster - ON salesorders.debtorno = debtorsmaster.debtorno - INNER JOIN custbranch - ON salesorders.branchcode = custbranch.branchcode - AND salesorders.debtorno = custbranch.debtorno - INNER JOIN currencies - ON debtorsmaster.currcode = currencies.currabrev - WHERE salesorders.debtorno='" . $SelectedCustomer ."' - AND salesorders.orderno='". $OrderNumber ."' - AND salesorders.quotation=0 - AND salesorderdetails.completed".$Completed." - GROUP BY salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - currencies.decimalplaces, - salesorders.deliverto - ORDER BY salesorders.orderno"; - } else { //Set order number and SelectedCustomer not set - $SQL = "SELECT salesorders.orderno, - debtorsmaster.name, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto, - currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders INNER JOIN salesorderdetails - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN debtorsmaster - ON salesorders.debtorno = debtorsmaster.debtorno - INNER JOIN custbranch - ON salesorders.branchcode = custbranch.branchcode - AND salesorders.debtorno = custbranch.debtorno - INNER JOIN currencies - ON debtorsmaster.currcode = currencies.currabrev - WHERE salesorders.orderno='". $OrderNumber ."' - AND salesorders.quotation=0 - AND salesorderdetails.completed " . $Completed ." - GROUP BY salesorders.orderno, - debtorsmaster.name, - currencies.decimalplaces, - custbranch.brname, - salesorders.customerref, - salesorders.orddate, - salesorders.deliverydate, - salesorders.deliverto - ORDER BY salesorders.orderno"; - } + $SQL = "SELECT salesorders.orderno, + debtorsmaster.name, + custbranch.brname, + salesorders.customerref, + salesorders.orddate, + salesorders.deliverydate, + salesorders.deliverto, + currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue + FROM salesorders INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + INNER JOIN debtorsmaster + ON salesorders.debtorno = debtorsmaster.debtorno + INNER JOIN custbranch + ON salesorders.branchcode = custbranch.branchcode + AND salesorders.debtorno = custbranch.debtorno + INNER JOIN currencies + ON debtorsmaster.currcode = currencies.currabrev + WHERE salesorders.orderno='". $OrderNumber ."' + AND salesorders.quotation=0 + AND salesorderdetails.completed " . $Completed ." + GROUP BY salesorders.orderno, + debtorsmaster.name, + currencies.decimalplaces, + custbranch.brname, + salesorders.customerref, + salesorders.orddate, + salesorders.deliverydate, + salesorders.deliverto + ORDER BY salesorders.orderno"; } elseif (isset($CustomerRef)) { if (isset($SelectedCustomer)) { $SQL = "SELECT salesorders.orderno, Modified: trunk/StockCostUpdate.php =================================================================== --- trunk/StockCostUpdate.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/StockCostUpdate.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -186,7 +186,7 @@ <br />'; } if ($myrow['mbflag']!='D'){ - echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '>' . _('Show Stock Status') . '</a>'; + echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>'; echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a>'; echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Stock Usage') .'</a>'; echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>'; Modified: trunk/SuppInvGRNs.php =================================================================== --- trunk/SuppInvGRNs.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SuppInvGRNs.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -62,6 +62,9 @@ } else { $Complete = False; } + + /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */ + /* if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) { if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){ prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' . @@ -69,6 +72,11 @@ $Hold = True; } } + */ + if (filter_number_format($_POST['This_QuantityInv'])+$_POST['Prev_QuantityInv']-$_POST['QtyRecd'] > 0){ + prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn'); + $InputError = True; + } if (!is_numeric(filter_number_format($_POST['ChgPrice'])) AND filter_number_format($_POST['ChgPrice'])<0){ $InputError = True; prnMsg(_('The price charged in the suppliers currency is either not numeric or negative') . '. ' . _('The goods received cannot be invoiced at this price'),'error'); Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/SupplierInvoice.php 2011-11-26 07:58:19 UTC (rev 4753) @@ -16,8 +16,6 @@ include('includes/header.inc'); include('includes/SQL_CommonFunctions.inc'); -//this is available from the menu on this page already -//echo "<a href='" . $rootpath . '/SelectSupplier.php?' . SID . "'>" . _('Back to Suppliers') . '</a><br />'; if (!isset($_SESSION['SuppTrans']->SupplierName)) { $sql="SELECT suppname FROM suppliers WHERE supplierid='" . $_GET['SupplierID'] . "'"; @@ -723,7 +721,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $EnteredGLCode->GLCode . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "', '" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -751,7 +749,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "', '" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') . @@ -779,7 +777,7 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '". $AssetAddition->CostAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description . "', '" . ($AssetAddition->Amount/ $_SESSION['SuppTrans']->ExRate) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the asset addition could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); @@ -842,8 +840,8 @@ '" . $SQLInvoiceDate . "', '" . $PeriodNo . "', '" . $_SESSION['SuppTrans']->GRNAct . "', - '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . - _('std cost of') . ' ' . $EnteredGRN->StdCostUnit) . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' . + _('std cost of') . ' ' . $EnteredGRN->StdCostUnit . "', '" . ($EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because'); @@ -892,10 +890,11 @@ if ($EnteredGRN->This_QuantityInv > $TotalQuantityOnHand){ /*So we need to write off some of the variance to variances and only the balance of the quantity in stock to go to stock value */ - - $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) - * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); - + + /*if the TotalQuantityOnHand is negative then this variance to write off is inflated by the negative quantity - which makes sense */ + + $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); + $SQL = "INSERT INTO gltrans (type, typeno, trandate, @@ -916,7 +915,63 @@ $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True); - } + + /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior. + + The assumption here is that the goods have been sold prior to the purchase invocie being entered so it is necessary to back track on the sales analysis cost. + * + Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis*/ + + $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv; + $CostVarPerUnit = (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit); + $PeriodAllocated = $PeriodNo; + + while ($QuantityVarianceAllocated >0) { + $SalesAnalResult=DB_query("SELECT cust, + custbranch, + typeabbrev, + periodno, + stkcategory, + area, + salesperson, + cost, + qty + FROM salesanalysis + WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "' + AND salesanalysis.budgetoractual=1 + AND periodno='" . $PeriodAllocated . "'", + $db); + if (DB_num_rows($SalesAnalResult)>0){ + while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){ + if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){ + $QuantityVarianceAllocated -= $SalesAnalRow['qty']; + $QuantityAllocated = $SalesAnalRow['qty']; + } else { + $QuantityAllocated = $QuantityVarianceAllocated; + $QuantityVarianceAllocated=0; + } + $UpdSalAnalResult = DB_query("UPDATE salesanalysis + SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . " + WHERE cust ='" . $SalesAnalRow['cust'] . "' + AND stockid='" . $EnteredGRN->ItemCode . "' + AND custbranch='" . $SalesAnalRow['custbranch'] . "' + AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "' + AND periodno='" . $PeriodAllocated . "' + AND area='" . $SalesAnalRow['area'] . "' + AND salesperson='" . $SalesAnalRow['salesperson'] . "' + AND stkcategory='" . $SalesAnalRow['stkcategory'] . "' + AND budgetoractual=1", + $db); + } + } //end if there were sales in that period + $PeriodAllocated--; //decrement the period + if ($PeriodNo - $PeriodAllocated >6) { + /*if more than 6 months ago when sales were made then forget it */ + break; + } + } //end loop around different periods to see which sales analysis records to update + } // end if the quantity being invoiced here is greater than the current stock on hand + /*Now post any remaining price variance to stock rather than price variances */ $SQL = "INSERT INTO gltrans (type, @@ -933,7 +988,7 @@ '" . $StockGLCode['stockact'] . "', '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') . ' - ' . $EnteredGRN->ItemCode . ' x ' . $TotalQuantityOnHand . ' x ' . - round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,2) . "', + round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "', '" . ($PurchPriceVar - $WriteOffToVariances) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because'); @@ -959,7 +1014,8 @@ materialcost=materialcost+" . $CostIncrement . " WHERE stockid='" . $EnteredGRN->ItemCode . "'"; $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True); - } else { + } else { + /* if stock is negative then update the cost to this cost */ $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost, materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "' WHERE stockid='" . $EnteredGRN->ItemCode . "'"; @@ -1109,6 +1165,8 @@ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the control total could not be added because'); $DbgMsg = _('The following SQL to insert the GL transaction was used'); $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True); + + EnsureGLEntriesBalance(20, $InvoiceNo, $db); } /*Thats the end of the GL postings */ /*Now insert the invoice into the SuppTrans table*/ @@ -1276,7 +1334,7 @@ '20', '" . $InvoiceNo . "', '" . $Contract->Amount/ $_SESSION['SuppTrans']->ExRate . "', - '" . DB_escape_string($Contract->Narrative) . "', + '" . $Contract->Narrative . "', '" . $Anticipated . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The contract charge record for contract') . ' ' . $Contract->ContractRef . ' ' . _('could not be added because'); Added: trunk/css/aguapop/images/allocation.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/allocation.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/bank.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/bank.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/credit.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/credit.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/email.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/email.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/folders.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/folders.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/inventory.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/inventory.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/maintenance.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/maintenance.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/preview.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/preview.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/reports.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/reports.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/css/aguapop/images/transactions.gif =================================================================== (Binary files differ) Property changes on: trunk/css/aguapop/images/transactions.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/doc/README.txt =================================================================== --- trunk/doc/README.txt 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/doc/README.txt 2011-11-26 07:58:19 UTC (rev 4753) @@ -22,6 +22,8 @@ 6. A significant push has been made to try to reduce the number of bugs, with a great deal of testing from all quarters. +7. Numbers can now be entered in the language format the user has selected and all numbers now display in the users language format - as of version 4.06.1 + The change log shows descriptions and dates of all changes made. Installation instructions are in the file INSTALL.txt in the doc directory. It is important to read the INSTALL.txt file in its entirety before proceeding. A printout is recommended. Modified: trunk/includes/ConnectDB_mysqli.inc =================================================================== --- trunk/includes/ConnectDB_mysqli.inc 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/includes/ConnectDB_mysqli.inc 2011-11-26 07:58:19 UTC (rev 4753) @@ -69,11 +69,6 @@ global $debug; global $PathPrefix; -/* PeterMoulding.com -20071102 Change from mysql to mysqli; - $result=mysql_query($SQL,$Conn); -*/ - $result=mysqli_query($Conn, $SQL); $_SESSION['LastInsertId'] = mysqli_insert_id($Conn); Modified: trunk/includes/SQL_CommonFunctions.inc =================================================================== --- trunk/includes/SQL_CommonFunctions.inc 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/includes/SQL_CommonFunctions.inc 2011-11-26 07:58:19 UTC (rev 4753) @@ -141,10 +141,9 @@ $sql = "SELECT SUM(salesorderdetails.unitprice * (salesorderdetails.quantity - salesorderdetails.qtyinvoiced) * (1 - salesorderdetails.discountpercent)) AS ordervalue - FROM salesorders, - salesorderdetails - WHERE salesorders.orderno = salesorderdetails.orderno - AND salesorders.debtorno = '" . $DebtorNo . "' + FROM salesorders INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + WHERE salesorders.debtorno = '" . $DebtorNo . "' AND salesorderdetails.completed = 0 AND salesorders.quotation = 0"; @@ -154,7 +153,7 @@ $myrow = DB_fetch_array($GetOSOrdersResult); $CreditAvailable -= $myrow['ordervalue']; - Return $CreditAvailable; + return $CreditAvailable; } function ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $QOH) { Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-11-24 09:10:21 UTC (rev 4752) +++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-11-26 07:58:19 UTC (rev 4753) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 3.08\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-13 10:46+1300\n" +"POT-Creation-Date: 2011-11-19 17:05+1300\n" "PO-Revision-Date: 2011-02-07 15:33+0000\n" "Last-Translator: Tim Schofield <Unknown>\n" "Language-Team: Czech <cs...@li...>\n" @@ -202,12 +202,12 @@ #: AccountGroups.php:223 AccountSections.php:175 AddCustomerContacts.php:25 #: AddCustomerContacts.php:28 AddCustomerNotes.php:103 -#: AddCustomerTypeNotes.php:97 AgedDebtors.php:451 AgedSuppliers.php:278 +#: AddCustomerTypeNotes.php:97 AgedDebtors.php:450 AgedSuppliers.php:278 #: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13 #: BOMExtendedQty.php:261 BOMIndented.php:246 BOMIndentedReverse.php:235 #: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:213 BOMs.php:832 -#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2014 -#: CounterSales.php:2140 Credit_Invoice.php:255 CreditStatus.php:21 +#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2025 +#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21 #: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11 #: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10 #: DiscountCategories.php:131 DiscountMatrix.php:16 EDIMessageFormat.php:104 @@ -221,14 +221,14 @@ #: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17 #: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64 #: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8 -#: Prices_Customer.php:34 Prices.php:30 PurchData.php:137 PurchData.php:258 +#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258 #: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 #: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17 #: SalesGraph.php:34 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45 #: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:215 #: SelectCreditItems.php:286 SelectCustomer.php:260 SelectGLAccount.php:17 -#: SelectGLAccount.php:77 SelectOrderItems.php:575 SelectOrderItems.php:1468 -#: SelectOrderItems.php:1592 SelectProduct.php:496 SelectSalesOrder.php:533 +#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1479 +#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533 #: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9 #: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17 #: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8 @@ -269,8 +269,8 @@ #: CompanyPreferences.php:476 CompanyPreferences.php:478 #: CompanyPreferences.php:491 CompanyPreferences.php:493 #: CompanyPreferences.php:506 CompanyPreferences.php:508 -#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:577 -#: Customers.php:925 Customers.php:934 Customers.php:937 +#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:593 +#: Customers.php:941 Customers.php:950 Customers.php:953 #: DeliveryDetails.php:1079 DeliveryDetails.php:1118 DeliveryDetails.php:1121 #: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533 #: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198 @@ -304,8 +304,8 @@ #: BOMs.php:749 CompanyPreferences.php:475 CompanyPreferences.php:479 #: CompanyPreferences.php:490 CompanyPreferences.php:494 #: CompanyPreferences.php:505 CompanyPreferences.php:509 -#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:576 -#: Customers.php:920 Customers.php:933 Customers.php:936 +#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:592 +#: Customers.php:936 Customers.php:949 Customers.php:952 #: DeliveryDetails.php:1080 DeliveryDetails.php:1119 DeliveryDetails.php:1122 #: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531 #: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198 @@ -338,14 +338,14 @@ #: AddCustomerNotes.php:141 AddCustomerTypeNotes.php:128 Areas.php:164 #: BankAccounts.php:223 BOMs.php:149 COGSGLPostings.php:108 #: COGSGLPostings.php:206 CreditStatus.php:174 Currencies.php:272 -#: CustomerBranches.php:414 Customers.php:1011 Customers.php:1045 +#: CustomerBranches.php:414 Customers.php:1027 Customers.php:1061 #: CustomerTypes.php:202 EDIMessageFormat.php:150 Factors.php:329 #: FixedAssetCategories.php:186 FixedAssetLocations.php:107 #: FreightCosts.php:240 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:91 #: Labels.php:411 Locations.php:382 MRPDemands.php:306 MRPDemandTypes.php:120 #: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259 #: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234 -#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:277 +#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278 #: Prices.php:251 PurchData.php:204 SalesCategories.php:255 #: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232 #: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612 @@ -369,8 +369,8 @@ #: AddCustomerNotes.php:142 AddCustomerTypeNotes.php:129 Areas.php:165 #: BankAccounts.php:224 BOMs.php:151 COGSGLPostings.php:109 #: COGSGLPostings.php:207 ContractBOM.php:266 ContractOtherReqts.php:119 -#: CounterSales.php:813 Credit_Invoice.php:381 CreditStatus.php:175 -#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1046 +#: CounterSales.php:821 Credit_Invoice.php:381 CreditStatus.php:175 +#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1062 #: CustomerTypes.php:203 DiscountCategories.php:219 DiscountMatrix.php:182 #: EDIMessageFormat.php:151 FixedAssetCategories.php:187 FreightCosts.php:241 #: GeocodeSetup.php:174 GLAccounts.php:313 GLJournal.php:427 GLTags.php:92 @@ -378,13 +378,13 @@ #: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206 #: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224 #: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173 -#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:278 +#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279 #: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299 #: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133 #: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207 #: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613 #: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672 -#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1387 +#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398 #: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655 #: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99 #: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139 @@ -444,7 +444,7 @@ #: FreightCosts.php:339 GeocodeSetup.php:270 GLAccounts.php:262 #: Locations.php:597 MRPDemands.php:419 MRPDemandTypes.php:187 #: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282 -#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:354 +#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356 #: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416 #: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581 #: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327 @@ -575,7 +575,7 @@ msgstr "Kontakt záznam byl odstraněn" #: AddCustomerContacts.php:128 CompanyPreferences.php:223 -#: CustomerBranches.php:368 Customers.php:998 Customers.php:1006 +#: CustomerBranches.php:368 Customers.php:1014 Customers.php:1022 #: SalesPeople.php:200 SelectCustomer.php:607 StockDispatch.php:187 #: StockDispatch.php:199 SupplierContacts.php:150 SuppTransGLAnalysis.php:105 #: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124 @@ -583,8 +583,8 @@ msgid "Name" msgstr "Název" -#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:999 -#: Customers.php:1007 SelectCustomer.php:608 WWW_Access.php:107 +#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:1015 +#: Customers.php:1023 SelectCustomer.php:608 WWW_Access.php:107 #: WWW_Access.php:169 msgid "Role" msgstr "Roli" @@ -595,7 +595,7 @@ #: AddCustomerContacts.php:131 AddCustomerContacts.php:240 #: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253 -#: Customers.php:1001 Customers.php:1009 EmailCustTrans.php:15 +#: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15 #: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563 #: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369 #: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945 @@ -609,8 +609,8 @@ msgid "Email" msgstr "E-mail" -#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1002 -#: Customers.php:1010 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 +#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1018 +#: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353 #: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214 #: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611 #: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296 @@ -636,7 +636,7 @@ #: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239 #: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241 -#: SelectCustomer.php:417 SelectOrderItems.php:604 +#: SelectCustomer.php:417 SelectOrderItems.php:606 #: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81 #: includes/PDFTransPageHeaderPortrait.inc:105 msgid "Phone" @@ -699,14 +699,15 @@ msgstr "Datum" #: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173 -#: Stocks.php:1019 UpgradeDatabase.php:174 UpgradeDatabase.php:177 -#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186 -#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195 -#: 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 Z_Upgrade_3.11-4.00.php:70 -#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78 +#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178 +#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187 +#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196 +#: UpgradeDatabase.php:199 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 +#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74 +#: Z_Upgrade_3.11-4.00.php:78 msgid "Note" msgstr "Poznámka:" @@ -789,11 +790,11 @@ msgid "Aged Customer Balances" msgstr "Zákazník ve věku Váhy" -#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434 +#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433 msgid "Aged Customer Account Analysis" msgstr "Ve věku od zákaznického účtu analýza" -#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434 +#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433 #: AgedSuppliers.php:111 BOMExtendedQty.php:149 BOMIndented.php:150 #: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52 #: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:100 @@ -817,12 +818,12 @@ msgid "Problem Report" msgstr "Problém" -#: AgedDebtors.php:272 CustomerInquiry.php:85 CustomerInquiry.php:109 +#: AgedDebtors.php:271 CustomerInquiry.php:85 CustomerInquiry.php:109 #: DebtorsAtPeriodEnd.php:59 msgid "The customer details could not be retrieved by the SQL because" msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože" -#: AgedDebtors.php:273 AgedDebtors.php:372 AgedDebtors.php:437 +#: AgedDebtors.php:272 AgedDebtors.php:371 AgedDebtors.php:436 #: AgedSuppliers.php:114 AgedSuppliers.php:199 BOMExtendedQty.php:152 #: BOMExtendedQty.php:248 BOMIndented.php:153 BOMIndented.php:234 #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44 @@ -873,11 +874,11 @@ msgid "Back to the menu" msgstr "Zpět do menu" -#: AgedDebtors.php:371 +#: AgedDebtors.php:370 msgid "The details of outstanding transactions for customer" msgstr "Podrobnosti o nesplacených transakcí pro zákazníka" -#: AgedDebtors.php:371 AgedSuppliers.php:198 GLAccountCSV.php:168 +#: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168 #: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435 #: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365 #: SpecialOrder.php:440 StockLocTransferReceive.php:370 @@ -885,10 +886,10 @@ msgid "could not be retrieved because" msgstr "se nepodařilo získat, protože" -#: AgedDebtors.php:374 AgedSuppliers.php:201 Areas.php:95 -#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:959 -#: ConfirmDispatch_Invoice.php:973 Contracts.php:580 CounterSales.php:1354 -#: CounterSales.php:1368 Credit_Invoice.php:697 Credit_Invoice.php:718 +#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95 +#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967 +#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365 +#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718 #: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709 #: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596 #: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85 @@ -913,66 +914,66 @@ msgid "The SQL that failed was" msgstr "SQL příkaz, který selhal, byl" -#: AgedDebtors.php:436 +#: AgedDebtors.php:435 #, fuzzy msgid "" "There are no customers meeting the criteria specified with balances to list" msgstr "Nejsou žádné zákazníky, splňující kritéria uvedená na seznamu" -#: AgedDebtors.php:447 +#: AgedDebtors.php:446 msgid "Aged Debtor Analysis" msgstr "Ve věku dlužníka analýza" -#: AgedDebtors.php:461 DebtorsAtPeriodEnd.php:137 +#: AgedDebtors.php:460 DebtorsAtPeriodEnd.php:137 msgid "From Customer Code" msgstr "Od kódu zákazníka" -#: AgedDebtors.php:465 DebtorsAtPeriodEnd.php:141 +#: AgedDebtors.php:464 DebtorsAtPeriodEnd.php:141 msgid "To Customer Code" msgstr "Do kódu zákazníka" -#: AgedDebtors.php:469 AgedSuppliers.php:296 +#: AgedDebtors.php:468 AgedSuppliers.php:296 msgid "All balances or overdues only" msgstr "Všechny zůstatky nebo overdues pouze" -#: AgedDebtors.php:471 +#: AgedDebtors.php:470 msgid "All customers with balances" msgstr "Všichni zákazníci s bilancí" -#: AgedDebtors.php:472 AgedSuppliers.php:299 +#: AgedDebtors.php:471 AgedSuppliers.php:299 msgid "Overdue accounts only" msgstr "Po lhůtě splatnosti účtů" -#: AgedDebtors.php:473 +#: AgedDebtors.php:472 msgid "Held accounts only" msgstr "Účtů, pouze" -#: AgedDebtors.php:478 +#: AgedDebtors.php:477 msgid "Only Show Customers Of" msgstr "Zobrazit jen zákazníky" -#: AgedDebtors.php:484 +#: AgedDebtors.php:483 #, fuzzy msgid "All Sales people" msgstr "Všechny Prodejci" -#: AgedDebtors.php:491 +#: AgedDebtors.php:490 msgid "Only show customers trading in" msgstr "Zobrazovat pouze zákazníkům obchodování" -#: AgedDebtors.php:507 +#: AgedDebtors.php:506 msgid "Summary or detailed report" msgstr "Souhrn nebo podrobné zprávy" -#: AgedDebtors.php:509 AgedSuppliers.php:321 InventoryValuation.php:261 +#: AgedDebtors.php:508 AgedSuppliers.php:321 InventoryValuation.php:261 msgid "Summary Report" msgstr "Souhrnná zpráva" -#: AgedDebtors.php:510 AgedSuppliers.php:322 InventoryValuation.php:262 +#: AgedDebtors.php:509 AgedSuppliers.php:322 InventoryValuation.php:262 msgid "Detailed Report" msgstr "Podrobná zpráva" -#: AgedDebtors.php:517 AgedSuppliers.php:328 BOMExtendedQty.php:295 +#: AgedDebtors.php:516 AgedSuppliers.php:328 BOMExtendedQty.php:295 #: BOMIndented.php:276 BOMIndentedReverse.php:255 BOMListing.php:129 #: DebtorsAtPeriodEnd.php:163 InventoryPlanning.php:445 #: InventoryPlanningPrefSupplier.php:516 InventoryQuantities.php:209 @@ -1156,7 +1157,7 @@ msgstr "ID uživatele" #: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298 -#: CounterSales.php:2146 CounterSales.php:2149 CustomerTransInquiry.php:31 +#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31 #: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56 #: FixedAssetRegister.php:65 InventoryQuantities.php:167 #: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585 @@ -1167,7 +1168,7 @@ #: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119 #: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179 #: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952 -#: SelectOrderItems.php:1598 SelectOrderItems.php:1601 SelectProduct.php:504 +#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504 #: SelectProduct.php:506 StockDispatch.php:298 StockDispatch.php:300 #: StockLocStatus.php:69 StockLocStatus.php:71 StockLocStatus.php:89 #: StockLocStatus.php:93 StockLocStatus.php:97 StockQuantityByDate.php:24 @@ -1526,7 +1527,7 @@ msgid "from" msgstr "od" -#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:60 +#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:68 #: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280 #: GLAccountCSV.php:171 GLAccountReport.php:103 Payments.php:733 #: PcReportTab.php:102 PDFChequeListing.php:114 PDFChequeListing.php:124 @@ -1640,7 +1641,7 @@ msgid "Ref" msgstr "Ref" -#: BankMatching.php:264 ConfirmDispatch_Invoice.php:276 Credit_Invoice.php:279 +#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279 #: CustomerAllocations.php:364 CustomerReceipt.php:897 #: CustomerTransInquiry.php:107 CustWhereAlloc.php:109 #: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030 @@ -1848,8 +1849,8 @@ "zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu " "měny bankovního účtu" -#: BankReconciliation.php:354 CounterSales.php:813 Customers.php:1075 -#: SelectOrderItems.php:1398 Stocks.php:1204 WorkOrderCosting.php:540 +#: BankReconciliation.php:354 CounterSales.php:821 Customers.php:1091 +#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540 #: WorkOrderEntry.php:569 msgid "Are You Sure?" msgstr "Opravdu provést?" @@ -1916,8 +1917,8 @@ #: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:532 BOMs.php:709 #: ContractBOM.php:237 ContractBOM.php:349 ContractCosting.php:81 #: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94 -#: Contracts.php:961 Contracts.php:997 CounterSales.php:733 -#: CounterSales.php:2025 CounterSales.php:2210 CounterSales.php:2336 +#: Contracts.php:961 Contracts.php:997 CounterSales.php:741 +#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347 #: Credit_Invoice.php:273 DeliveryDetails.php:825 DeliveryDetails.php:891 #: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107 #: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246 @@ -1933,16 +1934,16 @@ #: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188 #: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223 #: SelectCreditItems.php:673 SelectCreditItems.php:1034 -#: SelectOrderItems.php:1322 SelectOrderItems.php:1480 -#: SelectOrderItems.php:1664 SelectOrderItems.php:1791 ShipmentCosting.php:145 +#: SelectOrderItems.php:1333 SelectOrderItems.php:1491 +#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145 #: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393 #: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616 #: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186 #: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12 #: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317 #: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255 -#: WOSerialNos.php:295 includes/InputSerialItems.php:104 -#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:38 +#: WOSerialNos.php:295 includes/InputSerialItems.php:111 +#: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38 #: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49 #: includes/PDFBOMListingPageHeader.inc:44 #: includes/PDFDeliveryDifferencesPageHeader.inc:43 @@ -2096,10 +2097,10 @@ msgstr "Stavět" #: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856 -#: CounterSales.php:2021 CounterSales.php:2206 PO_SelectOSPurchOrder.php:232 +#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232 #: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70 #: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584 -#: SelectOrderItems.php:1476 SelectOrderItems.php:1660 +#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 #: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191 #: TopItems.php:182 includes/PDFTopItemsHeader.inc:54 msgid "On Hand" @@ -2168,8 +2169,8 @@ #: BOMIndented.php:312 BOMIndentedReverse.php:292 BOMInquiry.php:113 #: BOMInquiry.php:199 BOMs.php:529 BOMs.php:855 ContractBOM.php:236 -#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2019 -#: CounterSales.php:2204 CreditStatus.php:152 CreditStatus.php:241 +#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2030 +#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241 #: EmailConfirmation.php:192 FixedAssetCategories.php:163 #: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83 #: FixedAssetRegister.php:372 FixedAssetTransfer.php:50 @@ -2186,8 +2187,8 @@ #: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94 #: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243 #: SelectCompletedOrder.php:583 SelectContract.php:153 -#: SelectCreditItems.php:988 SelectOrderItems.php:1474 -#: SelectOrderItems.php:1658 SelectProduct.php:516 SelectProduct.php:733 +#: SelectCreditItems.php:988 SelectOrderItems.php:1485 +#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733 #: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190 #: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382 #: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82 @@ -2283,7 +2284,7 @@ msgstr "popis" #: BOMInquiry.php:30 BOMs.php:839 ContractBOM.php:324 ContractBOM.php:329 -#: Contracts.php:756 Contracts.php:759 CounterSales.php:2171 +#: Contracts.php:756 Contracts.php:759 CounterSales.php:2182 #: CustomerReceipt.php:1106 CustomerReceipt.php:1109 #: DiscountCategories.php:104 DiscountCategories.php:106 #: DiscountCategories.php:110 DiscountCategories.php:112 @@ -2293,8 +2... [truncated message content] |
From: <dai...@us...> - 2011-11-24 09:10:32
|
Revision: 4752 http://web-erp.svn.sourceforge.net/web-erp/?rev=4752&view=rev Author: daintree Date: 2011-11-24 09:10:21 +0000 (Thu, 24 Nov 2011) Log Message: ----------- only check password if it is !=\"\" Modified Paths: -------------- trunk/UserSettings.php trunk/doc/Change.log Modified: trunk/UserSettings.php =================================================================== --- trunk/UserSettings.php 2011-11-23 09:22:39 UTC (rev 4751) +++ trunk/UserSettings.php 2011-11-24 09:10:21 UTC (rev 4752) @@ -35,15 +35,15 @@ } */ $UpdatePassword = 'N'; - if ($_POST['Password'] != ''){ - if ($_POST['Password'] != $_POST['PasswordCheck']){ + + if ($_POST['PasswordCheck'] != ''){ + if (mb_strlen($_POST['Password'])<5){ $InputError = 1; - prnMsg(_('The password and password confirmation fields entered do not match'),'error'); - }else{ - $UpdatePassword = 'Y'; + prnMsg(_('The password entered must be at least 5 characters long'),'error'); + } elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){ + $InputError = 1; + prnMsg(_('The password cannot contain the user id'),'error'); } - } - if ($_POST['PasswordCheck'] != ''){ if ($_POST['Password'] != $_POST['PasswordCheck']){ $InputError = 1; prnMsg(_('The password and password confirmation fields entered do not match'),'error'); @@ -51,13 +51,7 @@ $UpdatePassword = 'Y'; } } - if (mb_strlen($_POST['Password'])<5){ - $InputError = 1; - prnMsg(_('The password entered must be at least 5 characters long'),'error'); - } elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){ - $InputError = 1; - prnMsg(_('The password cannot contain the user id'),'error'); - } + if ($InputError != 1) { // no errors Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-23 09:22:39 UTC (rev 4751) +++ trunk/doc/Change.log 2011-11-24 09:10:21 UTC (rev 4752) @@ -1,7 +1,8 @@ webERP Change Log -23/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties -23/11/11 Felix Lim: StockSerialItems.php closing quote typo. +23/11/11 Phil: UserSettings.php - now only checks password if != '' +22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties +22/11/11 Felix Lim: StockSerialItems.php closing quote typo. 21/11/11 Phil: UserSettings.php now checks for at least 5 character passwords WWW_Users.php CustLoginSetup.php and SupplierLoginSetup.php now also check for 4 character userids 21/11/11 Felix Lim: WWW_users.php malfomed <input type="hidden" - with no closing > 20/11/11 Phil: Shipments.php now only allows purchase order items to be added to a shipment where the shipment is authorised. Completed, rejected, cancelled orders no longer show. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-24 09:10:28
|
Revision: 4752 http://web-erp.svn.sourceforge.net/web-erp/?rev=4752&view=rev Author: daintree Date: 2011-11-24 09:10:21 +0000 (Thu, 24 Nov 2011) Log Message: ----------- only check password if it is !=\"\" Modified Paths: -------------- trunk/UserSettings.php trunk/doc/Change.log Modified: trunk/UserSettings.php =================================================================== --- trunk/UserSettings.php 2011-11-23 09:22:39 UTC (rev 4751) +++ trunk/UserSettings.php 2011-11-24 09:10:21 UTC (rev 4752) @@ -35,15 +35,15 @@ } */ $UpdatePassword = 'N'; - if ($_POST['Password'] != ''){ - if ($_POST['Password'] != $_POST['PasswordCheck']){ + + if ($_POST['PasswordCheck'] != ''){ + if (mb_strlen($_POST['Password'])<5){ $InputError = 1; - prnMsg(_('The password and password confirmation fields entered do not match'),'error'); - }else{ - $UpdatePassword = 'Y'; + prnMsg(_('The password entered must be at least 5 characters long'),'error'); + } elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){ + $InputError = 1; + prnMsg(_('The password cannot contain the user id'),'error'); } - } - if ($_POST['PasswordCheck'] != ''){ if ($_POST['Password'] != $_POST['PasswordCheck']){ $InputError = 1; prnMsg(_('The password and password confirmation fields entered do not match'),'error'); @@ -51,13 +51,7 @@ $UpdatePassword = 'Y'; } } - if (mb_strlen($_POST['Password'])<5){ - $InputError = 1; - prnMsg(_('The password entered must be at least 5 characters long'),'error'); - } elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){ - $InputError = 1; - prnMsg(_('The password cannot contain the user id'),'error'); - } + if ($InputError != 1) { // no errors Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-23 09:22:39 UTC (rev 4751) +++ trunk/doc/Change.log 2011-11-24 09:10:21 UTC (rev 4752) @@ -1,7 +1,8 @@ webERP Change Log -23/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties -23/11/11 Felix Lim: StockSerialItems.php closing quote typo. +23/11/11 Phil: UserSettings.php - now only checks password if != '' +22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties +22/11/11 Felix Lim: StockSerialItems.php closing quote typo. 21/11/11 Phil: UserSettings.php now checks for at least 5 character passwords WWW_Users.php CustLoginSetup.php and SupplierLoginSetup.php now also check for 4 character userids 21/11/11 Felix Lim: WWW_users.php malfomed <input type="hidden" - with no closing > 20/11/11 Phil: Shipments.php now only allows purchase order items to be added to a shipment where the shipment is authorised. Completed, rejected, cancelled orders no longer show. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-23 09:22:46
|
Revision: 4751 http://web-erp.svn.sourceforge.net/web-erp/?rev=4751&view=rev Author: daintree Date: 2011-11-23 09:22:39 +0000 (Wed, 23 Nov 2011) Log Message: ----------- number format changes Modified Paths: -------------- trunk/SalesCategories.php trunk/StockCategories.php trunk/StockSerialItems.php trunk/doc/Change.log Modified: trunk/SalesCategories.php =================================================================== --- trunk/SalesCategories.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/SalesCategories.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -21,6 +21,7 @@ } else if (isset($_POST['ParentCategory'])){ $ParentCategory = mb_strtoupper($_POST['ParentCategory']); } + if(isset($ParentCategory) AND $ParentCategory == 0 ) { unset($ParentCategory); } @@ -164,7 +165,7 @@ $CategoryPath = '<a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?ParentCategory=0">' . _('Main') . '</a>' . " \\ "; $TempPath = ''; -if (isset($ParentCategory)){ +if (!isset($ParentCategory)){ $ParentCategory=0; } Modified: trunk/StockCategories.php =================================================================== --- trunk/StockCategories.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/StockCategories.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -55,11 +55,11 @@ } for ($i=0;$i<=$_POST['PropertyCounter'];$i++){ if (isset($_POST['PropNumeric' .$i]) and $_POST['PropNumeric' .$i] == true){ - if (!is_numeric($_POST['PropMinimum' .$i])){ + if (!is_numeric(filter_number_format($_POST['PropMinimum' .$i]))){ $InputError = 1; prnMsg(_('The minimum value is expected to be a numeric value'),'error'); } - if (!is_numeric($_POST['PropMaximum' .$i])){ + if (!is_numeric(filter_number_format($_POST['PropMaximum' .$i]))){ $InputError = 1; prnMsg(_('The maximum value is expected to be a numeric value'),'error'); } @@ -109,8 +109,8 @@ '" . $_POST['PropLabel' . $i] . "', " . $_POST['PropControlType' . $i] . ", '" . $_POST['PropDefault' .$i] . "', - '" . $_POST['PropMinimum' .$i] . "', - '" . $_POST['PropMaximum' .$i] . "', + '" . filter_number_format($_POST['PropMinimum' .$i]) . "', + '" . filter_number_format($_POST['PropMaximum' .$i]) . "', '" . $_POST['PropNumeric' .$i] . "', " . $_POST['PropReqSO' .$i] . ')'; $ErrMsg = _('Could not insert a new category property for') . $_POST['PropLabel' . $i]; @@ -119,8 +119,8 @@ $sql = "UPDATE stockcatproperties SET label ='" . $_POST['PropLabel' . $i] . "', controltype = " . $_POST['PropControlType' . $i] . ", defaultvalue = '" . $_POST['PropDefault' .$i] . "', - minimumvalue = '" . $_POST['PropMinimum' .$i] . "', - maximumvalue = '" . $_POST['PropMaximum' .$i] . "', + minimumvalue = '" . filter_number_format($_POST['PropMinimum' .$i]) . "', + maximumvalue = '" . filter_number_format($_POST['PropMaximum' .$i]) . "', numericvalue = '" . $_POST['PropNumeric' .$i] . "', reqatsalesorder = " . $_POST['PropReqSO' .$i] . " WHERE stkcatpropid =" . $_POST['PropID' .$i]; @@ -181,19 +181,19 @@ '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('items referring to this stock category code'),'warn'); } else { - $sql = "SELECT COUNT(*) FROM salesglpostings WHERE stkcat='$SelectedCategory'"; + $sql = "SELECT COUNT(*) FROM salesglpostings WHERE stkcat='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { prnMsg(_('Cannot delete this stock category because it is used by the sales') . ' - ' . _('GL posting interface') . '. ' . _('Delete any records in the Sales GL Interface set up using this stock category first'),'warn'); } else { - $sql = "SELECT COUNT(*) FROM cogsglpostings WHERE stkcat='$SelectedCategory'"; + $sql = "SELECT COUNT(*) FROM cogsglpostings WHERE stkcat='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { prnMsg(_('Cannot delete this stock category because it is used by the cost of sales') . ' - ' . _('GL posting interface') . '. ' . _('Delete any records in the Cost of Sales GL Interface set up using this stock category first'),'warn'); } else { - $sql="DELETE FROM stockcategory WHERE categoryid='$SelectedCategory'"; + $sql="DELETE FROM stockcategory WHERE categoryid='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); prnMsg(_('The stock category') . ' ' . $SelectedCategory . ' ' . _('has been deleted') . ' !','success'); unset ($SelectedCategory); @@ -304,8 +304,8 @@ $_POST['MaterialUseageVarAc'] = $myrow['materialuseagevarac']; $_POST['WIPAct'] = $myrow['wipact']; } - echo '<input type=hidden name="SelectedCategory" value="' . $SelectedCategory . '" />'; - echo '<input type=hidden name="CategoryID" value="' . $_POST['CategoryID'] . '" />'; + echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />'; + echo '<input type="hidden" name="CategoryID" value="' . $_POST['CategoryID'] . '" />'; echo '<table class="selection"> <tr> <td>' . _('Category Code') . ':</td> @@ -380,7 +380,7 @@ echo '</select></td> </tr>'; - echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen">'; + echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />'; if (isset($_POST['StockType']) and $_POST['StockType']=='L') { $Result = $PnLAccountsResult; echo '<tr><td>' . _('Recovery GL Code'); @@ -484,7 +484,9 @@ label, controltype, defaultvalue, - reqatsalesorder + reqatsalesorder, + minimumvalue, + maximumvalue FROM stockcatproperties WHERE categoryid='" . $SelectedCategory . "' ORDER BY stkcatpropid"; @@ -515,8 +517,9 @@ $HeadingCounter++; } echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />'; - echo '<tr><td><input type="textbox" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> - <td><select name="PropControlType' . $PropertyCounter . '">'; + echo '<tr> + <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> + <td><select name="PropControlType' . $PropertyCounter . '">'; if ($myrow['controltype']==0){ echo '<option selected value="0">' . _('Text Box') . '</option>'; } else { @@ -540,8 +543,8 @@ echo 'checked'; } echo '"></td> - <td><input type="textbox" "name="PropMinimum' . $PropertyCounter . '" value="' . $myrow['minimumvalue'] . '"></td> - <td><input type="textbox" name="PropMaximum' . $PropertyCounter . '" value="' . $myrow['maximumvalue'] . '"></td>'; + <td><input type="textbox" class="number" name="PropMinimum' . $PropertyCounter . '" value="' . locale_number_format($myrow['minimumvalue'],'Variable') . '" /></td> + <td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" value="' . locale_number_format($myrow['maximumvalue'],'Variable') . '" /></td>'; echo '<td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'"'; if ($myrow['reqatsalesorder']==1){ @@ -550,7 +553,7 @@ echo ''; } - echo '></td> + echo ' /></td> <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF']) . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td> </tr>'; @@ -560,14 +563,14 @@ echo '<tr> <td><input type="textbox" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td> <td><select name="PropControlType' . $PropertyCounter . '"> - <option selected value=0>' . _('Text Box') . '</option> - <option value=1>' . _('Select Box') . '</option> - <option value=2>' . _('Check Box') . '</option> + <option selected value="0">' . _('Text Box') . '</option> + <option value="1">' . _('Select Box') . '</option> + <option value="2">' . _('Check Box') . '</option> </select></td> <td><input type="textbox" name="PropDefault' . $PropertyCounter . '" /></td> <td><input type="checkbox" name="PropNumeric' . $PropertyCounter . '" /></td> - <td><input type="textbox" "name="PropMinimum' . $PropertyCounter . '" /></td> - <td><input type="textbox" name="PropMaximum' . $PropertyCounter . '" /></td> + <td><input type="textbox" class="number" "name="PropMinimum' . $PropertyCounter . '" /></td> + <td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" /></td> <td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'" /></td> </tr>'; echo '</table>'; @@ -578,7 +581,7 @@ echo '<br /> <div class="centre"> - <input type="submit" name="submit" value="' . _('Enter Information') . '"> + <input type="submit" name="submit" value="' . _('Enter Information') . '" /> </div> </form>'; Modified: trunk/StockSerialItems.php =================================================================== --- trunk/StockSerialItems.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/StockSerialItems.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -150,7 +150,7 @@ echo '<th></th>'; } else if ($Serialised == 1 and $Perishable==1) { echo '<td>'.$myrow['serialno'].'</td> - echo '<td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; + <td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; } else if ($Serialised == 0 and $Perishable==0) { echo '<td>'.$myrow['serialno'].'</td> <td class="number">'.locale_number_format($myrow['quantity'],$DecimalPlaces).'</td>'; @@ -158,8 +158,8 @@ } else if ($Serialised == 0 and $Perishable==1){ echo '<td>'.$myrow['serialno'].'</td> <td class="number">'.locale_number_format($myrow['quantity'],$DecimalPlaces). '</td> - <td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; - echo '<th></th>'; + <td>' . ConvertSQLDate($myrow['expirationdate']). '</td> + <th></th>'; } $j++; If ($j == 36){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/doc/Change.log 2011-11-23 09:22:39 UTC (rev 4751) @@ -1,6 +1,7 @@ webERP Change Log - +23/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties +23/11/11 Felix Lim: StockSerialItems.php closing quote typo. 21/11/11 Phil: UserSettings.php now checks for at least 5 character passwords WWW_Users.php CustLoginSetup.php and SupplierLoginSetup.php now also check for 4 character userids 21/11/11 Felix Lim: WWW_users.php malfomed <input type="hidden" - with no closing > 20/11/11 Phil: Shipments.php now only allows purchase order items to be added to a shipment where the shipment is authorised. Completed, rejected, cancelled orders no longer show. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-11-23 09:22:46
|
Revision: 4751 http://web-erp.svn.sourceforge.net/web-erp/?rev=4751&view=rev Author: daintree Date: 2011-11-23 09:22:39 +0000 (Wed, 23 Nov 2011) Log Message: ----------- number format changes Modified Paths: -------------- trunk/SalesCategories.php trunk/StockCategories.php trunk/StockSerialItems.php trunk/doc/Change.log Modified: trunk/SalesCategories.php =================================================================== --- trunk/SalesCategories.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/SalesCategories.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -21,6 +21,7 @@ } else if (isset($_POST['ParentCategory'])){ $ParentCategory = mb_strtoupper($_POST['ParentCategory']); } + if(isset($ParentCategory) AND $ParentCategory == 0 ) { unset($ParentCategory); } @@ -164,7 +165,7 @@ $CategoryPath = '<a href="'.htmlspecialchars($_SERVER['PHP_SELF']) . '?ParentCategory=0">' . _('Main') . '</a>' . " \\ "; $TempPath = ''; -if (isset($ParentCategory)){ +if (!isset($ParentCategory)){ $ParentCategory=0; } Modified: trunk/StockCategories.php =================================================================== --- trunk/StockCategories.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/StockCategories.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -55,11 +55,11 @@ } for ($i=0;$i<=$_POST['PropertyCounter'];$i++){ if (isset($_POST['PropNumeric' .$i]) and $_POST['PropNumeric' .$i] == true){ - if (!is_numeric($_POST['PropMinimum' .$i])){ + if (!is_numeric(filter_number_format($_POST['PropMinimum' .$i]))){ $InputError = 1; prnMsg(_('The minimum value is expected to be a numeric value'),'error'); } - if (!is_numeric($_POST['PropMaximum' .$i])){ + if (!is_numeric(filter_number_format($_POST['PropMaximum' .$i]))){ $InputError = 1; prnMsg(_('The maximum value is expected to be a numeric value'),'error'); } @@ -109,8 +109,8 @@ '" . $_POST['PropLabel' . $i] . "', " . $_POST['PropControlType' . $i] . ", '" . $_POST['PropDefault' .$i] . "', - '" . $_POST['PropMinimum' .$i] . "', - '" . $_POST['PropMaximum' .$i] . "', + '" . filter_number_format($_POST['PropMinimum' .$i]) . "', + '" . filter_number_format($_POST['PropMaximum' .$i]) . "', '" . $_POST['PropNumeric' .$i] . "', " . $_POST['PropReqSO' .$i] . ')'; $ErrMsg = _('Could not insert a new category property for') . $_POST['PropLabel' . $i]; @@ -119,8 +119,8 @@ $sql = "UPDATE stockcatproperties SET label ='" . $_POST['PropLabel' . $i] . "', controltype = " . $_POST['PropControlType' . $i] . ", defaultvalue = '" . $_POST['PropDefault' .$i] . "', - minimumvalue = '" . $_POST['PropMinimum' .$i] . "', - maximumvalue = '" . $_POST['PropMaximum' .$i] . "', + minimumvalue = '" . filter_number_format($_POST['PropMinimum' .$i]) . "', + maximumvalue = '" . filter_number_format($_POST['PropMaximum' .$i]) . "', numericvalue = '" . $_POST['PropNumeric' .$i] . "', reqatsalesorder = " . $_POST['PropReqSO' .$i] . " WHERE stkcatpropid =" . $_POST['PropID' .$i]; @@ -181,19 +181,19 @@ '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('items referring to this stock category code'),'warn'); } else { - $sql = "SELECT COUNT(*) FROM salesglpostings WHERE stkcat='$SelectedCategory'"; + $sql = "SELECT COUNT(*) FROM salesglpostings WHERE stkcat='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { prnMsg(_('Cannot delete this stock category because it is used by the sales') . ' - ' . _('GL posting interface') . '. ' . _('Delete any records in the Sales GL Interface set up using this stock category first'),'warn'); } else { - $sql = "SELECT COUNT(*) FROM cogsglpostings WHERE stkcat='$SelectedCategory'"; + $sql = "SELECT COUNT(*) FROM cogsglpostings WHERE stkcat='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { prnMsg(_('Cannot delete this stock category because it is used by the cost of sales') . ' - ' . _('GL posting interface') . '. ' . _('Delete any records in the Cost of Sales GL Interface set up using this stock category first'),'warn'); } else { - $sql="DELETE FROM stockcategory WHERE categoryid='$SelectedCategory'"; + $sql="DELETE FROM stockcategory WHERE categoryid='" . $SelectedCategory . "'"; $result = DB_query($sql,$db); prnMsg(_('The stock category') . ' ' . $SelectedCategory . ' ' . _('has been deleted') . ' !','success'); unset ($SelectedCategory); @@ -304,8 +304,8 @@ $_POST['MaterialUseageVarAc'] = $myrow['materialuseagevarac']; $_POST['WIPAct'] = $myrow['wipact']; } - echo '<input type=hidden name="SelectedCategory" value="' . $SelectedCategory . '" />'; - echo '<input type=hidden name="CategoryID" value="' . $_POST['CategoryID'] . '" />'; + echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />'; + echo '<input type="hidden" name="CategoryID" value="' . $_POST['CategoryID'] . '" />'; echo '<table class="selection"> <tr> <td>' . _('Category Code') . ':</td> @@ -380,7 +380,7 @@ echo '</select></td> </tr>'; - echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen">'; + echo '<input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />'; if (isset($_POST['StockType']) and $_POST['StockType']=='L') { $Result = $PnLAccountsResult; echo '<tr><td>' . _('Recovery GL Code'); @@ -484,7 +484,9 @@ label, controltype, defaultvalue, - reqatsalesorder + reqatsalesorder, + minimumvalue, + maximumvalue FROM stockcatproperties WHERE categoryid='" . $SelectedCategory . "' ORDER BY stkcatpropid"; @@ -515,8 +517,9 @@ $HeadingCounter++; } echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="' . $myrow['stkcatpropid'] . '" />'; - echo '<tr><td><input type="textbox" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> - <td><select name="PropControlType' . $PropertyCounter . '">'; + echo '<tr> + <td><input type="text" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" value="' . $myrow['label'] . '" /></td> + <td><select name="PropControlType' . $PropertyCounter . '">'; if ($myrow['controltype']==0){ echo '<option selected value="0">' . _('Text Box') . '</option>'; } else { @@ -540,8 +543,8 @@ echo 'checked'; } echo '"></td> - <td><input type="textbox" "name="PropMinimum' . $PropertyCounter . '" value="' . $myrow['minimumvalue'] . '"></td> - <td><input type="textbox" name="PropMaximum' . $PropertyCounter . '" value="' . $myrow['maximumvalue'] . '"></td>'; + <td><input type="textbox" class="number" name="PropMinimum' . $PropertyCounter . '" value="' . locale_number_format($myrow['minimumvalue'],'Variable') . '" /></td> + <td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" value="' . locale_number_format($myrow['maximumvalue'],'Variable') . '" /></td>'; echo '<td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'"'; if ($myrow['reqatsalesorder']==1){ @@ -550,7 +553,7 @@ echo ''; } - echo '></td> + echo ' /></td> <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF']) . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td> </tr>'; @@ -560,14 +563,14 @@ echo '<tr> <td><input type="textbox" name="PropLabel' . $PropertyCounter . '" size="50" maxlength="100" /></td> <td><select name="PropControlType' . $PropertyCounter . '"> - <option selected value=0>' . _('Text Box') . '</option> - <option value=1>' . _('Select Box') . '</option> - <option value=2>' . _('Check Box') . '</option> + <option selected value="0">' . _('Text Box') . '</option> + <option value="1">' . _('Select Box') . '</option> + <option value="2">' . _('Check Box') . '</option> </select></td> <td><input type="textbox" name="PropDefault' . $PropertyCounter . '" /></td> <td><input type="checkbox" name="PropNumeric' . $PropertyCounter . '" /></td> - <td><input type="textbox" "name="PropMinimum' . $PropertyCounter . '" /></td> - <td><input type="textbox" name="PropMaximum' . $PropertyCounter . '" /></td> + <td><input type="textbox" class="number" "name="PropMinimum' . $PropertyCounter . '" /></td> + <td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" /></td> <td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'" /></td> </tr>'; echo '</table>'; @@ -578,7 +581,7 @@ echo '<br /> <div class="centre"> - <input type="submit" name="submit" value="' . _('Enter Information') . '"> + <input type="submit" name="submit" value="' . _('Enter Information') . '" /> </div> </form>'; Modified: trunk/StockSerialItems.php =================================================================== --- trunk/StockSerialItems.php 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/StockSerialItems.php 2011-11-23 09:22:39 UTC (rev 4751) @@ -150,7 +150,7 @@ echo '<th></th>'; } else if ($Serialised == 1 and $Perishable==1) { echo '<td>'.$myrow['serialno'].'</td> - echo '<td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; + <td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; } else if ($Serialised == 0 and $Perishable==0) { echo '<td>'.$myrow['serialno'].'</td> <td class="number">'.locale_number_format($myrow['quantity'],$DecimalPlaces).'</td>'; @@ -158,8 +158,8 @@ } else if ($Serialised == 0 and $Perishable==1){ echo '<td>'.$myrow['serialno'].'</td> <td class="number">'.locale_number_format($myrow['quantity'],$DecimalPlaces). '</td> - <td>' . ConvertSQLDate($myrow['expirationdate']). '</td>'; - echo '<th></th>'; + <td>' . ConvertSQLDate($myrow['expirationdate']). '</td> + <th></th>'; } $j++; If ($j == 36){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-11-21 09:25:54 UTC (rev 4750) +++ trunk/doc/Change.log 2011-11-23 09:22:39 UTC (rev 4751) @@ -1,6 +1,7 @@ webERP Change Log - +23/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties +23/11/11 Felix Lim: StockSerialItems.php closing quote typo. 21/11/11 Phil: UserSettings.php now checks for at least 5 character passwords WWW_Users.php CustLoginSetup.php and SupplierLoginSetup.php now also check for 4 character userids 21/11/11 Felix Lim: WWW_users.php malfomed <input type="hidden" - with no closing > 20/11/11 Phil: Shipments.php now only allows purchase order items to be added to a shipment where the shipment is authorised. Completed, rejected, cancelled orders no longer show. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |