Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2011-12-17 23:07:07
|
Revision: 4781
http://web-erp.svn.sourceforge.net/web-erp/?rev=4781&view=rev
Author: daintree
Date: 2011-12-17 23:06:55 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
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
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-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -898,7 +898,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1938,8 +1938,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: 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
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2316,7 +2316,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2711,7 +2711,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3239,7 +3239,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 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:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3306,7 +3306,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3323,7 +3323,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3654,8 +3654,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4302,7 +4302,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5057,8 +5057,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "nelze načíst, protože"
@@ -5826,19 +5826,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
@@ -12724,7 +12724,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Sklad"
@@ -13002,7 +13002,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -14965,10 +14965,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "ze dne"
@@ -15002,7 +15003,7 @@
msgid "Total Qty On Hand"
msgstr "Celkem Množství na ruce"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Stav skladu"
@@ -15124,8 +15125,8 @@
msgid "Supply"
msgstr "Zásobování"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Poptávka"
@@ -19013,7 +19014,7 @@
msgstr "Datum Typ"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Časové"
@@ -19127,7 +19128,7 @@
msgid "Run Inquiry"
msgstr "Spustit Poptávka"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Hledat Vynikající Objednávky"
@@ -20639,7 +20640,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Zobrazit stavu populace"
@@ -20652,14 +20653,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Hledat Vynikající Prodejní objednávky"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Vyhledávání Dokončené Prodejní objednávky"
@@ -21008,7 +21009,7 @@
msgstr "Zásoby Změna pořadí Úroveň zprávě"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Od Umístění skladu"
@@ -23687,7 +23688,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Množství na ruce"
@@ -25049,7 +25050,7 @@
msgid "Enter Stock Adjustment"
msgstr "Zadejte skladem Nastavení"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Zobrazit Pohyby"
@@ -25484,7 +25485,7 @@
msgid "The quantity entered for line"
msgstr "Množství propuštěné do linky"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "není číselný"
@@ -25572,7 +25573,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Populace odeslání neměl žádné položky do seznamu"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Nelze zadat umístění Transfer rekord"
@@ -25621,7 +25622,7 @@
msgid "Dispatch Percent"
msgstr "Expedice procent"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Chcete-li Umístění skladu"
@@ -25690,7 +25691,7 @@
msgid "But after"
msgstr "Ale poté, co"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr "Pohyby zásob pro zvolená kritéria se nepodařilo získat, protože"
@@ -25720,7 +25721,7 @@
msgid "Only items where stock is available"
msgstr "Pouze položky, kde je k dispozici skladem"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
@@ -25729,19 +25730,19 @@
msgid "StockID"
msgstr "StockID"
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Re-Objednávka úrovni"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Množství na objednávku pro tento produkt mají být přijaty do"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Sériová čísla"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Dávky"
@@ -25758,82 +25759,112 @@
msgid "Please start over now"
msgstr "Prosím začít více než nyní"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Soubor obsahuje"
+
+#: StockLocTransfer.php:37
+msgid ""
+"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"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Část kódu vstoupila na"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "není zřízen v databázi"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Platné pouze části mohou být zapsány pro převody"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Množství propuštěné do"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "není číselný"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Množství uvedené pro převody Očekává se, že číselné"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "nemá dostatek zásob k dispozici pro převod."
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "SQL získat převod byl"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Množství uvedené v"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "pro část kódu"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Množství uvedené pro převody Očekává se, že číselné"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Množství propuštěné do"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "je menší než nebo rovna 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Opravte to nebo odebrat položku"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "nemá dostatek zásob k dispozici pro převod."
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Musíte zadat alespoň 1 bod skladem k převodu"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
msgstr "Převod musí mít jiné umístění pro příjem a umístění do odeslané z"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Nelze BEGIN Místo Transfer transakce"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Nelze COMMIT Místo transakce Transfer"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Inventární převod byly úspěšně vytvořen"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Tisk Transfer Docket"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Zásoby Umístění Transfer zásilku Reference"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Přidat další položky"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Vytvořit zásilku Transfer"
@@ -26024,7 +26055,7 @@
msgid "Stock Movements"
msgstr "Pohybů zásob"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "v jednotkách"
@@ -26435,7 +26466,7 @@
msgid "The stock item could not be updated because"
msgstr "Skladová položka nelze aktualizovat, protože"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "SQL, který byl použit k aktualizaci na skladě a neúspěšný byl"
@@ -26731,47 +26762,47 @@
msgid "Delete This Item"
msgstr "Odstranit tuto položku"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Nepodařilo se načíst požadovanou položku"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "SQL používá k načtení položek byl"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Jedná se o kitset část a nemůže mít skladového hospodářství"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "pouze celkové množství, pro vynikající prodejní objednávky je zobrazen"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "To je součástí sestavy a nemohou mít skladového hospodářství"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Toto je fiktivní část a nemůže mít skladového hospodářství"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Workorder složka poptávky po tomto výrobku z"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr "Množství na pracovních příkazů pro tento produkt mají být přijaty do"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Historie cen za prodej"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Neexistuje žádný záznam o prodeji"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Zobrazit Využití"
@@ -33715,10 +33746,6 @@
msgstr "Import Dlouhodobý majetek"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Soubor obsahuje"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "sloupy, očekávané"
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-07-17 13:46+0000\n"
"Last-Translator: Peter Hürlimann <su...@ph...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -894,7 +894,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1952,8 +1952,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: 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
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2334,7 +2334,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2736,7 +2736,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3267,7 +3267,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 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:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3334,7 +33...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-18 18:28:55
|
Revision: 4782
http://web-erp.svn.sourceforge.net/web-erp/?rev=4782&view=rev
Author: daintree
Date: 2011-12-18 18:28:48 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/UpgradeDatabase.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/BOMExtendedQty.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -320,7 +320,7 @@
$pdf->addTextWrap($Page_Width-$Right_Margin-140,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=$line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable');
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable'),'left');
$YPos -=(2*$line_height);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/UpgradeDatabase.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -1,223 +1,223 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table class="selection">
- <tr>
- <td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >
- <option selected value="Manual">' . _('Apply database changes manually') . '</option>
- <option value="3.00">' . _('Version 3.00') . '</option>
- <option value="3.01">' . _('Version 3.01') . '</option>
- <option value="3.02">' . _('Version 3.02') . '</option>
- <option value="3.03">' . _('Version 3.03') . '</option>
- <option value="3.04">' . _('Version 3.04') . '</option>
- <option value="3.05">' . _('Version 3.05') . '</option>
- <option value="3.06">' . _('Version 3.06') . '</option>
- <option value="3.07">' . _('Version 3.07') . '</option>
- <option value="3.08">' . _('Version 3.08') . '</option>
- <option value="3.09">' . _('Version 3.09') . '</option>
- <option value="3.10">' . _('Version 3.10') . '</option>
- <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
- </select></td>
- </tr>
- </table>';
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- if (strcmp($Version,$_SESSION['VersionNumber'])==0){
- prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
- } else {
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
-
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- }
- }
-
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- case '4.04.1':
- case '4.04.2':
- case '4.04.3':
- $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
- case '4.04.4':
- $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
- case '4.04.5':
- $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
- case '4.05':
- case '4.05.1':
- 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.2':
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br />
- <table>
- <tr>
- <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
- </tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (mb_substr($SQLEntries[$i], 0, 2) != '--'
- AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
- AND mb_strstr($SQLEntries[$i],'/*')==FALSE
- AND mb_strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = mb_substr($sql,0,mb_strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1025:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >
+ <option selected value="Manual">' . _('Apply database changes manually') . '</option>
+ <option value="3.00">' . _('Version 3.00') . '</option>
+ <option value="3.01">' . _('Version 3.01') . '</option>
+ <option value="3.02">' . _('Version 3.02') . '</option>
+ <option value="3.03">' . _('Version 3.03') . '</option>
+ <option value="3.04">' . _('Version 3.04') . '</option>
+ <option value="3.05">' . _('Version 3.05') . '</option>
+ <option value="3.06">' . _('Version 3.06') . '</option>
+ <option value="3.07">' . _('Version 3.07') . '</option>
+ <option value="3.08">' . _('Version 3.08') . '</option>
+ <option value="3.09">' . _('Version 3.09') . '</option>
+ <option value="3.10">' . _('Version 3.10') . '</option>
+ <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
+ </select></td>
+ </tr>
+ </table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ if (strcmp($Version,$_SESSION['VersionNumber'])==0){
+ prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
+ } else {
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ }
+ }
+
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ case '4.04.2':
+ case '4.04.3':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ case '4.04.4':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
+ case '4.04.5':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
+ case '4.05':
+ case '4.05.1':
+ 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.2':
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br />
+ <table>
+ <tr>
+ <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
+ </tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (mb_substr($SQLEntries[$i], 0, 2) != '--'
+ AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND mb_strstr($SQLEntries[$i],'/*')==FALSE
+ AND mb_strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = mb_substr($sql,0,mb_strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1025:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ 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-18 18:28:55
|
Revision: 4782
http://web-erp.svn.sourceforge.net/web-erp/?rev=4782&view=rev
Author: daintree
Date: 2011-12-18 18:28:48 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/UpgradeDatabase.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/BOMExtendedQty.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -320,7 +320,7 @@
$pdf->addTextWrap($Page_Width-$Right_Margin-140,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=$line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable');
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable'),'left');
$YPos -=(2*$line_height);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/UpgradeDatabase.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -1,223 +1,223 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table class="selection">
- <tr>
- <td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >
- <option selected value="Manual">' . _('Apply database changes manually') . '</option>
- <option value="3.00">' . _('Version 3.00') . '</option>
- <option value="3.01">' . _('Version 3.01') . '</option>
- <option value="3.02">' . _('Version 3.02') . '</option>
- <option value="3.03">' . _('Version 3.03') . '</option>
- <option value="3.04">' . _('Version 3.04') . '</option>
- <option value="3.05">' . _('Version 3.05') . '</option>
- <option value="3.06">' . _('Version 3.06') . '</option>
- <option value="3.07">' . _('Version 3.07') . '</option>
- <option value="3.08">' . _('Version 3.08') . '</option>
- <option value="3.09">' . _('Version 3.09') . '</option>
- <option value="3.10">' . _('Version 3.10') . '</option>
- <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
- </select></td>
- </tr>
- </table>';
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- if (strcmp($Version,$_SESSION['VersionNumber'])==0){
- prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
- } else {
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
-
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- }
- }
-
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- case '4.04.1':
- case '4.04.2':
- case '4.04.3':
- $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
- case '4.04.4':
- $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
- case '4.04.5':
- $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
- case '4.05':
- case '4.05.1':
- 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.2':
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br />
- <table>
- <tr>
- <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
- </tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (mb_substr($SQLEntries[$i], 0, 2) != '--'
- AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
- AND mb_strstr($SQLEntries[$i],'/*')==FALSE
- AND mb_strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = mb_substr($sql,0,mb_strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1025:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >
+ <option selected value="Manual">' . _('Apply database changes manually') . '</option>
+ <option value="3.00">' . _('Version 3.00') . '</option>
+ <option value="3.01">' . _('Version 3.01') . '</option>
+ <option value="3.02">' . _('Version 3.02') . '</option>
+ <option value="3.03">' . _('Version 3.03') . '</option>
+ <option value="3.04">' . _('Version 3.04') . '</option>
+ <option value="3.05">' . _('Version 3.05') . '</option>
+ <option value="3.06">' . _('Version 3.06') . '</option>
+ <option value="3.07">' . _('Version 3.07') . '</option>
+ <option value="3.08">' . _('Version 3.08') . '</option>
+ <option value="3.09">' . _('Version 3.09') . '</option>
+ <option value="3.10">' . _('Version 3.10') . '</option>
+ <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
+ </select></td>
+ </tr>
+ </table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ if (strcmp($Version,$_SESSION['VersionNumber'])==0){
+ prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
+ } else {
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ }
+ }
+
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ case '4.04.2':
+ case '4.04.3':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ case '4.04.4':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
+ case '4.04.5':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
+ case '4.05':
+ case '4.05.1':
+ 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.2':
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br />
+ <table>
+ <tr>
+ <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
+ </tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (mb_substr($SQLEntries[$i], 0, 2) != '--'
+ AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND mb_strstr($SQLEntries[$i],'/*')==FALSE
+ AND mb_strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = mb_substr($sql,0,mb_strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1025:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ 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-20 06:59:07
|
Revision: 4784
http://web-erp.svn.sourceforge.net/web-erp/?rev=4784&view=rev
Author: daintree
Date: 2011-12-20 06:59:01 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockTransfers.php
trunk/doc/Change.log
trunk/sql/mysql/weberp-new.sql
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/StockTransfers.php 2011-12-20 06:59:01 UTC (rev 4784)
@@ -73,10 +73,11 @@
if (isset($_GET['StockID'])){ /*carry the stockid through to the form for additional inputs */
$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer'])
- AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
- unset($_SESSION['Transfer']);
- $NewTransfer = true;
+ if (isset($_SESSION['Transfer']->TransferItem[0])) {
+ if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ unset($_SESSION['Transfer']);
+ $NewTransfer = true;
+ }
}
}
@@ -223,7 +224,7 @@
'" . $PeriodNo . "',
'To " . $_SESSION['Transfer']->StockLocationTo ."',
'" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) . "',
- '" . $QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) ."'
+ '" . ($QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record cannot be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/sql/mysql/weberp-new.sql 2011-12-20 06:59:01 UTC (rev 4784)
@@ -3142,7 +3142,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_IN.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_GB.utf8',0);
--
-- Dumping data for table `edi_orders_segs`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 06:59:07
|
Revision: 4784
http://web-erp.svn.sourceforge.net/web-erp/?rev=4784&view=rev
Author: daintree
Date: 2011-12-20 06:59:01 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockTransfers.php
trunk/doc/Change.log
trunk/sql/mysql/weberp-new.sql
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/StockTransfers.php 2011-12-20 06:59:01 UTC (rev 4784)
@@ -73,10 +73,11 @@
if (isset($_GET['StockID'])){ /*carry the stockid through to the form for additional inputs */
$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer'])
- AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
- unset($_SESSION['Transfer']);
- $NewTransfer = true;
+ if (isset($_SESSION['Transfer']->TransferItem[0])) {
+ if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ unset($_SESSION['Transfer']);
+ $NewTransfer = true;
+ }
}
}
@@ -223,7 +224,7 @@
'" . $PeriodNo . "',
'To " . $_SESSION['Transfer']->StockLocationTo ."',
'" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) . "',
- '" . $QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) ."'
+ '" . ($QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record cannot be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/sql/mysql/weberp-new.sql 2011-12-20 06:59:01 UTC (rev 4784)
@@ -3142,7 +3142,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_IN.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_GB.utf8',0);
--
-- Dumping data for table `edi_orders_segs`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 07:19:08
|
Revision: 4785
http://web-erp.svn.sourceforge.net/web-erp/?rev=4785&view=rev
Author: daintree
Date: 2011-12-20 07:19:02 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/doc/Change.log
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/StockLocTransfer.php 2011-12-20 07:19:02 UTC (rev 4785)
@@ -157,7 +157,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
+
DB_Txn_Begin($db);
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -209,8 +211,7 @@
}
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -222,9 +223,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
+
echo '<tr>
- <td>'._('From Stock Location').':</td>
+ <td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -322,7 +325,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="hidden" name="LinesCounter" value="'. $i .'" />
+ <input type="hidden" name="LinesCounter" value="'. $j .'" />
<input type=submit name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
@@ -1,10 +1,11 @@
webERP Change Log
+20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
-14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
+14/12/11 Tim Schofield: check_syntax.sh Script for checking syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 07:19:08
|
Revision: 4785
http://web-erp.svn.sourceforge.net/web-erp/?rev=4785&view=rev
Author: daintree
Date: 2011-12-20 07:19:02 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/doc/Change.log
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/StockLocTransfer.php 2011-12-20 07:19:02 UTC (rev 4785)
@@ -157,7 +157,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
+
DB_Txn_Begin($db);
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -209,8 +211,7 @@
}
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -222,9 +223,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
+
echo '<tr>
- <td>'._('From Stock Location').':</td>
+ <td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -322,7 +325,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="hidden" name="LinesCounter" value="'. $i .'" />
+ <input type="hidden" name="LinesCounter" value="'. $j .'" />
<input type=submit name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
@@ -1,10 +1,11 @@
webERP Change Log
+20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
-14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
+14/12/11 Tim Schofield: check_syntax.sh Script for checking syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-22 09:44:49
|
Revision: 4786
http://web-erp.svn.sourceforge.net/web-erp/?rev=4786&view=rev
Author: daintree
Date: 2011-12-22 09:44:35 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
trunk/includes/ConnectDB.inc
trunk/install/save.php
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/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/ShipmentCosting.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -45,25 +45,28 @@
}
$HeaderData = DB_fetch_array($GetShiptHdrResult);
-echo '<br />';
-echo '<table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th></tr>';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
+ <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th>
+ </tr>
+ <tr>
<td><b>'. _('Shipment') .': </td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
<td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td>
- </tr>';
+ </tr>
+ <tr>
+ <td>' . _('Vessel'). ': </td>
+ <td>' . $HeaderData['vessel'] . '</td>
+ <td>'. _('Voyage Ref'). ': </td>
+ <td>' . $HeaderData['voyageref'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Expected Arrival Date (ETA)') . ': </td>
+ <td>' . ConvertSQLDate($HeaderData['eta']) . '</td>
+ </tr>
+ </table>';
-echo '<tr><td>' . _('Vessel'). ': </td>
- <td>' . $HeaderData['vessel'] . '</td>
- <td>'. _('Voyage Ref'). ': </td>
- <td>' . $HeaderData['voyageref'] . '</td></tr>';
-
-echo '<tr><td>' . _('Expected Arrival Date (ETA)') . ': </td>
- <td>' . ConvertSQLDate($HeaderData['eta']) . '</td></tr>';
-
-echo '</table>';
-
/*Get the total non-stock item shipment charges */
$sql = "SELECT SUM(value)
@@ -75,7 +78,7 @@
$GetShiptCostsResult = DB_query($sql,$db, $ErrMsg);
if (DB_num_rows($GetShiptCostsResult)==0) {
echo '<br />';
- prnMsg ( _('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
+ prnMsg (_('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
include ('includes/footer.inc');
exit;
}
@@ -122,12 +125,12 @@
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
- if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
- prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
- unset($_POST['Close']);
- }
- }
- DB_data_seek($LineItemsResult,0);
+ if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
+ prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
+ unset($_POST['Close']);
+ }
+ }
+ DB_data_seek($LineItemsResult,0);
}
@@ -138,7 +141,8 @@
}
echo '<br /><table cellpadding="2" colspan="7" class="selection">';
- echo '<tr><th colspan=9><font color=navy size=3>' . _('Items on shipment'). '</font></th></tr>';
+ echo '<tr>
+ <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/Shipments.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -195,13 +195,13 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
-
+ if ($InputError==0){
+ $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
+ $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
+ }
/*The user hit the update the shipment button and there are some lines on the shipment*/
if ($InputError == 0 AND (count($_SESSION['Shipment']->LineItems) > 0 OR isset($_GET['Add']))){
- $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
- $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
-
$sql = "SELECT shiptref FROM shipments WHERE shiptref =" . $_SESSION['Shipment']->ShiptRef;
$result = DB_query($sql,$db);
if (DB_num_rows($result)==1){
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/UpgradeDatabase.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -126,8 +126,9 @@
case '4.05.3':
case '4.06':
case '4.06.1':
+ case '4.06.2':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
+ case '4.06.3':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
@@ -1,5 +1,9 @@
webERP Change Log
+22/12/11 Release 4.06.3
+
+22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
+22/12/11 Phil: Shipments.php was not retaining vessel and voyage
20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
@@ -6,8 +6,10 @@
<br /><br />
The shipment costing system is meant for use in situations where there are substantial freight costs on purchased products and the business wishes to keep track of the actual cost of these items. Many smaller businesses do these calculations on spreadsheets outside the integrated system. The advantage of bringing them inside the system is that the possibility for updating standards and calculation of variances from standard at the time the costing is completed.
<br /><br />
-Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. By changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated. The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. As a convenience to changing all the individual purchase orders allocated to the shipment, by changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated.
<br /><br />
+The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+<br /><br />
<font size="+1"><b>Shipment General Ledger Posting</b></font>
<br /><br />
Shipment charges are posted to the GRN suspense account at the time of entry of the purchase invoice. When the shipment is closed the costs of the shipment are compared against the standard cost of the shipment items taken into stock and the difference that was left in the GRN suspense account is taken to purchase variances.
@@ -16,18 +18,16 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page that shows allows, the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
<li>The voyage reference - this could refer to the HAWB in the case of airfreight
</ul>
-The above are not required if deemed unnecessary, but serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
+The above fields are required and serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
<br /><br />
In addition to the above details the Expected Time of Arrival (ETA) is required to be entered.
<br /><br />
-It is important to hit the "Update Shipment Details" button after this data is entered. As clicking one of the add links will lose this information just entered otherwise.
-<br /><br />
When the shipment entry screen is first displayed there is facility to select the inventory location where the purchase order has been requested to arrive. By default the user's default inventory location will be used, but once the inputs above are entered the location can be changed and a click on the "Update" button will then show all the purchase order items defined to arrive at the new location.
<br /><br />
Once a purchase order item has been selected to be part of the shipment the shipment entry screen will only allow other purchase order items that are also to be delivered to the same location. The location will be displayed on screen for informational purposes only.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/includes/ConnectDB.inc 2011-12-22 09:44:35 UTC (rev 4786)
@@ -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.2'; //must update manually every time there is a DB change
+$Version='4.06.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/install/save.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -325,7 +325,7 @@
$db = mysqli_connect($_POST['database_host'], $_POST['database_username'], $_POST['database_password']);
if (!$db){
- set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_error());
+ set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_connect_error());
}
if($_POST['install_tables'] == true){
@@ -339,7 +339,7 @@
$SQLScriptFile = file($path_to_root . '/sql/mysql/weberp-new.sql');
}
mysqli_query($db, 'CREATE DATABASE IF NOT EXISTS `' . mysqli_real_escape_string($db, $_POST['company_name']) . '`');
- mysqli_select_db($db, $_POST['company_name']);
+ mysqli_select_db($db, $_POST['company_name']);
$ScriptFileEntries = sizeof($SQLScriptFile);
$SQL ='';
$InAFunction = false;
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-20 07:19:02 UTC (rev 4785)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-22 09:44:35 UTC (rev 4786)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 09:04+1300\n"
+"POT-Creation-Date: 2011-12-22 22:36+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -271,7 +271,7 @@
#: CompanyPreferences.php:506 CompanyPreferences.php:508
#: 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
+#: DeliveryDetails.php:1071 DeliveryDetails.php:1114 DeliveryDetails.php:1117
#: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533
#: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:262 PaymentMethods.php:268
@@ -285,7 +285,7 @@
#: 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:355
-#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:667
#: 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
@@ -306,7 +306,7 @@
#: CompanyPreferences.php:505 CompanyPreferences.php:509
#: 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
+#: DeliveryDetails.php:1072 DeliveryDetails.php:1115 DeliveryDetails.php:1118
#: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531
#: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:263 PaymentMethods.php:269
@@ -320,7 +320,7 @@
#: 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:360
-#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:668
#: 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
@@ -386,13 +386,13 @@
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
#: 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:320 WWW_Access.php:124
-#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: 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:320
+#: WWW_Access.php:124 WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
@@ -558,7 +558,7 @@
#: AddCustomerContacts.php:61 AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
-#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
+#: DeliveryDetails.php:776 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:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
@@ -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:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 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: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
+#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
+#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
+#: UpgradeDatabase.php:205 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
@@ -891,7 +891,7 @@
#: 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
+#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
@@ -899,7 +899,7 @@
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
-#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
+#: StockTransfers.php:192 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 WorkOrderCosting.php:418
@@ -1158,7 +1158,7 @@
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
-#: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56
+#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
@@ -1208,7 +1208,7 @@
#: CustWhereAlloc.php:18 CustWhereAlloc.php:105 DailyBankTransactions.php:112
#: GLAccountInquiry.php:150 GLAccountReport.php:336 GLJournal.php:262
#: MRPReschedules.php:191 SalesByTypePeriodInquiry.php:334
-#: SelectCustomer.php:416 ShipmentCosting.php:532 ShipmentCosting.php:609
+#: SelectCustomer.php:416 ShipmentCosting.php:536 ShipmentCosting.php:613
#: StockCategories.php:217 StockLocMovements.php:88 StockMovements.php:92
#: SupplierAllocations.php:453 SupplierInquiry.php:207
#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:100
@@ -1411,7 +1411,7 @@
#: 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:233 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:234 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1542,7 +1542,7 @@
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
-#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
+#: StockTransfers.php:437 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
#: includes/PDFDeliveryDifferencesPageHeader.inc:19
@@ -1636,7 +1636,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
-#: BankMatching.php:261 ShipmentCosting.php:533 ShipmentCosting.php:610
+#: BankMatching.php:261 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:456
msgid "Ref"
msgstr "Ref"
@@ -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:328 SupplierInvoice.php:369
-#: SupplierInvoice.php:409 SupplierInvoice.php:453
+#: SupplierCredit.php:460 SupplierInvoice.php:332 SupplierInvoice.php:373
+#: SupplierInvoice.php:413 SupplierInvoice.php:457
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1919,7 +1919,7 @@
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
#: 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
+#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
#: MRPDemands.php:294 MRPDemands.php:390 MRPPlannedPurchaseOrders.php:324
@@ -1932,13 +1932,13 @@
#: PrintCustTransPortrait.php:1064 RecurringSalesOrders.php:320
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
-#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223
+#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
#: 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:401 Shipments.php:403
+#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: ShipmentCosting.php:150 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:261
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:276
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2194,7 +2194,7 @@
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
#: 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
+#: SupplierInvoice.php:292 SupplierInvoice.p...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-22 09:44:50
|
Revision: 4786
http://web-erp.svn.sourceforge.net/web-erp/?rev=4786&view=rev
Author: daintree
Date: 2011-12-22 09:44:35 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
trunk/includes/ConnectDB.inc
trunk/install/save.php
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/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/ShipmentCosting.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -45,25 +45,28 @@
}
$HeaderData = DB_fetch_array($GetShiptHdrResult);
-echo '<br />';
-echo '<table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th></tr>';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
+ <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th>
+ </tr>
+ <tr>
<td><b>'. _('Shipment') .': </td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
<td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td>
- </tr>';
+ </tr>
+ <tr>
+ <td>' . _('Vessel'). ': </td>
+ <td>' . $HeaderData['vessel'] . '</td>
+ <td>'. _('Voyage Ref'). ': </td>
+ <td>' . $HeaderData['voyageref'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Expected Arrival Date (ETA)') . ': </td>
+ <td>' . ConvertSQLDate($HeaderData['eta']) . '</td>
+ </tr>
+ </table>';
-echo '<tr><td>' . _('Vessel'). ': </td>
- <td>' . $HeaderData['vessel'] . '</td>
- <td>'. _('Voyage Ref'). ': </td>
- <td>' . $HeaderData['voyageref'] . '</td></tr>';
-
-echo '<tr><td>' . _('Expected Arrival Date (ETA)') . ': </td>
- <td>' . ConvertSQLDate($HeaderData['eta']) . '</td></tr>';
-
-echo '</table>';
-
/*Get the total non-stock item shipment charges */
$sql = "SELECT SUM(value)
@@ -75,7 +78,7 @@
$GetShiptCostsResult = DB_query($sql,$db, $ErrMsg);
if (DB_num_rows($GetShiptCostsResult)==0) {
echo '<br />';
- prnMsg ( _('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
+ prnMsg (_('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
include ('includes/footer.inc');
exit;
}
@@ -122,12 +125,12 @@
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
- if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
- prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
- unset($_POST['Close']);
- }
- }
- DB_data_seek($LineItemsResult,0);
+ if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
+ prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
+ unset($_POST['Close']);
+ }
+ }
+ DB_data_seek($LineItemsResult,0);
}
@@ -138,7 +141,8 @@
}
echo '<br /><table cellpadding="2" colspan="7" class="selection">';
- echo '<tr><th colspan=9><font color=navy size=3>' . _('Items on shipment'). '</font></th></tr>';
+ echo '<tr>
+ <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/Shipments.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -195,13 +195,13 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
-
+ if ($InputError==0){
+ $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
+ $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
+ }
/*The user hit the update the shipment button and there are some lines on the shipment*/
if ($InputError == 0 AND (count($_SESSION['Shipment']->LineItems) > 0 OR isset($_GET['Add']))){
- $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
- $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
-
$sql = "SELECT shiptref FROM shipments WHERE shiptref =" . $_SESSION['Shipment']->ShiptRef;
$result = DB_query($sql,$db);
if (DB_num_rows($result)==1){
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/UpgradeDatabase.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -126,8 +126,9 @@
case '4.05.3':
case '4.06':
case '4.06.1':
+ case '4.06.2':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
+ case '4.06.3':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
@@ -1,5 +1,9 @@
webERP Change Log
+22/12/11 Release 4.06.3
+
+22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
+22/12/11 Phil: Shipments.php was not retaining vessel and voyage
20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
@@ -6,8 +6,10 @@
<br /><br />
The shipment costing system is meant for use in situations where there are substantial freight costs on purchased products and the business wishes to keep track of the actual cost of these items. Many smaller businesses do these calculations on spreadsheets outside the integrated system. The advantage of bringing them inside the system is that the possibility for updating standards and calculation of variances from standard at the time the costing is completed.
<br /><br />
-Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. By changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated. The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. As a convenience to changing all the individual purchase orders allocated to the shipment, by changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated.
<br /><br />
+The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+<br /><br />
<font size="+1"><b>Shipment General Ledger Posting</b></font>
<br /><br />
Shipment charges are posted to the GRN suspense account at the time of entry of the purchase invoice. When the shipment is closed the costs of the shipment are compared against the standard cost of the shipment items taken into stock and the difference that was left in the GRN suspense account is taken to purchase variances.
@@ -16,18 +18,16 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page that shows allows, the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
<li>The voyage reference - this could refer to the HAWB in the case of airfreight
</ul>
-The above are not required if deemed unnecessary, but serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
+The above fields are required and serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
<br /><br />
In addition to the above details the Expected Time of Arrival (ETA) is required to be entered.
<br /><br />
-It is important to hit the "Update Shipment Details" button after this data is entered. As clicking one of the add links will lose this information just entered otherwise.
-<br /><br />
When the shipment entry screen is first displayed there is facility to select the inventory location where the purchase order has been requested to arrive. By default the user's default inventory location will be used, but once the inputs above are entered the location can be changed and a click on the "Update" button will then show all the purchase order items defined to arrive at the new location.
<br /><br />
Once a purchase order item has been selected to be part of the shipment the shipment entry screen will only allow other purchase order items that are also to be delivered to the same location. The location will be displayed on screen for informational purposes only.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/includes/ConnectDB.inc 2011-12-22 09:44:35 UTC (rev 4786)
@@ -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.2'; //must update manually every time there is a DB change
+$Version='4.06.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/install/save.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -325,7 +325,7 @@
$db = mysqli_connect($_POST['database_host'], $_POST['database_username'], $_POST['database_password']);
if (!$db){
- set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_error());
+ set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_connect_error());
}
if($_POST['install_tables'] == true){
@@ -339,7 +339,7 @@
$SQLScriptFile = file($path_to_root . '/sql/mysql/weberp-new.sql');
}
mysqli_query($db, 'CREATE DATABASE IF NOT EXISTS `' . mysqli_real_escape_string($db, $_POST['company_name']) . '`');
- mysqli_select_db($db, $_POST['company_name']);
+ mysqli_select_db($db, $_POST['company_name']);
$ScriptFileEntries = sizeof($SQLScriptFile);
$SQL ='';
$InAFunction = false;
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-20 07:19:02 UTC (rev 4785)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-22 09:44:35 UTC (rev 4786)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 09:04+1300\n"
+"POT-Creation-Date: 2011-12-22 22:36+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -271,7 +271,7 @@
#: CompanyPreferences.php:506 CompanyPreferences.php:508
#: 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
+#: DeliveryDetails.php:1071 DeliveryDetails.php:1114 DeliveryDetails.php:1117
#: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533
#: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:262 PaymentMethods.php:268
@@ -285,7 +285,7 @@
#: 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:355
-#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:667
#: 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
@@ -306,7 +306,7 @@
#: CompanyPreferences.php:505 CompanyPreferences.php:509
#: 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
+#: DeliveryDetails.php:1072 DeliveryDetails.php:1115 DeliveryDetails.php:1118
#: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531
#: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:263 PaymentMethods.php:269
@@ -320,7 +320,7 @@
#: 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:360
-#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:668
#: 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
@@ -386,13 +386,13 @@
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
#: 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:320 WWW_Access.php:124
-#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: 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:320
+#: WWW_Access.php:124 WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
@@ -558,7 +558,7 @@
#: AddCustomerContacts.php:61 AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
-#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
+#: DeliveryDetails.php:776 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:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
@@ -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:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 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: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
+#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
+#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
+#: UpgradeDatabase.php:205 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
@@ -891,7 +891,7 @@
#: 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
+#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
@@ -899,7 +899,7 @@
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
-#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
+#: StockTransfers.php:192 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 WorkOrderCosting.php:418
@@ -1158,7 +1158,7 @@
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
-#: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56
+#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
@@ -1208,7 +1208,7 @@
#: CustWhereAlloc.php:18 CustWhereAlloc.php:105 DailyBankTransactions.php:112
#: GLAccountInquiry.php:150 GLAccountReport.php:336 GLJournal.php:262
#: MRPReschedules.php:191 SalesByTypePeriodInquiry.php:334
-#: SelectCustomer.php:416 ShipmentCosting.php:532 ShipmentCosting.php:609
+#: SelectCustomer.php:416 ShipmentCosting.php:536 ShipmentCosting.php:613
#: StockCategories.php:217 StockLocMovements.php:88 StockMovements.php:92
#: SupplierAllocations.php:453 SupplierInquiry.php:207
#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:100
@@ -1411,7 +1411,7 @@
#: 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:233 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:234 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1542,7 +1542,7 @@
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
-#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
+#: StockTransfers.php:437 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
#: includes/PDFDeliveryDifferencesPageHeader.inc:19
@@ -1636,7 +1636,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
-#: BankMatching.php:261 ShipmentCosting.php:533 ShipmentCosting.php:610
+#: BankMatching.php:261 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:456
msgid "Ref"
msgstr "Ref"
@@ -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:328 SupplierInvoice.php:369
-#: SupplierInvoice.php:409 SupplierInvoice.php:453
+#: SupplierCredit.php:460 SupplierInvoice.php:332 SupplierInvoice.php:373
+#: SupplierInvoice.php:413 SupplierInvoice.php:457
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1919,7 +1919,7 @@
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
#: 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
+#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
#: MRPDemands.php:294 MRPDemands.php:390 MRPPlannedPurchaseOrders.php:324
@@ -1932,13 +1932,13 @@
#: PrintCustTransPortrait.php:1064 RecurringSalesOrders.php:320
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
-#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223
+#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
#: 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:401 Shipments.php:403
+#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: ShipmentCosting.php:150 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:261
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:276
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2194,7 +2194,7 @@
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
#: 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
+#: SupplierInvoice.php:292 SupplierInvoice.p...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-27 20:27:24
|
Revision: 4787
http://web-erp.svn.sourceforge.net/web-erp/?rev=4787&view=rev
Author: daintree
Date: 2011-12-27 20:27:16 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PDFStockLocTransfer.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/PDFStockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,9 +1,8 @@
<?php
/* $Id$*/
-
-$title = _('Stock Location Transfer Docket Error');
include('includes/session.inc');
+$title = _('Stock Location Transfer Docket Error');
include('includes/PDFStarter.php');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,5 +1,7 @@
webERP Change Log
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
@@ -1418,228 +1420,228 @@
30/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - New purchase order functionality
27/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - Add in extra fields for purchase orders
27/06/09 Tim: PO_AuthorisationLevels.php - New script to assign authorisation levels for purchase orders
-27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OrderDetails.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPShortages.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReport.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRP.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Logout.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Locations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove
+27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove
+27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove
+27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove
+27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove
+27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove
+27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove
+27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove
+27/06/09 Tim: OrderDetails.php - Change to lower case html and remove
+27/06/09 Tim: MRPShortages.php - Change to lower case html and remove
+27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove
+27/06/09 Tim: MRPReport.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove
+27/06/09 Tim: MRP.php - Change to lower case html and remove
+27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: Logout.php - Change to lower case html and remove
+27/06/09 Tim: Locations.php - Change to lower case html and remove
+27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove
27/06/09 Tim: index.php - New menu items
-27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTags.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove
+27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove
+27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove
+27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLTags.php - Change to lower case html and remove
27/06/09 Tim: GLTagProfit_Loss.php - Script for creating Profit and Loss accounts by Tag
-27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLJournal.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBudgets.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccounts.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GetStockImage.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geocode.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FreightCosts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Factors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Currencies.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditStatus.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMs.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMListing.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndented.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankMatching.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankAccounts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AuditTrail.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Areas.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove
+27/06/09 Tim: GLJournal.php - Change to lower case html and remove
+27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLBudgets.php - Change to lower case html and remove
+27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove
+27/06/09 Tim: GLAccounts.php - Change to lower case html and remove
+27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GetStockImage.php - Change to lower case html and remove
+26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove
+26/06/09 Tim: geocode.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove
+26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove
+26/06/09 Tim: FreightCosts.php - Change to lower case html and remove
+26/06/09 Tim: Factors.php - Change to lower case html and remove
+26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove
+26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove
+26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove
+26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove
+26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove
+26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove
+26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove
+26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove
+26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove
+26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove
+26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove
+26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove
+26/06/09 Tim: Customers.php - Change to lower case html and remove
+26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove
+26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove
+26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove
+26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove
+26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove
+26/06/09 Tim: Currencies.php - Change to lower case html and remove
+26/06/09 Tim: CreditStatus.php - Change to lower case html and remove
+26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove
+26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove
+26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove
+26/06/09 Tim: BOMs.php - Change to lower case html and remove
+26/06/09 Tim: BOMListing.php - Change to lower case html and remove
+26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndented.php - Change to lower case html and remove
+26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove
+26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove
+26/06/09 Tim: BankMatching.php - Change to lower case html and remove
+26/06/09 Tim: BankAccounts.php - Change to lower case html and remove
+26/06/09 Tim: AuditTrail.php - Change to lower case html and remove
+26/06/09 Tim: Areas.php - Change to lower case html and remove
+26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove
+26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove
24/06/09 turbopt: SelectProduct.php - Correct field line up in inventory item display
-24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFGrn.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove <center> tags
+24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove
+24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove
+24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove
+24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove
+24/06/09 Tim: PDFGrn.php - Change to lower case html and remove
+24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove
24/06/09 Tim: ConfirmDispatch_Invoice.php - Remove backslashes from narrative
24/06/09 Tim: SelectOrderItems.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTransPortrait.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTrans.php - Remove backslashes from narrative
-21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PurchData.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: POReport.php - Change to lower case html and remove <center> tags
+21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove
+21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove
+21/06/09 Tim: PurchData.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove
+21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove
+21/06/09 Tim: Prices.php - Change to lower case html and remove
+21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove
+21/06/09 Tim: POReport.php - Change to lower case html and remove
21/06/09 Lindsay: PrintCustOrder_generic.php - Prevent blank line on second page
21/06/09 Lindsay: PrintCustTrans.php - Prevent blank page being printed every second page
21/06/09 Lindsay: Z_ChangeStockCode.php - Add in check for woitems table
19/06/09 Murray: some improvements the html and css styles
-19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Stocks.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCounts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCheck.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shippers.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectProduct.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesTypes.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesPeople.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGraph.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove <center> tags
+19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove
+19/06/09 Tim: Stocks.php - Change to lower case html and remove
+19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove
+19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove
+19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove
+19/06/09 Tim: StockMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove
+19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockCounts.php - Change to lower case html and remove
+19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove
+19/06/09 Tim: StockCheck.php - Change to lower case html and remove
+19/06/09 Tim: StockCategories.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
+19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove
+19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove
+19/06/09 Tim: Shippers.php - Change to lower case html and remove
+19/06/09 Tim: Shipments.php - Change to lower case html and remove
+19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove
+19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove
+19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectProduct.php - Change to lower case html and remove
+19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove
+19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove
+19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove
+19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove
+19/06/09 Tim: SalesTypes.php - Change to lower case html and remove
+19/06/09 Tim: SalesPeople.php - Change to lower case html and remove
+19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove
+19/06/09 Tim: SalesGraph.php - Change to lower case html and remove
+19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove
+19/06/09 Tim: SalesCategories.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove
12/6/09 Mark: Added SalesInquiry.php - detailed or summarized inquiries on Sales Orders
-17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeSto...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-27 20:27:24
|
Revision: 4787
http://web-erp.svn.sourceforge.net/web-erp/?rev=4787&view=rev
Author: daintree
Date: 2011-12-27 20:27:16 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PDFStockLocTransfer.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/PDFStockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,9 +1,8 @@
<?php
/* $Id$*/
-
-$title = _('Stock Location Transfer Docket Error');
include('includes/session.inc');
+$title = _('Stock Location Transfer Docket Error');
include('includes/PDFStarter.php');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,5 +1,7 @@
webERP Change Log
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
@@ -1418,228 +1420,228 @@
30/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - New purchase order functionality
27/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - Add in extra fields for purchase orders
27/06/09 Tim: PO_AuthorisationLevels.php - New script to assign authorisation levels for purchase orders
-27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OrderDetails.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPShortages.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReport.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRP.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Logout.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Locations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove
+27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove
+27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove
+27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove
+27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove
+27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove
+27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove
+27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove
+27/06/09 Tim: OrderDetails.php - Change to lower case html and remove
+27/06/09 Tim: MRPShortages.php - Change to lower case html and remove
+27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove
+27/06/09 Tim: MRPReport.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove
+27/06/09 Tim: MRP.php - Change to lower case html and remove
+27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: Logout.php - Change to lower case html and remove
+27/06/09 Tim: Locations.php - Change to lower case html and remove
+27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove
27/06/09 Tim: index.php - New menu items
-27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTags.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove
+27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove
+27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove
+27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLTags.php - Change to lower case html and remove
27/06/09 Tim: GLTagProfit_Loss.php - Script for creating Profit and Loss accounts by Tag
-27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLJournal.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBudgets.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccounts.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GetStockImage.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geocode.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FreightCosts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Factors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Currencies.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditStatus.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMs.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMListing.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndented.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankMatching.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankAccounts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AuditTrail.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Areas.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove
+27/06/09 Tim: GLJournal.php - Change to lower case html and remove
+27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLBudgets.php - Change to lower case html and remove
+27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove
+27/06/09 Tim: GLAccounts.php - Change to lower case html and remove
+27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GetStockImage.php - Change to lower case html and remove
+26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove
+26/06/09 Tim: geocode.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove
+26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove
+26/06/09 Tim: FreightCosts.php - Change to lower case html and remove
+26/06/09 Tim: Factors.php - Change to lower case html and remove
+26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove
+26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove
+26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove
+26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove
+26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove
+26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove
+26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove
+26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove
+26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove
+26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove
+26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove
+26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove
+26/06/09 Tim: Customers.php - Change to lower case html and remove
+26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove
+26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove
+26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove
+26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove
+26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove
+26/06/09 Tim: Currencies.php - Change to lower case html and remove
+26/06/09 Tim: CreditStatus.php - Change to lower case html and remove
+26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove
+26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove
+26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove
+26/06/09 Tim: BOMs.php - Change to lower case html and remove
+26/06/09 Tim: BOMListing.php - Change to lower case html and remove
+26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndented.php - Change to lower case html and remove
+26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove
+26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove
+26/06/09 Tim: BankMatching.php - Change to lower case html and remove
+26/06/09 Tim: BankAccounts.php - Change to lower case html and remove
+26/06/09 Tim: AuditTrail.php - Change to lower case html and remove
+26/06/09 Tim: Areas.php - Change to lower case html and remove
+26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove
+26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove
24/06/09 turbopt: SelectProduct.php - Correct field line up in inventory item display
-24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFGrn.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove <center> tags
+24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove
+24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove
+24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove
+24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove
+24/06/09 Tim: PDFGrn.php - Change to lower case html and remove
+24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove
24/06/09 Tim: ConfirmDispatch_Invoice.php - Remove backslashes from narrative
24/06/09 Tim: SelectOrderItems.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTransPortrait.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTrans.php - Remove backslashes from narrative
-21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PurchData.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: POReport.php - Change to lower case html and remove <center> tags
+21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove
+21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove
+21/06/09 Tim: PurchData.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove
+21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove
+21/06/09 Tim: Prices.php - Change to lower case html and remove
+21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove
+21/06/09 Tim: POReport.php - Change to lower case html and remove
21/06/09 Lindsay: PrintCustOrder_generic.php - Prevent blank line on second page
21/06/09 Lindsay: PrintCustTrans.php - Prevent blank page being printed every second page
21/06/09 Lindsay: Z_ChangeStockCode.php - Add in check for woitems table
19/06/09 Murray: some improvements the html and css styles
-19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Stocks.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCounts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCheck.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shippers.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectProduct.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesTypes.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesPeople.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGraph.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove <center> tags
+19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove
+19/06/09 Tim: Stocks.php - Change to lower case html and remove
+19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove
+19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove
+19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove
+19/06/09 Tim: StockMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove
+19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockCounts.php - Change to lower case html and remove
+19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove
+19/06/09 Tim: StockCheck.php - Change to lower case html and remove
+19/06/09 Tim: StockCategories.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
+19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove
+19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove
+19/06/09 Tim: Shippers.php - Change to lower case html and remove
+19/06/09 Tim: Shipments.php - Change to lower case html and remove
+19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove
+19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove
+19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectProduct.php - Change to lower case html and remove
+19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove
+19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove
+19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove
+19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove
+19/06/09 Tim: SalesTypes.php - Change to lower case html and remove
+19/06/09 Tim: SalesPeople.php - Change to lower case html and remove
+19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove
+19/06/09 Tim: SalesGraph.php - Change to lower case html and remove
+19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove
+19/06/09 Tim: SalesCategories.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove
12/6/09 Mark: Added SalesInquiry.php - detailed or summarized inquiries on Sales Orders
-17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeSto...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-27 21:47:45
|
Revision: 4788
http://web-erp.svn.sourceforge.net/web-erp/?rev=4788&view=rev
Author: daintree
Date: 2011-12-27 21:47:35 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/DeliveryDetails.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/StockLocTransfer.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/DefineCartClass.php
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.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/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -535,7 +535,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
}
} //page not called from itself - POST variables not set
}
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/DeliveryDetails.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -517,7 +517,7 @@
WoRealRequirements($db, $WONo, $_SESSION['DefaultFactoryLocation'], $StockItem->StockID);
$FactoryManagerEmail = _('A new work order has been created for') .
- ":\n" . $StockItem->StockID . ' - ' . $StockItem->Descr . ' x ' . $WOQuantity . ' ' . $StockItem->UOM .
+ ":\n" . $StockItem->StockID . ' - ' . $StockItem->ItemDescription . ' x ' . $WOQuantity . ' ' . $StockItem->Units .
"\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
if ($StockItem->Serialised AND $StockItem->NextSerialNo>0){
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectCreditItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -574,7 +574,8 @@
'No',
$LineItem->ItemDue,
$LineItem->POLine,
- 0);
+ 0,
+ $identifier);
}
}
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectOrderItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1024,8 +1024,8 @@
/*not forgetting the location records too */
$InsertStkLocRecsResult = DB_query("INSERT INTO locstock (loccode,
stockid)
- SELECT loccode, '" . $AssetStockID . "'
- FROM locations",$db);
+ SELECT loccode, '" . $AssetStockID . "'
+ FROM locations",$db);
/*Now the asset has been added to the stock master we can add it to the sales order */
$NewItemDue = date($_SESSION['DefaultDateFormat']);
if (isset($_POST['POLine'])){
@@ -1138,7 +1138,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
} //within credit limit so make changes
} //there are changes to the order line to process
} //page not called from itself - POST variables not set
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/StockLocTransfer.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -88,6 +88,7 @@
} //end if there is a CSV file to import
else { // process the manually input lines
$ErrorMessage='';
+
if (isset($_POST['ClearAll'])){
unset($_POST['EnterMoreItems']);
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
@@ -96,7 +97,7 @@
}
}
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['Delete' . $i])){
+ if (isset($_POST['Delete' . $i])){ //check box to delete the item is set
unset($_POST['StockID' . $i]);
unset($_POST['StockQTY' . $i]);
}
@@ -303,23 +304,23 @@
$j++;
}
}else {
- $i = 0;
+ $j = 0;
}
// $i is incremented an extra time, so 9 to get 10...
- $z=($i + 9);
+ $z=($j + 9);
- while($i < $z) {
- if (!isset($_POST['StockID' . $i])) {
- $_POST['StockID' . $i]='';
+ while($j < $z) {
+ if (!isset($_POST['StockID' . $j])) {
+ $_POST['StockID' . $j]='';
}
- if (!isset($_POST['StockQTY' . $i])) {
- $_POST['StockQTY' . $i]=0;
+ if (!isset($_POST['StockQTY' . $j])) {
+ $_POST['StockQTY' . $j]=0;
}
echo '<tr>
- <td><input type="text" name="StockID' . $i .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
- <td><input type="text" name="StockQTY' . $i .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i]) . '" /></td>
+ <td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $j] . '" /></td>
+ <td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $j]) . '" /></td>
</tr>';
- $i++;
+ $j++;
}
echo '</table>
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/UpgradeDatabase.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -127,8 +127,9 @@
case '4.06':
case '4.06.1':
case '4.06.2':
+ case '4.06.3':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.3':
+ case '4.06.4':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/doc/Change.log 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1,7 +1,10 @@
webERP Change Log
-27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+28/12/11 Release 4.06.4
+28/12/11 Phil: SelectCreditItems.php SelectOrderItems.php CounterSales.php includes/DefineCartClass.php fixes for ExistingOrder . $identifier
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title. Fixes to allow manual entry.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/ConnectDB.inc 2011-12-27 21:47:35 UTC (rev 4788)
@@ -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.3'; //must update manually every time there is a DB change
+$Version='4.06.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -184,7 +184,8 @@
$UpdateDB='No',
$ItemDue,
$POLine,
- $GPPercent){
+ $GPPercent,
+ $identifier){
if ($Qty>0){
$this->LineItems[$UpdateLineNumber]->Quantity = $Qty;
@@ -200,10 +201,10 @@
$result = DB_query("UPDATE salesorderdetails SET quantity=" . $Qty . ",
unitprice=" . $Price . ",
discountpercent=" . $Disc . ",
- narrative ='" . DB_escape_string($Narrative) . "',
+ narrative ='" . $Narrative . "',
itemdue = '" . FormatDateForSQL($ItemDue) . "',
- poline = '" . DB_escape_string($POLine) . "'
- WHERE orderno=" . $_SESSION['ExistingOrder'] . "
+ poline = '" . $POLine . "'
+ WHERE orderno=" . $_SESSION['ExistingOrder'.$identifier] . "
AND orderlineno=" . $UpdateLineNumber
, $db
, _('The order line number') . ' ' . $UpdateLineNumber . ' ' . _('could not be updated'));
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-27 20:27:16 UTC (rev 4787)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-27 21:47:35 UTC (rev 4788)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 22:36+1300\n"
+"POT-Creation-Date: 2011-12-28 10:44+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -206,8 +206,8 @@
#: 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:2025
-#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2026
+#: CounterSales.php:2152 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
@@ -218,7 +218,7 @@
#: Labels.php:115 Labels.php:270 MRPReport.php:515 OutstandingGRNs.php:160
#: PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28
-#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17
+#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:16
#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8
#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258
@@ -227,8 +227,8 @@
#: 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:577 SelectOrderItems.php:1479
-#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533
+#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1480
+#: SelectOrderItems.php:1604 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:122 Shippers.php:158 Shipt_Select.php:8
@@ -369,7 +369,7 @@
#: 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:821 Credit_Invoice.php:381 CreditStatus.php:175
+#: CounterSales.php:822 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
@@ -382,11 +382,11 @@
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
#: 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
+#: SecurityTokens.php:129 SelectCreditItems.php:765 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
-#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
+#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1399
#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
-#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:302
#: 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
-#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
-#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
-#: UpgradeDatabase.php:205 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:182 UpgradeDatabase.php:185
+#: UpgradeDatabase.php:188 UpgradeDatabase.php:191 UpgradeDatabase.php:194
+#: UpgradeDatabase.php:197 UpgradeDatabase.php:200 UpgradeDatabase.php:203
+#: UpgradeDatabase.php:206 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
@@ -888,14 +888,14 @@
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
#: 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
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1366
+#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
-#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
+#: ReverseGRN.php:374 SelectCreditItems.php:1409 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
+#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1167,8 +1167,8 @@
#: 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
-#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952
-#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504
+#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:953
+#: SelectOrderItems.php:1610 SelectOrderItems.php:1613 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
@@ -1648,7 +1648,7 @@
#: Payments.php:1046 PcAssignCashToTab.php:222 PcAssignCashToTab.php:345
#: PcAuthorizeExpenses.php:90 PcClaimExpensesFromTab.php:212
#: PcClaimExpensesFromTab.php:365 PcReportTab.php:172 PcReportTab.php:326
-#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:681
+#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:682
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
@@ -1849,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:821 Customers.php:1091
-#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540
+#: BankReconciliation.php:354 CounterSales.php:822 Customers.php:1091
+#: SelectOrderItems.php:1410 Stocks.php:1204 WorkOrderCosting.php:540
#: WorkOrderEntry.php:569
msgid "Are You Sure?"
msgstr "Opravdu provést?"
@@ -1917,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:741
-#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
+#: Contracts.php:961 Contracts.php:997 CounterSales.php:742
+#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1933,12 +1933,12 @@
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
-#: SelectCreditItems.php:673 SelectCreditItems.php:1034
-#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
-#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: SelectCreditItems.php:674 SelectCreditItems.php:1035
+#: SelectOrderItems.php:1334 SelectOrderItems.php:1492
+#: SelectOrderItems.php:1676 SelectOrderItems.php:1803 ShipmentCosting.php:149
#: ShipmentCosting.php:150 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:276
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:277
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2097,10 +2097,10 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
-#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
+#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2169,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:2030
-#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2031
+#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2187,8 +2187,8 @@
#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
#: SelectCompletedOrder.php:550 SelectContract.php:153
-#: SelectCreditItems.php:988 SelectOrderItems.php:1485
-#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733
+#: SelectCreditItems.php:989 SelectOrderItems.php:1486
+#: SelectOrderItems.php:1670 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
@@ -2284,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:2182
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2183
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2292,10 +2292,10 @@
#: 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
+#: SelectCreditItems.php:972 SelectCustomer.php:269 SelectCustomer.php:279
#: SelectCustomer.php:288 SelectCustomer.php:298 SelectCustomer.php:344
#: SelectGLAccount.php:90 SelectOrderItems.php:587 SelectOrderItems.php:590
-#: SelectOrderItems.php:1637 SelectProduct.php:523 SelectSalesOrder.php:565
+#: SelectOrderItems.php:1638 SelectProduct.php:523 SelectSalesOrder.php:565
#: SelectSupplier.php:209 SelectWorkOrder.php:179 Shipt_Select.php:173
#: SuppFixedAssetChgs.php:122 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667
@@ -2324,11 +2324,11 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2186 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058
-#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:978
+#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
-#: SelectOrderItems.php:1644 SelectProduct.php:531 SelectSupplier.php:219
+#: SelectOrderItems.php:1645 SelectProduct.php:531 SelectSupplier.php:219
#: SelectSupplier.php:252 SupplierTenders.php:367 WorkOrderEntry.php:610
#: WorkOrderIssue.php:672
msgid "Search Now"
@@ -2361,15 +2361,15 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:112 BOMs.php:528 BOMs.php:854 ContractBOM.php:345
-#: CounterSales.php:2029 CounterSales.php:2214 CustomerBranches.php:367
+#: CounterSales.php:2030 CounterSales.php:2215 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: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:549 SelectCreditItems.php:987
-#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1484
-#: SelectOrderItems.php:1668 SelectProduct.php:732 SelectSalesOrder.php:580
+#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:988
+#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1485
+#: SelectOrderItems.php:1669 SelectProduct.php:732 SelectSalesOrder.php:580
#: SelectSupplier.php:258 SelectWorkOrder.php:191 Shipt_Select.php:189
#: SpecialOrder.php:142 SupplierTenders.php:489 SuppPriceList.php:289
#: TopItems.php:177 WorkOrderEntry.php:622 WorkOrderIssue.php:691
@@ -2379,12 +2379,12 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2031 CounterSales.php:2216
+#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
#: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105
#: 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
+#: SelectCompletedOrder.php:554 SelectCreditItems.php:990
+#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 SelectProduct.php:117
#: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194
#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193
#: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180
@@ -2664,8 +2664,8 @@
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:1021 CounterSales.php:1413
-#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1453
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
+#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
msgstr "Sestava"
@@ -3059,7 +3059,7 @@
#: 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
+#: SelectCreditItems.php:924 SMTPServer.php:63 StockCostUpdate.php:184
#: StockReorderLevel.php:103 Stocks.php:1198 SystemParameters.php:1032
#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:332
msgid "Update"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1250
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: Pa...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-27 21:47:45
|
Revision: 4788
http://web-erp.svn.sourceforge.net/web-erp/?rev=4788&view=rev
Author: daintree
Date: 2011-12-27 21:47:35 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/DeliveryDetails.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/StockLocTransfer.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/DefineCartClass.php
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.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/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -535,7 +535,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
}
} //page not called from itself - POST variables not set
}
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/DeliveryDetails.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -517,7 +517,7 @@
WoRealRequirements($db, $WONo, $_SESSION['DefaultFactoryLocation'], $StockItem->StockID);
$FactoryManagerEmail = _('A new work order has been created for') .
- ":\n" . $StockItem->StockID . ' - ' . $StockItem->Descr . ' x ' . $WOQuantity . ' ' . $StockItem->UOM .
+ ":\n" . $StockItem->StockID . ' - ' . $StockItem->ItemDescription . ' x ' . $WOQuantity . ' ' . $StockItem->Units .
"\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
if ($StockItem->Serialised AND $StockItem->NextSerialNo>0){
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectCreditItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -574,7 +574,8 @@
'No',
$LineItem->ItemDue,
$LineItem->POLine,
- 0);
+ 0,
+ $identifier);
}
}
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectOrderItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1024,8 +1024,8 @@
/*not forgetting the location records too */
$InsertStkLocRecsResult = DB_query("INSERT INTO locstock (loccode,
stockid)
- SELECT loccode, '" . $AssetStockID . "'
- FROM locations",$db);
+ SELECT loccode, '" . $AssetStockID . "'
+ FROM locations",$db);
/*Now the asset has been added to the stock master we can add it to the sales order */
$NewItemDue = date($_SESSION['DefaultDateFormat']);
if (isset($_POST['POLine'])){
@@ -1138,7 +1138,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
} //within credit limit so make changes
} //there are changes to the order line to process
} //page not called from itself - POST variables not set
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/StockLocTransfer.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -88,6 +88,7 @@
} //end if there is a CSV file to import
else { // process the manually input lines
$ErrorMessage='';
+
if (isset($_POST['ClearAll'])){
unset($_POST['EnterMoreItems']);
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
@@ -96,7 +97,7 @@
}
}
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['Delete' . $i])){
+ if (isset($_POST['Delete' . $i])){ //check box to delete the item is set
unset($_POST['StockID' . $i]);
unset($_POST['StockQTY' . $i]);
}
@@ -303,23 +304,23 @@
$j++;
}
}else {
- $i = 0;
+ $j = 0;
}
// $i is incremented an extra time, so 9 to get 10...
- $z=($i + 9);
+ $z=($j + 9);
- while($i < $z) {
- if (!isset($_POST['StockID' . $i])) {
- $_POST['StockID' . $i]='';
+ while($j < $z) {
+ if (!isset($_POST['StockID' . $j])) {
+ $_POST['StockID' . $j]='';
}
- if (!isset($_POST['StockQTY' . $i])) {
- $_POST['StockQTY' . $i]=0;
+ if (!isset($_POST['StockQTY' . $j])) {
+ $_POST['StockQTY' . $j]=0;
}
echo '<tr>
- <td><input type="text" name="StockID' . $i .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
- <td><input type="text" name="StockQTY' . $i .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i]) . '" /></td>
+ <td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $j] . '" /></td>
+ <td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $j]) . '" /></td>
</tr>';
- $i++;
+ $j++;
}
echo '</table>
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/UpgradeDatabase.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -127,8 +127,9 @@
case '4.06':
case '4.06.1':
case '4.06.2':
+ case '4.06.3':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.3':
+ case '4.06.4':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/doc/Change.log 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1,7 +1,10 @@
webERP Change Log
-27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+28/12/11 Release 4.06.4
+28/12/11 Phil: SelectCreditItems.php SelectOrderItems.php CounterSales.php includes/DefineCartClass.php fixes for ExistingOrder . $identifier
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title. Fixes to allow manual entry.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/ConnectDB.inc 2011-12-27 21:47:35 UTC (rev 4788)
@@ -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.3'; //must update manually every time there is a DB change
+$Version='4.06.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -184,7 +184,8 @@
$UpdateDB='No',
$ItemDue,
$POLine,
- $GPPercent){
+ $GPPercent,
+ $identifier){
if ($Qty>0){
$this->LineItems[$UpdateLineNumber]->Quantity = $Qty;
@@ -200,10 +201,10 @@
$result = DB_query("UPDATE salesorderdetails SET quantity=" . $Qty . ",
unitprice=" . $Price . ",
discountpercent=" . $Disc . ",
- narrative ='" . DB_escape_string($Narrative) . "',
+ narrative ='" . $Narrative . "',
itemdue = '" . FormatDateForSQL($ItemDue) . "',
- poline = '" . DB_escape_string($POLine) . "'
- WHERE orderno=" . $_SESSION['ExistingOrder'] . "
+ poline = '" . $POLine . "'
+ WHERE orderno=" . $_SESSION['ExistingOrder'.$identifier] . "
AND orderlineno=" . $UpdateLineNumber
, $db
, _('The order line number') . ' ' . $UpdateLineNumber . ' ' . _('could not be updated'));
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-27 20:27:16 UTC (rev 4787)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-27 21:47:35 UTC (rev 4788)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 22:36+1300\n"
+"POT-Creation-Date: 2011-12-28 10:44+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -206,8 +206,8 @@
#: 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:2025
-#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2026
+#: CounterSales.php:2152 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
@@ -218,7 +218,7 @@
#: Labels.php:115 Labels.php:270 MRPReport.php:515 OutstandingGRNs.php:160
#: PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28
-#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17
+#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:16
#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8
#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258
@@ -227,8 +227,8 @@
#: 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:577 SelectOrderItems.php:1479
-#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533
+#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1480
+#: SelectOrderItems.php:1604 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:122 Shippers.php:158 Shipt_Select.php:8
@@ -369,7 +369,7 @@
#: 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:821 Credit_Invoice.php:381 CreditStatus.php:175
+#: CounterSales.php:822 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
@@ -382,11 +382,11 @@
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
#: 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
+#: SecurityTokens.php:129 SelectCreditItems.php:765 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
-#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
+#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1399
#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
-#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:302
#: 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
-#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
-#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
-#: UpgradeDatabase.php:205 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:182 UpgradeDatabase.php:185
+#: UpgradeDatabase.php:188 UpgradeDatabase.php:191 UpgradeDatabase.php:194
+#: UpgradeDatabase.php:197 UpgradeDatabase.php:200 UpgradeDatabase.php:203
+#: UpgradeDatabase.php:206 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
@@ -888,14 +888,14 @@
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
#: 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
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1366
+#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
-#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
+#: ReverseGRN.php:374 SelectCreditItems.php:1409 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
+#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1167,8 +1167,8 @@
#: 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
-#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952
-#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504
+#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:953
+#: SelectOrderItems.php:1610 SelectOrderItems.php:1613 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
@@ -1648,7 +1648,7 @@
#: Payments.php:1046 PcAssignCashToTab.php:222 PcAssignCashToTab.php:345
#: PcAuthorizeExpenses.php:90 PcClaimExpensesFromTab.php:212
#: PcClaimExpensesFromTab.php:365 PcReportTab.php:172 PcReportTab.php:326
-#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:681
+#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:682
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
@@ -1849,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:821 Customers.php:1091
-#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540
+#: BankReconciliation.php:354 CounterSales.php:822 Customers.php:1091
+#: SelectOrderItems.php:1410 Stocks.php:1204 WorkOrderCosting.php:540
#: WorkOrderEntry.php:569
msgid "Are You Sure?"
msgstr "Opravdu provést?"
@@ -1917,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:741
-#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
+#: Contracts.php:961 Contracts.php:997 CounterSales.php:742
+#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1933,12 +1933,12 @@
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
-#: SelectCreditItems.php:673 SelectCreditItems.php:1034
-#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
-#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: SelectCreditItems.php:674 SelectCreditItems.php:1035
+#: SelectOrderItems.php:1334 SelectOrderItems.php:1492
+#: SelectOrderItems.php:1676 SelectOrderItems.php:1803 ShipmentCosting.php:149
#: ShipmentCosting.php:150 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:276
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:277
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2097,10 +2097,10 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
-#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
+#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2169,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:2030
-#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2031
+#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2187,8 +2187,8 @@
#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
#: SelectCompletedOrder.php:550 SelectContract.php:153
-#: SelectCreditItems.php:988 SelectOrderItems.php:1485
-#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733
+#: SelectCreditItems.php:989 SelectOrderItems.php:1486
+#: SelectOrderItems.php:1670 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
@@ -2284,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:2182
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2183
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2292,10 +2292,10 @@
#: 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
+#: SelectCreditItems.php:972 SelectCustomer.php:269 SelectCustomer.php:279
#: SelectCustomer.php:288 SelectCustomer.php:298 SelectCustomer.php:344
#: SelectGLAccount.php:90 SelectOrderItems.php:587 SelectOrderItems.php:590
-#: SelectOrderItems.php:1637 SelectProduct.php:523 SelectSalesOrder.php:565
+#: SelectOrderItems.php:1638 SelectProduct.php:523 SelectSalesOrder.php:565
#: SelectSupplier.php:209 SelectWorkOrder.php:179 Shipt_Select.php:173
#: SuppFixedAssetChgs.php:122 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667
@@ -2324,11 +2324,11 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2186 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058
-#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:978
+#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
-#: SelectOrderItems.php:1644 SelectProduct.php:531 SelectSupplier.php:219
+#: SelectOrderItems.php:1645 SelectProduct.php:531 SelectSupplier.php:219
#: SelectSupplier.php:252 SupplierTenders.php:367 WorkOrderEntry.php:610
#: WorkOrderIssue.php:672
msgid "Search Now"
@@ -2361,15 +2361,15 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:112 BOMs.php:528 BOMs.php:854 ContractBOM.php:345
-#: CounterSales.php:2029 CounterSales.php:2214 CustomerBranches.php:367
+#: CounterSales.php:2030 CounterSales.php:2215 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: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:549 SelectCreditItems.php:987
-#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1484
-#: SelectOrderItems.php:1668 SelectProduct.php:732 SelectSalesOrder.php:580
+#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:988
+#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1485
+#: SelectOrderItems.php:1669 SelectProduct.php:732 SelectSalesOrder.php:580
#: SelectSupplier.php:258 SelectWorkOrder.php:191 Shipt_Select.php:189
#: SpecialOrder.php:142 SupplierTenders.php:489 SuppPriceList.php:289
#: TopItems.php:177 WorkOrderEntry.php:622 WorkOrderIssue.php:691
@@ -2379,12 +2379,12 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2031 CounterSales.php:2216
+#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
#: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105
#: 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
+#: SelectCompletedOrder.php:554 SelectCreditItems.php:990
+#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 SelectProduct.php:117
#: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194
#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193
#: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180
@@ -2664,8 +2664,8 @@
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:1021 CounterSales.php:1413
-#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1453
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
+#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
msgstr "Sestava"
@@ -3059,7 +3059,7 @@
#: 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
+#: SelectCreditItems.php:924 SMTPServer.php:63 StockCostUpdate.php:184
#: StockReorderLevel.php:103 Stocks.php:1198 SystemParameters.php:1032
#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:332
msgid "Update"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1250
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: Pa...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-28 22:26:33
|
Revision: 4789
http://web-erp.svn.sourceforge.net/web-erp/?rev=4789&view=rev
Author: daintree
Date: 2011-12-28 22:26:27 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/CounterSales.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -1008,7 +1008,7 @@
// *************************************************************************
// S T A R T O F I N V O I C E S Q L P R O C E S S I N G
// *************************************************************************
-
+ $result = DB_Txn_Begin($db);
/*First add the order to the database - it only exists in the session currently! */
$OrderNo = GetNextTransNo(30, $db);
@@ -1086,7 +1086,7 @@
* and it is a real order (not just a quotation)*/
if ($StockItem->MBflag=='M'
- and $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
+ AND $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
@@ -1229,8 +1229,6 @@
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
- $result = DB_Txn_Commit($db);
-
prnMsg(_('Order Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
/* End of insertion of new sales order */
@@ -1241,10 +1239,6 @@
$InvoiceNo = GetNextTransNo(10, $db);
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
- /*Start an SQL transaction */
-
- DB_Txn_Begin($db);
-
$DefaultDispatchDate = Date('Y-m-d');
/*Update order header for invoice charged on */
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/DefineCartClass.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -60,6 +60,7 @@
var $TaxTotals;
var $TaxGLCodes;
var $BuyerName;
+ var $SpecialInstructions;
function Cart(){
/*Constructor function initialises a new shopping cart */
@@ -157,7 +158,7 @@
discountpercent,
itemdue,
poline)
- VALUES(" . $this->LineCounter . ",
+ VALUES(" . $LineNumber . ",
" . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-28 22:26:27 UTC (rev 4789)
@@ -78,9 +78,9 @@
if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
- if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
+ if ($MaxNumRow[0] != '' AND $MaxNumRow[0] >= 0) {
$NewLineNo = $MaxNumRow[0]+1;
} else {
$NewLineNo = 0;
@@ -89,7 +89,7 @@
$UpdateDB = 'No';
$NewLineNo = -1; /* this is ok b/c CartClass will change to the correct line no */
}
-
+
if (isset($StockItem) and $myItemRow['discountcategory'] != '' ){
$DiscCatsDone[$Counter]=$StockItem->DiscCat;
$QuantityOfDiscCat =0;
@@ -115,8 +115,8 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){ /*Check credit limits is 1 for warn
- and 2 for prohibit sales */
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+ /*Check credit limits is 1 for warn and 2 for prohibit sales */
$_SESSION['Items'.$identifier]->CreditAvailable -= round(($NewItemQty * $Price * (1- $Discount)),$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -156,7 +156,8 @@
$myItemRow['standardcost'],
$myItemRow['eoq'],
$myItemRow['nextserialno'],
- $ExRate);
+ $ExRate,
+ $identifier);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-28 22:26:33
|
Revision: 4789
http://web-erp.svn.sourceforge.net/web-erp/?rev=4789&view=rev
Author: daintree
Date: 2011-12-28 22:26:27 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/CounterSales.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -1008,7 +1008,7 @@
// *************************************************************************
// S T A R T O F I N V O I C E S Q L P R O C E S S I N G
// *************************************************************************
-
+ $result = DB_Txn_Begin($db);
/*First add the order to the database - it only exists in the session currently! */
$OrderNo = GetNextTransNo(30, $db);
@@ -1086,7 +1086,7 @@
* and it is a real order (not just a quotation)*/
if ($StockItem->MBflag=='M'
- and $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
+ AND $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
@@ -1229,8 +1229,6 @@
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
- $result = DB_Txn_Commit($db);
-
prnMsg(_('Order Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
/* End of insertion of new sales order */
@@ -1241,10 +1239,6 @@
$InvoiceNo = GetNextTransNo(10, $db);
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
- /*Start an SQL transaction */
-
- DB_Txn_Begin($db);
-
$DefaultDispatchDate = Date('Y-m-d');
/*Update order header for invoice charged on */
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/DefineCartClass.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -60,6 +60,7 @@
var $TaxTotals;
var $TaxGLCodes;
var $BuyerName;
+ var $SpecialInstructions;
function Cart(){
/*Constructor function initialises a new shopping cart */
@@ -157,7 +158,7 @@
discountpercent,
itemdue,
poline)
- VALUES(" . $this->LineCounter . ",
+ VALUES(" . $LineNumber . ",
" . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-28 22:26:27 UTC (rev 4789)
@@ -78,9 +78,9 @@
if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
- if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
+ if ($MaxNumRow[0] != '' AND $MaxNumRow[0] >= 0) {
$NewLineNo = $MaxNumRow[0]+1;
} else {
$NewLineNo = 0;
@@ -89,7 +89,7 @@
$UpdateDB = 'No';
$NewLineNo = -1; /* this is ok b/c CartClass will change to the correct line no */
}
-
+
if (isset($StockItem) and $myItemRow['discountcategory'] != '' ){
$DiscCatsDone[$Counter]=$StockItem->DiscCat;
$QuantityOfDiscCat =0;
@@ -115,8 +115,8 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){ /*Check credit limits is 1 for warn
- and 2 for prohibit sales */
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+ /*Check credit limits is 1 for warn and 2 for prohibit sales */
$_SESSION['Items'.$identifier]->CreditAvailable -= round(($NewItemQty * $Price * (1- $Discount)),$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -156,7 +156,8 @@
$myItemRow['standardcost'],
$myItemRow['eoq'],
$myItemRow['nextserialno'],
- $ExRate);
+ $ExRate,
+ $identifier);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-03 06:35:37
|
Revision: 4791
http://web-erp.svn.sourceforge.net/web-erp/?rev=4791&view=rev
Author: daintree
Date: 2012-01-03 06:35:27 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/api/api_login.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualAPIFunctions.php
trunk/includes/ConnectDB.inc
trunk/install/index.php
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/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-28 22:31:24 UTC (rev 4790)
+++ trunk/UpgradeDatabase.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -128,8 +128,9 @@
case '4.06.1':
case '4.06.2':
case '4.06.3':
+ case '4.06.4':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.4':
+ case '4.06.5':
break;
} //end switch
}
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_login.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -100,7 +100,7 @@
* function should be called when a successful login occurs.
*/
-function DoSetup()
+function DoSetup()
{
global $PathPrefix;
if (isset($_SESSION['db']) AND $_SESSION['db'] != '' )
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_xml-rpc.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -29,8 +29,8 @@
function xmlrpc_Login($xmlrpcmsg) {
ob_start('ob_file_callback');
$rtn = new xmlrpcresp(php_xmlrpc_encode(LoginAPI($xmlrpcmsg->getParam(0)->scalarval(),
- $xmlrpcmsg->getParam(1)->scalarval(),
- $xmlrpcmsg->getParam(2)->scalarval())));
+ $xmlrpcmsg->getParam(1)->scalarval(),
+ $xmlrpcmsg->getParam(2)->scalarval())));
ob_end_flush();
return $rtn;
}
@@ -73,8 +73,8 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertCustomer_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_InsertCustomer($xmlrpcmsg){
@@ -109,7 +109,7 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*E*/$InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertBranch_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
@@ -358,19 +358,17 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $GetCurrencyList_sig = array(array($xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$GetCurrencyList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetCurrencyList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetCurrencyList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
@@ -1,6 +1,8 @@
webERP Change Log
+3/1/12 Release 4.06.5
+30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
28/12/11 Release 4.06.4
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/INSTALL.txt 2012-01-03 06:35:27 UTC (rev 4791)
@@ -107,11 +107,7 @@
Extract the webERP archive under the web server root directory. This will create the webERP directory under the web server root directory and put all the scripts in that directory.
-At this point you may wish to add an extra layer of security by restricting
-access to the webERP system. This is in addition to webERP's own security
-system, so you may wish to skip it, but it is recommended to add this extra layer. In your
-.../htdocs/webERP directory (or wherever your webERP's root directory is)
-amend the file .htaccess thus:
+At this point you may wish to add an extra layer of security by restricting access to the webERP system. This is in addition to webERP's own security system, so you may wish to skip it, but it is recommended to add this extra layer. In your .../htdocs/webERP directory (or wherever your webERP's root directory is) amend the file .htaccess thus:
php_flag magic_quotes_gpc off
php_flag register_globals off
@@ -195,16 +191,10 @@
Note: The scripts provided are created using mysqldump and contain comments. Unfortunately, phpMyAdmin doesn't like these comments so it is recommended to follow the instructions below.
-WebERP expects each company that it manages to have a separate database. For
-example, if you have a company called MyCompany, then it will expect a database
-called mycompany (note that it must all be lower case). Before you start,
-ensure that you have no such database on your system, if you do then you will
-either have to remove it, rename it, or choose a different name for your
-company for the purposes of WebERP. The simplest tool is webmin, or you could
-use phpMyAdmin.
+WebERP expects each company that it manages to have a separate database. For example, if you have a company called MyCompany, then it will expect a database called mycompany (note that it must all be lower case). Before you start, ensure that you have no such database on your system, if you do then you will either have to remove it, rename it, or choose a different name for your
+company for the purposes of WebERP. The simplest tool is webmin, or you could use phpMyAdmin.
-Once you have confirmed that you are ready to create a database you are
-now ready to go ahead, two scripts are provided to ease the database creation.
+Once you have confirmed that you are ready to create a database you are now ready to go ahead, two scripts are provided to ease the database creation.
1. weberp-demo.sql This has a minimal amount of demonstration data in a bogus company set up so that transactions can be tried to see how the system works.
2. weberp-new.sql This script has only the basic data necessary to start a new company system off. If you wish to set up your company on webERP then this is the script to use. weberp-new.sql you will need to create a database first (using phpMyAdmin for example) or add the following sql commands to this script
@@ -212,8 +202,7 @@
COLLATE utf8_unicode_ci;
USE mycompanyname
-Instead of mycompanyname use the name of your company. Note that the name of
-the database must all be in lower case.
+Instead of mycompanyname use the name of your company. Note that the name of the database must all be in lower case.
This creates a weberp database and populates it with only the very basic data to start off.
The files weberp-demo.sql and weberp-new.sql should be in webERP/sql/mysql directory.
@@ -224,11 +213,9 @@
shell > mysql --user=weberp_db_user --p mysql < /path_to_the_sql_script/weberp-new.sql
-as required. You will be prompted for the mysql password that you created
-earlier.
+as required. You will be prompted for the mysql password that you created earlier.
-Use webmin (or your favourite MySQL administration program) to confirm that
-the mycompanyname database now exists.
+Use webmin (or your favourite MySQL administration program) to confirm that the mycompanyname database now exists.
In the directory .../webERP/companies you will find a directory called
weberpdemo. You will now need to make a copy of all the files in that directory
@@ -236,11 +223,12 @@
3. Editing config.php
-The webERP archive no longer comes with a config.php file. There is now a
-web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL http://yourdomain/webERP/ in your browser,
-enter the web access password if you amended the .htaccess file as discussed
-above, accept all cookies, and complete the installation form.
+The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL
+http://yourdomain/webERP/ in your browser,
+
+enter the web access password if you amended the .htaccess file as discussed above, accept all cookies, and complete the installation form.
+
You will need to ensure that the directory where you have installed is writable by the system user that the web-server runs as - otherwise the installer will not be able to write the new config.php file.
In step 4 uncheck "Install Tables", because that was done above, and
@@ -259,6 +247,8 @@
Alternatively, config.php may be created by copying config.distrib.php to config.php and then editing the new config.php file with the parameters required for your installation. If you have created the config.php using the web interface
then you may now skip to step 4.
+Note: Once you have installed webERP it is important to remove the installer files by deleting the install directory and all the scripts underneath it. It is also wise to change the permissions on the config.php file to ensure that it can no longer be written to by the web-server.
+
config.php contains a series of user defined variables that determine how the system behaves. Critically it contains the user and password of the database connection and the type of database server being used. There is no going forward without the system being provided with this data. It is important to ensure there are no trailing characters at the end of this file - this is a common installation pitfall since some editors add a character at the end of the file.
The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $dbType, the $dbuser and the $dbpassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
@@ -317,9 +307,6 @@
//$CryptFunction = ""; // Plain Text
-
-
-
4. Logging In For the First Time
Open a browser and enter the URL for the web server directory where webERP is installed if the broswer is on the same machine as the server perhaps
@@ -345,7 +332,7 @@
uploads the logo to the required place - the logo must be a .jpg - the logo file is used for invoices and statements and should be smaller than 50KB
To this go to:
-http://youdomain/webERP/Z_MakeNewCompany.php
+http://yourdomain/webERP/Z_MakeNewCompany.php
Ensure that "Create Database?" is not ticked. Click on "Proceed".
It is imperative to go through each of the screens from the setup tab and enter the appropriate information. Particularly the company information and the configuration settings. Each of these settings together with the narrative explaining what each of the settings does should be reviewed in detail before starting off with the system.
@@ -369,7 +356,6 @@
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Copyright weberp.org 2010 - Contact: in...@we...
\ No newline at end of file
Modified: trunk/doc/Manual/ManualAPIFunctions.php
===================================================================
--- trunk/doc/Manual/ManualAPIFunctions.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Manual/ManualAPIFunctions.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -3,8 +3,12 @@
/* $Id: ManualAPIFunctions.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
$PageSecurity = 1;
-$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
-//include('../../includes/session.inc');
+
+//$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
+//$PathPrefix= '/../';
+
+include('../../includes/session.inc');
+
include('../../xmlrpc/lib/xmlrpc.inc');
include('../../api/api_errorcodes.php');
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/includes/ConnectDB.inc 2012-01-03 06:35:27 UTC (rev 4791)
@@ -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.4'; //must update manually every time there is a DB change
+$Version='4.06.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/install/index.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -2,6 +2,12 @@
/* $Id$*/
error_reporting(E_ALL);
ini_set('display_errors', 'On');
+
+if (file_exists('../config.php')) {
+ echo '<br />A configuration webERP installation already exists - the file config.php in the webERP installation has been created and must be removed before this utility can be re-run';
+ exit;
+}
+
// Start a session
if(!defined('SESSION_STARTED')) {
session_name('ba_session_id');
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-28 22:31:24 UTC (rev 4790)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-03 06:35:27 UTC (rev 4791)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 10:44+1300\n"
+"POT-Creation-Date: 2012-01-03 19:41+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -206,8 +206,8 @@
#: 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:2026
-#: CounterSales.php:2152 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2020
+#: CounterSales.php:2146 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:182 UpgradeDatabase.php:185
-#: UpgradeDatabase.php:188 UpgradeDatabase.php:191 UpgradeDatabase.php:194
-#: UpgradeDatabase.php:197 UpgradeDatabase.php:200 UpgradeDatabase.php:203
-#: UpgradeDatabase.php:206 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
+#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
+#: UpgradeDatabase.php:207 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
@@ -888,8 +888,8 @@
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974
-#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1366
-#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1360
+#: CounterSales.php:1374 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
+#: CounterSales.php:2152 CounterSales.php:2155 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1223,8 +1223,8 @@
msgid "Table"
msgstr "Tabulka"
-#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1914
+#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:727
+#: api/api_xml-rpc.php:1912
msgid "Field Name"
msgstr "Název pole"
@@ -1918,7 +1918,7 @@
#: 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:742
-#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
+#: CounterSales.php:2031 CounterSales.php:2216 CounterSales.php:2342
#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1958,8 +1958,8 @@
#: includes/PDFStockCheckPageHeader.inc:44
#: includes/PDFStockNegativesHeader.inc:33
#: includes/PDFStockTransferHeader.inc:39 includes/PDFTransPageHeader.inc:209
-#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2260
-#: api/api_xml-rpc.php:2306 api/api_xml-rpc.php:2502
+#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2258
+#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
msgid "Quantity"
msgstr "Množství"
@@ -2097,7 +2097,7 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2027 CounterSales.php:2212 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
@@ -2169,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:2031
-#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2025
+#: CounterSales.php:2210 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2205,7 +2205,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3046
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3044
msgid "Description"
msgstr "Popis"
@@ -2284,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:2183
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2177
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2324,7 +2324,7 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2181 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058
#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
@@ -2361,7 +2361,7 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:112 BOMs.php:528 BOMs.php:854 ContractBOM.php:345
-#: CounterSales.php:2030 CounterSales.php:2215 CustomerBranches.php:367
+#: CounterSales.php:2024 CounterSales.php:2209 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:555
@@ -2379,7 +2379,7 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
+#: ContractBOM.php:347 CounterSales.php:2026 CounterSales.php:2211
#: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105
#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1074
#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:215
@@ -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:1021 CounterSales.php:1414
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
@@ -2714,8 +2714,8 @@
#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
-#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
-#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
+#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2256
+#: api/api_xml-rpc.php:2302 api/api_xml-rpc.php:2498
msgid "Location"
msgstr "Umístění"
@@ -2834,7 +2834,7 @@
#: DiscountMatrix.php:160 PricesByCost.php:262 Prices.php:223
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:713
-#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
+#: api/api_xml-rpc.php:929 api/api_xml-rpc.php:972
msgid "Sales Type"
msgstr "Prodej Typ"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1245
#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: PaymentAllocations.php:31 SelectSalesOrder.php:830 SelectSalesOrder.php:901
#: SelectSalesOrder.php:928 Z_SalesIntegrityCheck.php:46
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:740
-#: CounterSales.php:2347 Credit_Invoice.php:269 DeliveryDetails.php:825
+#: CounterSales.php:2341 Credit_Invoice.php:269 DeliveryDetails.php:825
#: 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
@@ -3312,7 +3312,7 @@
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
#: includes/PDFQuotationPortraitPageHeader.inc:104
#: includes/PDFTransPageHeaderPortrait.inc:267
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:933
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:931
msgid "Price"
msgstr "Cena"
@@ -3609,12 +3609,12 @@
#: 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:1253 CounterSales.php:1293
-#: CounterSales.php...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-03 06:35:37
|
Revision: 4791
http://web-erp.svn.sourceforge.net/web-erp/?rev=4791&view=rev
Author: daintree
Date: 2012-01-03 06:35:27 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/api/api_login.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualAPIFunctions.php
trunk/includes/ConnectDB.inc
trunk/install/index.php
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/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-28 22:31:24 UTC (rev 4790)
+++ trunk/UpgradeDatabase.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -128,8 +128,9 @@
case '4.06.1':
case '4.06.2':
case '4.06.3':
+ case '4.06.4':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.4':
+ case '4.06.5':
break;
} //end switch
}
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_login.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -100,7 +100,7 @@
* function should be called when a successful login occurs.
*/
-function DoSetup()
+function DoSetup()
{
global $PathPrefix;
if (isset($_SESSION['db']) AND $_SESSION['db'] != '' )
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_xml-rpc.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -29,8 +29,8 @@
function xmlrpc_Login($xmlrpcmsg) {
ob_start('ob_file_callback');
$rtn = new xmlrpcresp(php_xmlrpc_encode(LoginAPI($xmlrpcmsg->getParam(0)->scalarval(),
- $xmlrpcmsg->getParam(1)->scalarval(),
- $xmlrpcmsg->getParam(2)->scalarval())));
+ $xmlrpcmsg->getParam(1)->scalarval(),
+ $xmlrpcmsg->getParam(2)->scalarval())));
ob_end_flush();
return $rtn;
}
@@ -73,8 +73,8 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertCustomer_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_InsertCustomer($xmlrpcmsg){
@@ -109,7 +109,7 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*E*/$InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertBranch_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
@@ -358,19 +358,17 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $GetCurrencyList_sig = array(array($xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$GetCurrencyList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetCurrencyList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetCurrencyList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
@@ -1,6 +1,8 @@
webERP Change Log
+3/1/12 Release 4.06.5
+30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
28/12/11 Release 4.06.4
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/INSTALL.txt 2012-01-03 06:35:27 UTC (rev 4791)
@@ -107,11 +107,7 @@
Extract the webERP archive under the web server root directory. This will create the webERP directory under the web server root directory and put all the scripts in that directory.
-At this point you may wish to add an extra layer of security by restricting
-access to the webERP system. This is in addition to webERP's own security
-system, so you may wish to skip it, but it is recommended to add this extra layer. In your
-.../htdocs/webERP directory (or wherever your webERP's root directory is)
-amend the file .htaccess thus:
+At this point you may wish to add an extra layer of security by restricting access to the webERP system. This is in addition to webERP's own security system, so you may wish to skip it, but it is recommended to add this extra layer. In your .../htdocs/webERP directory (or wherever your webERP's root directory is) amend the file .htaccess thus:
php_flag magic_quotes_gpc off
php_flag register_globals off
@@ -195,16 +191,10 @@
Note: The scripts provided are created using mysqldump and contain comments. Unfortunately, phpMyAdmin doesn't like these comments so it is recommended to follow the instructions below.
-WebERP expects each company that it manages to have a separate database. For
-example, if you have a company called MyCompany, then it will expect a database
-called mycompany (note that it must all be lower case). Before you start,
-ensure that you have no such database on your system, if you do then you will
-either have to remove it, rename it, or choose a different name for your
-company for the purposes of WebERP. The simplest tool is webmin, or you could
-use phpMyAdmin.
+WebERP expects each company that it manages to have a separate database. For example, if you have a company called MyCompany, then it will expect a database called mycompany (note that it must all be lower case). Before you start, ensure that you have no such database on your system, if you do then you will either have to remove it, rename it, or choose a different name for your
+company for the purposes of WebERP. The simplest tool is webmin, or you could use phpMyAdmin.
-Once you have confirmed that you are ready to create a database you are
-now ready to go ahead, two scripts are provided to ease the database creation.
+Once you have confirmed that you are ready to create a database you are now ready to go ahead, two scripts are provided to ease the database creation.
1. weberp-demo.sql This has a minimal amount of demonstration data in a bogus company set up so that transactions can be tried to see how the system works.
2. weberp-new.sql This script has only the basic data necessary to start a new company system off. If you wish to set up your company on webERP then this is the script to use. weberp-new.sql you will need to create a database first (using phpMyAdmin for example) or add the following sql commands to this script
@@ -212,8 +202,7 @@
COLLATE utf8_unicode_ci;
USE mycompanyname
-Instead of mycompanyname use the name of your company. Note that the name of
-the database must all be in lower case.
+Instead of mycompanyname use the name of your company. Note that the name of the database must all be in lower case.
This creates a weberp database and populates it with only the very basic data to start off.
The files weberp-demo.sql and weberp-new.sql should be in webERP/sql/mysql directory.
@@ -224,11 +213,9 @@
shell > mysql --user=weberp_db_user --p mysql < /path_to_the_sql_script/weberp-new.sql
-as required. You will be prompted for the mysql password that you created
-earlier.
+as required. You will be prompted for the mysql password that you created earlier.
-Use webmin (or your favourite MySQL administration program) to confirm that
-the mycompanyname database now exists.
+Use webmin (or your favourite MySQL administration program) to confirm that the mycompanyname database now exists.
In the directory .../webERP/companies you will find a directory called
weberpdemo. You will now need to make a copy of all the files in that directory
@@ -236,11 +223,12 @@
3. Editing config.php
-The webERP archive no longer comes with a config.php file. There is now a
-web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL http://yourdomain/webERP/ in your browser,
-enter the web access password if you amended the .htaccess file as discussed
-above, accept all cookies, and complete the installation form.
+The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL
+http://yourdomain/webERP/ in your browser,
+
+enter the web access password if you amended the .htaccess file as discussed above, accept all cookies, and complete the installation form.
+
You will need to ensure that the directory where you have installed is writable by the system user that the web-server runs as - otherwise the installer will not be able to write the new config.php file.
In step 4 uncheck "Install Tables", because that was done above, and
@@ -259,6 +247,8 @@
Alternatively, config.php may be created by copying config.distrib.php to config.php and then editing the new config.php file with the parameters required for your installation. If you have created the config.php using the web interface
then you may now skip to step 4.
+Note: Once you have installed webERP it is important to remove the installer files by deleting the install directory and all the scripts underneath it. It is also wise to change the permissions on the config.php file to ensure that it can no longer be written to by the web-server.
+
config.php contains a series of user defined variables that determine how the system behaves. Critically it contains the user and password of the database connection and the type of database server being used. There is no going forward without the system being provided with this data. It is important to ensure there are no trailing characters at the end of this file - this is a common installation pitfall since some editors add a character at the end of the file.
The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $dbType, the $dbuser and the $dbpassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
@@ -317,9 +307,6 @@
//$CryptFunction = ""; // Plain Text
-
-
-
4. Logging In For the First Time
Open a browser and enter the URL for the web server directory where webERP is installed if the broswer is on the same machine as the server perhaps
@@ -345,7 +332,7 @@
uploads the logo to the required place - the logo must be a .jpg - the logo file is used for invoices and statements and should be smaller than 50KB
To this go to:
-http://youdomain/webERP/Z_MakeNewCompany.php
+http://yourdomain/webERP/Z_MakeNewCompany.php
Ensure that "Create Database?" is not ticked. Click on "Proceed".
It is imperative to go through each of the screens from the setup tab and enter the appropriate information. Particularly the company information and the configuration settings. Each of these settings together with the narrative explaining what each of the settings does should be reviewed in detail before starting off with the system.
@@ -369,7 +356,6 @@
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Copyright weberp.org 2010 - Contact: in...@we...
\ No newline at end of file
Modified: trunk/doc/Manual/ManualAPIFunctions.php
===================================================================
--- trunk/doc/Manual/ManualAPIFunctions.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Manual/ManualAPIFunctions.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -3,8 +3,12 @@
/* $Id: ManualAPIFunctions.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
$PageSecurity = 1;
-$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
-//include('../../includes/session.inc');
+
+//$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
+//$PathPrefix= '/../';
+
+include('../../includes/session.inc');
+
include('../../xmlrpc/lib/xmlrpc.inc');
include('../../api/api_errorcodes.php');
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/includes/ConnectDB.inc 2012-01-03 06:35:27 UTC (rev 4791)
@@ -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.4'; //must update manually every time there is a DB change
+$Version='4.06.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/install/index.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -2,6 +2,12 @@
/* $Id$*/
error_reporting(E_ALL);
ini_set('display_errors', 'On');
+
+if (file_exists('../config.php')) {
+ echo '<br />A configuration webERP installation already exists - the file config.php in the webERP installation has been created and must be removed before this utility can be re-run';
+ exit;
+}
+
// Start a session
if(!defined('SESSION_STARTED')) {
session_name('ba_session_id');
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-28 22:31:24 UTC (rev 4790)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-03 06:35:27 UTC (rev 4791)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 10:44+1300\n"
+"POT-Creation-Date: 2012-01-03 19:41+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -206,8 +206,8 @@
#: 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:2026
-#: CounterSales.php:2152 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2020
+#: CounterSales.php:2146 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:182 UpgradeDatabase.php:185
-#: UpgradeDatabase.php:188 UpgradeDatabase.php:191 UpgradeDatabase.php:194
-#: UpgradeDatabase.php:197 UpgradeDatabase.php:200 UpgradeDatabase.php:203
-#: UpgradeDatabase.php:206 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
+#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
+#: UpgradeDatabase.php:207 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
@@ -888,8 +888,8 @@
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974
-#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1366
-#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1360
+#: CounterSales.php:1374 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
+#: CounterSales.php:2152 CounterSales.php:2155 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1223,8 +1223,8 @@
msgid "Table"
msgstr "Tabulka"
-#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1914
+#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:727
+#: api/api_xml-rpc.php:1912
msgid "Field Name"
msgstr "Název pole"
@@ -1918,7 +1918,7 @@
#: 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:742
-#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
+#: CounterSales.php:2031 CounterSales.php:2216 CounterSales.php:2342
#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1958,8 +1958,8 @@
#: includes/PDFStockCheckPageHeader.inc:44
#: includes/PDFStockNegativesHeader.inc:33
#: includes/PDFStockTransferHeader.inc:39 includes/PDFTransPageHeader.inc:209
-#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2260
-#: api/api_xml-rpc.php:2306 api/api_xml-rpc.php:2502
+#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2258
+#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
msgid "Quantity"
msgstr "Množství"
@@ -2097,7 +2097,7 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2027 CounterSales.php:2212 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
@@ -2169,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:2031
-#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2025
+#: CounterSales.php:2210 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2205,7 +2205,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3046
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3044
msgid "Description"
msgstr "Popis"
@@ -2284,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:2183
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2177
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2324,7 +2324,7 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2181 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058
#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
@@ -2361,7 +2361,7 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:112 BOMs.php:528 BOMs.php:854 ContractBOM.php:345
-#: CounterSales.php:2030 CounterSales.php:2215 CustomerBranches.php:367
+#: CounterSales.php:2024 CounterSales.php:2209 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:555
@@ -2379,7 +2379,7 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
+#: ContractBOM.php:347 CounterSales.php:2026 CounterSales.php:2211
#: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105
#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1074
#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:215
@@ -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:1021 CounterSales.php:1414
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
@@ -2714,8 +2714,8 @@
#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
-#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
-#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
+#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2256
+#: api/api_xml-rpc.php:2302 api/api_xml-rpc.php:2498
msgid "Location"
msgstr "Umístění"
@@ -2834,7 +2834,7 @@
#: DiscountMatrix.php:160 PricesByCost.php:262 Prices.php:223
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:713
-#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
+#: api/api_xml-rpc.php:929 api/api_xml-rpc.php:972
msgid "Sales Type"
msgstr "Prodej Typ"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1245
#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: PaymentAllocations.php:31 SelectSalesOrder.php:830 SelectSalesOrder.php:901
#: SelectSalesOrder.php:928 Z_SalesIntegrityCheck.php:46
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:740
-#: CounterSales.php:2347 Credit_Invoice.php:269 DeliveryDetails.php:825
+#: CounterSales.php:2341 Credit_Invoice.php:269 DeliveryDetails.php:825
#: 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
@@ -3312,7 +3312,7 @@
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
#: includes/PDFQuotationPortraitPageHeader.inc:104
#: includes/PDFTransPageHeaderPortrait.inc:267
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:933
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:931
msgid "Price"
msgstr "Cena"
@@ -3609,12 +3609,12 @@
#: 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:1253 CounterSales.php:1293
-#: CounterSales.php...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-07 01:04:35
|
Revision: 4792
http://web-erp.svn.sourceforge.net/web-erp/?rev=4792&view=rev
Author: daintree
Date: 2012-01-07 01:04:29 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/Currencies.php
trunk/Shipments.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Currencies.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -69,7 +69,7 @@
prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
$Errors[$i] = 'DecimalPlaces';
$i++;
- }elseif (filter_number_format($_POST['DecimalPlaces'])<=0){
+ }elseif (filter_number_format($_POST['DecimalPlaces'])<0){
$InputError = 1;
prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
$Errors[$i] = 'DecimalPlaces';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Shipments.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -17,7 +17,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
-if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment'])){
+if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment']) AND !isset($_GET['SelectedShipment'])){
prnMsg( _('To set up a shipment') . ', ' . _('the supplier must first be selected from the Select Supplier page'), 'error');
echo '<table class="selection">
<tr><td class="menu_group_item">
@@ -78,8 +78,6 @@
$_SESSION['Shipment']->Vessel = $myrow['vessel'];
$_SESSION['Shipment']->VoyageRef = $myrow['voyageref'];
-
-
/*now populate the shipment details records */
$LineItemsSQL = "SELECT purchorderdetails.podetailitem,
@@ -195,7 +193,7 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
- if ($InputError==0){
+ if ($InputError==0 AND !isset($_GET['Add'])){ //don't update vessel and voyage on adding a new PO line to the shipment
$_SESSION['Shipment']->Vessel = $_POST['Vessel'];
$_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
}
@@ -289,6 +287,7 @@
$myrow['quantityord'],
$myrow['quantityrecd'],
$StandardCost,
+ $myrow['decimalplaces'],
$db);
}
@@ -323,9 +322,9 @@
echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>';
if (isset($_SESSION['Shipment']->ETA)) {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . $ETA . '" /></td>';
+ echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>';
} else {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
+ echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
}
echo '<td>'. _('Into').' ';
@@ -467,8 +466,8 @@
INNER JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE qtyinvoiced=0
- AND purchorderdetails.completed=0
- AND purchorders.status='Authorised'
+ AND purchorders.status <> 'Cancelled'
+ AND purchorders.status <> 'Rejected'
AND purchorders.supplierno ='" . $_SESSION['Shipment']->SupplierID . "'
AND purchorderdetails.shiptref=0
AND purchorders.intostocklocation='" . $_POST['StockLocation'] . "'";
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierCredit.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -612,7 +612,7 @@
/*First do input reasonableness checks
then do the updates and inserts to process the credit note entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
@@ -637,14 +637,9 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount <= 0){
$InputError = True;
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierInvoice.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -584,11 +584,11 @@
<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
</div>';
-} else { //do the postings -and dont show the button to process
+} else { // $_POST['PostInvoice'] is set so do the postings -and dont show the button to process
/*First do input reasonableness checks
then do the updates and inserts to process the invoice entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
if (isset($_POST['TaxRate' . $Tax->TaxCalculationOrder])){
@@ -596,23 +596,23 @@
}
if ($_POST['OverRideTax']=='Auto' OR !isset($_POST['OverRideTax'])){
/*Now recaluclate the tax depending on the method */
+ /*Now recaluclate the tax depending on the method */
if ($Tax->TaxOnTax ==1){
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * ($_SESSION['SuppTrans']->OvAmount + $TaxTotal);
+
} else { /*Calculate tax without the tax on tax */
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * $_SESSION['SuppTrans']->OvAmount;
+
}
} else { /*Tax being entered manually accept the taxamount entered as is*/
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount < 0){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/doc/Change.log 2012-01-07 01:04:29 UTC (rev 4792)
@@ -1,5 +1,9 @@
webERP Change Log
+7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
+7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
+5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
+
3/1/12 Release 4.06.5
30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-07 01:04:35
|
Revision: 4792
http://web-erp.svn.sourceforge.net/web-erp/?rev=4792&view=rev
Author: daintree
Date: 2012-01-07 01:04:29 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/Currencies.php
trunk/Shipments.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Currencies.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -69,7 +69,7 @@
prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
$Errors[$i] = 'DecimalPlaces';
$i++;
- }elseif (filter_number_format($_POST['DecimalPlaces'])<=0){
+ }elseif (filter_number_format($_POST['DecimalPlaces'])<0){
$InputError = 1;
prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
$Errors[$i] = 'DecimalPlaces';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Shipments.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -17,7 +17,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
-if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment'])){
+if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment']) AND !isset($_GET['SelectedShipment'])){
prnMsg( _('To set up a shipment') . ', ' . _('the supplier must first be selected from the Select Supplier page'), 'error');
echo '<table class="selection">
<tr><td class="menu_group_item">
@@ -78,8 +78,6 @@
$_SESSION['Shipment']->Vessel = $myrow['vessel'];
$_SESSION['Shipment']->VoyageRef = $myrow['voyageref'];
-
-
/*now populate the shipment details records */
$LineItemsSQL = "SELECT purchorderdetails.podetailitem,
@@ -195,7 +193,7 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
- if ($InputError==0){
+ if ($InputError==0 AND !isset($_GET['Add'])){ //don't update vessel and voyage on adding a new PO line to the shipment
$_SESSION['Shipment']->Vessel = $_POST['Vessel'];
$_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
}
@@ -289,6 +287,7 @@
$myrow['quantityord'],
$myrow['quantityrecd'],
$StandardCost,
+ $myrow['decimalplaces'],
$db);
}
@@ -323,9 +322,9 @@
echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>';
if (isset($_SESSION['Shipment']->ETA)) {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . $ETA . '" /></td>';
+ echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>';
} else {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
+ echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
}
echo '<td>'. _('Into').' ';
@@ -467,8 +466,8 @@
INNER JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE qtyinvoiced=0
- AND purchorderdetails.completed=0
- AND purchorders.status='Authorised'
+ AND purchorders.status <> 'Cancelled'
+ AND purchorders.status <> 'Rejected'
AND purchorders.supplierno ='" . $_SESSION['Shipment']->SupplierID . "'
AND purchorderdetails.shiptref=0
AND purchorders.intostocklocation='" . $_POST['StockLocation'] . "'";
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierCredit.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -612,7 +612,7 @@
/*First do input reasonableness checks
then do the updates and inserts to process the credit note entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
@@ -637,14 +637,9 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount <= 0){
$InputError = True;
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierInvoice.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -584,11 +584,11 @@
<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
</div>';
-} else { //do the postings -and dont show the button to process
+} else { // $_POST['PostInvoice'] is set so do the postings -and dont show the button to process
/*First do input reasonableness checks
then do the updates and inserts to process the invoice entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
if (isset($_POST['TaxRate' . $Tax->TaxCalculationOrder])){
@@ -596,23 +596,23 @@
}
if ($_POST['OverRideTax']=='Auto' OR !isset($_POST['OverRideTax'])){
/*Now recaluclate the tax depending on the method */
+ /*Now recaluclate the tax depending on the method */
if ($Tax->TaxOnTax ==1){
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * ($_SESSION['SuppTrans']->OvAmount + $TaxTotal);
+
} else { /*Calculate tax without the tax on tax */
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * $_SESSION['SuppTrans']->OvAmount;
+
}
} else { /*Tax being entered manually accept the taxamount entered as is*/
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount < 0){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/doc/Change.log 2012-01-07 01:04:29 UTC (rev 4792)
@@ -1,5 +1,9 @@
webERP Change Log
+7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
+7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
+5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
+
3/1/12 Release 4.06.5
30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:20:21
|
Revision: 4794
http://web-erp.svn.sourceforge.net/web-erp/?rev=4794&view=rev
Author: daintree
Date: 2012-01-09 05:20:15 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Paul Harness corrections to petty cash scripts
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcAuthorizeExpenses.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -253,8 +253,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authoriser=ConvertSQLDate($myrow['authorized']);
- if(($Authoriser!='00/00/0000')){
+ //compare against raw SQL format date, then convert for display.
+ if(($myrow['authorized']!='0000-00-00')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'" /></td>';
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcClaimExpensesFromTab.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -327,7 +327,7 @@
}//end of Get Edit
if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
+ $_POST['Date']=Date($_SESSION['DefaultDateFormat']);
}
echo '<tr><td>' . _('Date Of Expense') . ':</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
@@ -1,5 +1,8 @@
webERP Change Log
+8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
+8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
+8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:20:21
|
Revision: 4794
http://web-erp.svn.sourceforge.net/web-erp/?rev=4794&view=rev
Author: daintree
Date: 2012-01-09 05:20:15 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Paul Harness corrections to petty cash scripts
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcAuthorizeExpenses.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -253,8 +253,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authoriser=ConvertSQLDate($myrow['authorized']);
- if(($Authoriser!='00/00/0000')){
+ //compare against raw SQL format date, then convert for display.
+ if(($myrow['authorized']!='0000-00-00')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'" /></td>';
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcClaimExpensesFromTab.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -327,7 +327,7 @@
}//end of Get Edit
if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
+ $_POST['Date']=Date($_SESSION['DefaultDateFormat']);
}
echo '<tr><td>' . _('Date Of Expense') . ':</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
@@ -1,5 +1,8 @@
webERP Change Log
+8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
+8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
+8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 07:19:14
|
Revision: 4795
http://web-erp.svn.sourceforge.net/web-erp/?rev=4795&view=rev
Author: daintree
Date: 2012-01-09 07:19:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
;
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_paymentterms.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -45,12 +45,14 @@
*/
function GetPaymentMethodsList($User, $Password) {
$Errors = array();
- $db = db($User, $Password);
- if (gettype($db)=='integer') {
- $Errors[0]=NoAuthorisation;
- return $Errors;
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
}
- $sql = 'SELECT paymentid FROM paymentmethods';
+ $sql = "SELECT paymentid FROM paymentmethods";
$result = DB_query($sql, $db);
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -1731,19 +1731,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1761,20 +1759,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/ $GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1786,19 +1783,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1822,14 +1817,11 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1847,20 +1839,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
-/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1882,14 +1873,11 @@
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupTaxes($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
@@ -1913,13 +1901,11 @@
function xmlrpc_GetCustomerTypeList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/doc/Change.log 2012-01-09 07:19:07 UTC (rev 4795)
@@ -3,6 +3,9 @@
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
+
+Release 4.06.6
+
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 07:19:14
|
Revision: 4795
http://web-erp.svn.sourceforge.net/web-erp/?rev=4795&view=rev
Author: daintree
Date: 2012-01-09 07:19:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
;
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_paymentterms.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -45,12 +45,14 @@
*/
function GetPaymentMethodsList($User, $Password) {
$Errors = array();
- $db = db($User, $Password);
- if (gettype($db)=='integer') {
- $Errors[0]=NoAuthorisation;
- return $Errors;
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
}
- $sql = 'SELECT paymentid FROM paymentmethods';
+ $sql = "SELECT paymentid FROM paymentmethods";
$result = DB_query($sql, $db);
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -1731,19 +1731,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1761,20 +1759,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/ $GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1786,19 +1783,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1822,14 +1817,11 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1847,20 +1839,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
-/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1882,14 +1873,11 @@
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupTaxes($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
@@ -1913,13 +1901,11 @@
function xmlrpc_GetCustomerTypeList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/doc/Change.log 2012-01-09 07:19:07 UTC (rev 4795)
@@ -3,6 +3,9 @@
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
+
+Release 4.06.6
+
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-13 07:17:45
|
Revision: 4797
http://web-erp.svn.sourceforge.net/web-erp/?rev=4797&view=rev
Author: daintree
Date: 2012-01-13 07:17:29 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
fix db_query to DB_query
Modified Paths:
--------------
trunk/CounterSales.php
trunk/OrderDetails.php
trunk/PDFTopItems.php
trunk/PO_OrderDetails.php
trunk/PrintCheque.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevelLocation.php
trunk/SelectOrderItems.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/StockDispatch.php
trunk/SuppPriceList.php
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/includes/Contract_Readin.php
trunk/includes/LanguagesArray.php
trunk/includes/PO_ReadInOrder.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/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/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/CounterSales.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -2075,7 +2075,7 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
$PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
@@ -2089,8 +2089,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -2257,9 +2257,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -2271,9 +2271,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -145,9 +145,9 @@
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal = 0;
$OrderTotalVolume = 0;
@@ -170,7 +170,7 @@
<th>' . _('Last Del') . '</th>
</tr>';
$k=0;
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PDFTopItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -91,8 +91,8 @@
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stkcode'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, locale_number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PO_OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -137,7 +137,7 @@
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
echo '<table colspan="8" class="selection" cellpadding="0">';
@@ -157,7 +157,7 @@
$OrderTotal=0;
$RecdTotal=0;
-while ($myrow=db_fetch_array($LineItemsResult)) {
+while ($myrow=DB_fetch_array($LineItemsResult)) {
$OrderTotal += ($myrow['quantityord'] * $myrow['unitprice']);
$RecdTotal += ($myrow['quantityrecd'] * $myrow['unitprice']);
Modified: trunk/PrintCheque.php
===================================================================
--- trunk/PrintCheque.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PrintCheque.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -15,7 +15,7 @@
$PageNumber=1;
$line_height=12;
-$result = db_query("SELECT hundredsname,
+$result = DB_query("SELECT hundredsname,
decimalplaces,
currency
FROM currencies
@@ -28,7 +28,7 @@
exit;
}
-$CurrencyRow = db_fetch_array($result);
+$CurrencyRow = DB_fetch_array($result);
$HundredsName = $CurrencyRow['hundredsname'];
$CurrDecimalPlaces = $CurrencyRow['decimalplaces'];
$CurrencyName = mb_strtolower($CurrencyRow['currency']);
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrders.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -123,10 +123,10 @@
AND recurrsalesorderdetails.recurrorderno ='" . $_GET['ModifyRecurringSalesOrder'] . "'";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrdersProcess.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -158,11 +158,11 @@
WHERE recurrsalesorderdetails.recurrorderno ='" . $RecurrOrderRow['recurrorderno'] . "'";
$ErrMsg = _('The line items of the recurring order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
$LineCounter = 0;
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal =0; //intialise
$OrderLineTotal =0;
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ReorderLevelLocation.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -122,16 +122,16 @@
$sqloh="SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stockid'] . "'";
- $oh = db_query($sqloh,$db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh,$db);
+ $ohRow = DB_fetch_row($oh);
//get On Hand in Location
$sqlohin="SELECT SUM(quantity) AS qty
FROM `locstock`
WHERE stockid='" . $myrow['stockid'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'";
- $ohin = db_query($sqlohin,$db);
- $ohinRow = db_fetch_row($ohin);
+ $ohin = DB_query($sqlohin,$db);
+ $ohinRow = DB_fetch_row($ohin);
echo'<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SelectOrderItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -218,10 +218,10 @@
ORDER BY salesorderdetails.orderlineno";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['completed']==0){
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
@@ -1539,9 +1539,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1553,8 +1553,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -1723,9 +1723,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1737,9 +1737,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ShipmentCosting.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -119,9 +119,9 @@
purchorderdetails.itemdescription";
$ErrMsg = _('The lines on the shipment could not be retrieved from the database');
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
-if (db_num_rows($LineItemsResult) > 0) {
+if (DB_num_rows($LineItemsResult) > 0) {
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
@@ -548,7 +548,7 @@
$RowCounter =0;
$TotalItemShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
@@ -624,7 +624,7 @@
$RowCounter =0;
$TotalGeneralShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/Shipments.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -100,7 +100,7 @@
ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.shiptref='" . $_GET['SelectedShipment'] . "'";
$ErrMsg = _('The lines on the shipment cannot be retrieved because'). ' - ' . DB_error_msg($db);
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
if (DB_num_rows($GetShiptHdrResult)==0) {
prnMsg ( _('Unable to locate lines for Shipment') . ' '. $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
@@ -108,9 +108,9 @@
exit();
}
- if (db_num_rows($LineItemsResult) > 0) {
+ if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['stdcostunit']==0){
$StandardCost =$myrow['stdcost'];
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/StockDispatch.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -36,14 +36,14 @@
// from location
$ErrMsg = _('Could not retrieve location name from the database');
$sqlfrom="SELECT locationname FROM `locations` where loccode='" . $_POST['FromLocation'] . "'";
- $result = db_query($sqlfrom,$db,$ErrMsg);
- $Row = db_fetch_row($result);
+ $result = DB_query($sqlfrom,$db,$ErrMsg);
+ $Row = DB_fetch_row($result);
$FromLocation=$Row['0'];
// to location
$sqlto="SELECT locationname FROM `locations` where loccode='" . $_POST['ToLocation'] . "'";
- $resultto = db_query($sqlto,$db,$ErrMsg);
- $RowTo = db_fetch_row($resultto);
+ $resultto = DB_query($sqlto,$db,$ErrMsg);
+ $RowTo = DB_fetch_row($resultto);
$ToLocation=$RowTo['0'];
// Creates WHERE clause for stock categories. StockCat is defined as an array so can choose
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SuppPriceList.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -26,8 +26,8 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['supplier'] . "'";
- $resultsup = db_query($sqlsup,$db);
- $RowSup = db_fetch_array($resultsup);
+ $resultsup = DB_query($sqlsup,$db);
+ $RowSup = DB_fetch_array($resultsup);
$SupplierName=$RowSup['suppname'];
$CurrCode =$RowSup['currcode'];
$CurrDecimalPlaces=$RowSup['currdecimalplaces'];
@@ -39,7 +39,7 @@
WHERE categoryid ='" . $_POST['category'] . "'";
$resultcat = DB_query($sqlcat,$db);
- $RowCat = db_fetch_row($resultcat);
+ $RowCat = DB_fetch_row($resultcat);
$Categoryname=$RowCat['0'];
} else {
$Categoryname='ALL';
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/UpgradeDatabase.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -129,8 +129,9 @@
case '4.06.2':
case '4.06.3':
case '4.06.4':
+ case '4.06.5':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.5':
+ case '4.06.6':
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/ConnectDB.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -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.5'; //must update manually every time there is a DB change
+$Version='4.06.6'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/Contract_Readin.php
===================================================================
--- trunk/includes/Contract_Readin.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/Contract_Readin.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -67,10 +67,10 @@
$ErrMsg = _('The bill of material cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the contract bill of material was');
- $ContractBOMResult = db_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
+ $ContractBOMResult = DB_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractBOMResult) > 0) {
- while ($myrow=db_fetch_array($ContractBOMResult)) {
+ while ($myrow=DB_fetch_array($ContractBOMResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM($myrow['stockid'],
$myrow['description'],
$myrow['workcentreadded'],
@@ -91,10 +91,10 @@
$ErrMsg = _('The other contract requirementscannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the other contract requirments was');
- $ContractReqtsResult = db_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
+ $ContractReqtsResult = DB_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractReqtsResult) > 0) {
- while ($myrow=db_fetch_array($ContractReqtsResult)) {
+ while ($myrow=DB_fetch_array($ContractReqtsResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractRequirements($myrow['requirement'],
$myrow['quantity'],
$myrow['costperunit'],
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/LanguagesArray.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -41,8 +41,8 @@
$LanguagesArray['et_EE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Arabic');
-$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/PO_ReadInOrder.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -162,11 +162,11 @@
$ErrMsg = _('The lines on the purchase order cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the purchase order lines was');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if (is_null($myrow['glcode'])){
$GLCode = '';
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -385,7 +385,7 @@
#: SecurityTokens.php:129 SelectCreditItems.php:765 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:302
#: SuppContractChgs.php:99 SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87
#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTypes.php:191
@@ -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:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: 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:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 UpgradeDatabase.php:205
+#: UpgradeDatabase.php:208 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
@@ -1936,8 +1936,8 @@
#: SelectCreditItems.php:674 SelectCreditItems.php:1035
#: SelectOrderItems.php:1334 SelectOrderItems.php:1492
#: SelectOrderItems.php:1676 SelectOrderItems.php:1803 ShipmentCosting.php:149
-#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
-#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
+#: ShipmentCosting.php:150 Shipments.php:400 Shipments.php:402
+#: Shipments.php:403 Shipments.php:487 Shipments.php:489 SpecialOrder.php:617
#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:277
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
@@ -2386,7 +2386,7 @@
#: SelectCompletedOrder.php:554 SelectCreditItems.php:990
#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 SelectProduct.php:117
#: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194
-#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193
+#: Shipments.php:401 Shipments.php:488 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
@@ -3275,8 +3275,8 @@
msgstr "Popis položky"
#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104
-#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401
-#: Shipments.php:488
+#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:400
+#: Shipments.php:487
msgid "Ordered"
msgstr "Objednáno"
@@ -3305,7 +3305,7 @@
#: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:676
-#: SelectOrderItems.php:1337 Shipments.php:405 StockLocMovements.php:94
+#: SelectOrderItems.php:1337 Shipments.php:404 StockLocMovements.php:94
#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
@@ -3669,13 +3669,13 @@
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
-#: SupplierCredit.php:730 SupplierCredit.php:759 SupplierCredit.php:784
-#: SupplierCredit.php:818 SupplierCredit.php:852 SupplierCredit.php:884
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:958
-#: SupplierCredit.php:994 SupplierCredit.php:1034 SupplierCredit.php:1060
-#: 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
+#: SupplierCredit.php:725 SupplierCredit.php:754 SupplierCredit.php:779
+#: SupplierCredit.php:813 SupplierCredit.php:847 SupplierCredit.php:879
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:953
+#: SupplierCredit.php:989 SupplierCredit.php:1029 SupplierCredit.php:1055
+#: SupplierCredit.php:1087 SupplierCredit.php:1111 SupplierCredit.php:1143
+#: SupplierCredit.php:1159 SupplierCredit.php:1172 SupplierCredit.php:1179
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierCredit.php:1283
#: SupplierInvoice.php:660 SupplierInvoice.php:733 SupplierInvoice.php:761
#: SupplierInvoice.php:788 SupplierInvoice.php:820 SupplierInvoice.php:853
#: SupplierInvoice.php:883 SupplierInvoice.php:919 SupplierInvoice.php:945
@@ -3777,14 +3777,14 @@
#: StockTransfers.php:431 SupplierAllocations.php:117
#: SupplierAllocations.php:139 SupplierAllocations.php:157
#: SupplierAllocations.php:181 SupplierAllocations.php:215
-#: SupplierAllocations.php:236 SupplierCredit.php:730 SupplierCredit.php:759
-#: SupplierCredit.php:784 SupplierCredit.php:818 SupplierCredit.php:852
-#: SupplierCredit.php:884 SupplierCredit.php:921 SupplierCredit.php:946
-#: SupplierCredit.php:958 SupplierCredit.php:994 SupplierCredit.php:1034
-#: SupplierCredit.php:1060 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:660 SupplierInvoice.php:733
+#: SupplierAllocations.php:236 SupplierCredit.php:725 SupplierCredit.php:754
+#: SupplierCredit.php:779 SupplierCredit.php:813 SupplierCredit.php:847
+#: SupplierCredit.php:879 SupplierCredit.php:916 SupplierCredit.php:941
+#: SupplierCredit.php:953 SupplierCredit.php:989 SupplierCredit.php:1029
+#: SupplierCredit.php:1055 SupplierCredit.php:1087 SupplierCredit.php:1111
+#: SupplierCredit.php:1143 SupplierCredit.php:1159 SupplierCredit.php:1172
+#: SupplierCredit.php:1179 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-13 07:17:48
|
Revision: 4797
http://web-erp.svn.sourceforge.net/web-erp/?rev=4797&view=rev
Author: daintree
Date: 2012-01-13 07:17:29 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
fix db_query to DB_query
Modified Paths:
--------------
trunk/CounterSales.php
trunk/OrderDetails.php
trunk/PDFTopItems.php
trunk/PO_OrderDetails.php
trunk/PrintCheque.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevelLocation.php
trunk/SelectOrderItems.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/StockDispatch.php
trunk/SuppPriceList.php
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/includes/Contract_Readin.php
trunk/includes/LanguagesArray.php
trunk/includes/PO_ReadInOrder.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/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/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/CounterSales.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -2075,7 +2075,7 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
$PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
@@ -2089,8 +2089,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -2257,9 +2257,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -2271,9 +2271,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -145,9 +145,9 @@
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal = 0;
$OrderTotalVolume = 0;
@@ -170,7 +170,7 @@
<th>' . _('Last Del') . '</th>
</tr>';
$k=0;
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PDFTopItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -91,8 +91,8 @@
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stkcode'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, locale_number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PO_OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -137,7 +137,7 @@
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
echo '<table colspan="8" class="selection" cellpadding="0">';
@@ -157,7 +157,7 @@
$OrderTotal=0;
$RecdTotal=0;
-while ($myrow=db_fetch_array($LineItemsResult)) {
+while ($myrow=DB_fetch_array($LineItemsResult)) {
$OrderTotal += ($myrow['quantityord'] * $myrow['unitprice']);
$RecdTotal += ($myrow['quantityrecd'] * $myrow['unitprice']);
Modified: trunk/PrintCheque.php
===================================================================
--- trunk/PrintCheque.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PrintCheque.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -15,7 +15,7 @@
$PageNumber=1;
$line_height=12;
-$result = db_query("SELECT hundredsname,
+$result = DB_query("SELECT hundredsname,
decimalplaces,
currency
FROM currencies
@@ -28,7 +28,7 @@
exit;
}
-$CurrencyRow = db_fetch_array($result);
+$CurrencyRow = DB_fetch_array($result);
$HundredsName = $CurrencyRow['hundredsname'];
$CurrDecimalPlaces = $CurrencyRow['decimalplaces'];
$CurrencyName = mb_strtolower($CurrencyRow['currency']);
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrders.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -123,10 +123,10 @@
AND recurrsalesorderdetails.recurrorderno ='" . $_GET['ModifyRecurringSalesOrder'] . "'";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrdersProcess.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -158,11 +158,11 @@
WHERE recurrsalesorderdetails.recurrorderno ='" . $RecurrOrderRow['recurrorderno'] . "'";
$ErrMsg = _('The line items of the recurring order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
$LineCounter = 0;
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal =0; //intialise
$OrderLineTotal =0;
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ReorderLevelLocation.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -122,16 +122,16 @@
$sqloh="SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stockid'] . "'";
- $oh = db_query($sqloh,$db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh,$db);
+ $ohRow = DB_fetch_row($oh);
//get On Hand in Location
$sqlohin="SELECT SUM(quantity) AS qty
FROM `locstock`
WHERE stockid='" . $myrow['stockid'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'";
- $ohin = db_query($sqlohin,$db);
- $ohinRow = db_fetch_row($ohin);
+ $ohin = DB_query($sqlohin,$db);
+ $ohinRow = DB_fetch_row($ohin);
echo'<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SelectOrderItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -218,10 +218,10 @@
ORDER BY salesorderdetails.orderlineno";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['completed']==0){
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
@@ -1539,9 +1539,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1553,8 +1553,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -1723,9 +1723,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1737,9 +1737,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ShipmentCosting.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -119,9 +119,9 @@
purchorderdetails.itemdescription";
$ErrMsg = _('The lines on the shipment could not be retrieved from the database');
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
-if (db_num_rows($LineItemsResult) > 0) {
+if (DB_num_rows($LineItemsResult) > 0) {
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
@@ -548,7 +548,7 @@
$RowCounter =0;
$TotalItemShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
@@ -624,7 +624,7 @@
$RowCounter =0;
$TotalGeneralShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/Shipments.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -100,7 +100,7 @@
ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.shiptref='" . $_GET['SelectedShipment'] . "'";
$ErrMsg = _('The lines on the shipment cannot be retrieved because'). ' - ' . DB_error_msg($db);
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
if (DB_num_rows($GetShiptHdrResult)==0) {
prnMsg ( _('Unable to locate lines for Shipment') . ' '. $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
@@ -108,9 +108,9 @@
exit();
}
- if (db_num_rows($LineItemsResult) > 0) {
+ if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['stdcostunit']==0){
$StandardCost =$myrow['stdcost'];
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/StockDispatch.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -36,14 +36,14 @@
// from location
$ErrMsg = _('Could not retrieve location name from the database');
$sqlfrom="SELECT locationname FROM `locations` where loccode='" . $_POST['FromLocation'] . "'";
- $result = db_query($sqlfrom,$db,$ErrMsg);
- $Row = db_fetch_row($result);
+ $result = DB_query($sqlfrom,$db,$ErrMsg);
+ $Row = DB_fetch_row($result);
$FromLocation=$Row['0'];
// to location
$sqlto="SELECT locationname FROM `locations` where loccode='" . $_POST['ToLocation'] . "'";
- $resultto = db_query($sqlto,$db,$ErrMsg);
- $RowTo = db_fetch_row($resultto);
+ $resultto = DB_query($sqlto,$db,$ErrMsg);
+ $RowTo = DB_fetch_row($resultto);
$ToLocation=$RowTo['0'];
// Creates WHERE clause for stock categories. StockCat is defined as an array so can choose
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SuppPriceList.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -26,8 +26,8 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['supplier'] . "'";
- $resultsup = db_query($sqlsup,$db);
- $RowSup = db_fetch_array($resultsup);
+ $resultsup = DB_query($sqlsup,$db);
+ $RowSup = DB_fetch_array($resultsup);
$SupplierName=$RowSup['suppname'];
$CurrCode =$RowSup['currcode'];
$CurrDecimalPlaces=$RowSup['currdecimalplaces'];
@@ -39,7 +39,7 @@
WHERE categoryid ='" . $_POST['category'] . "'";
$resultcat = DB_query($sqlcat,$db);
- $RowCat = db_fetch_row($resultcat);
+ $RowCat = DB_fetch_row($resultcat);
$Categoryname=$RowCat['0'];
} else {
$Categoryname='ALL';
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/UpgradeDatabase.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -129,8 +129,9 @@
case '4.06.2':
case '4.06.3':
case '4.06.4':
+ case '4.06.5':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.5':
+ case '4.06.6':
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/ConnectDB.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -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.5'; //must update manually every time there is a DB change
+$Version='4.06.6'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/Contract_Readin.php
===================================================================
--- trunk/includes/Contract_Readin.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/Contract_Readin.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -67,10 +67,10 @@
$ErrMsg = _('The bill of material cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the contract bill of material was');
- $ContractBOMResult = db_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
+ $ContractBOMResult = DB_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractBOMResult) > 0) {
- while ($myrow=db_fetch_array($ContractBOMResult)) {
+ while ($myrow=DB_fetch_array($ContractBOMResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM($myrow['stockid'],
$myrow['description'],
$myrow['workcentreadded'],
@@ -91,10 +91,10 @@
$ErrMsg = _('The other contract requirementscannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the other contract requirments was');
- $ContractReqtsResult = db_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
+ $ContractReqtsResult = DB_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractReqtsResult) > 0) {
- while ($myrow=db_fetch_array($ContractReqtsResult)) {
+ while ($myrow=DB_fetch_array($ContractReqtsResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractRequirements($myrow['requirement'],
$myrow['quantity'],
$myrow['costperunit'],
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/LanguagesArray.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -41,8 +41,8 @@
$LanguagesArray['et_EE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Arabic');
-$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/PO_ReadInOrder.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -162,11 +162,11 @@
$ErrMsg = _('The lines on the purchase order cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the purchase order lines was');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if (is_null($myrow['glcode'])){
$GLCode = '';
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -385,7 +385,7 @@
#: SecurityTokens.php:129 SelectCreditItems.php:765 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:302
#: SuppContractChgs.php:99 SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87
#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTypes.php:191
@@ -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:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: 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:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 UpgradeDatabase.php:205
+#: UpgradeDatabase.php:208 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
@@ -1936,8 +1936,8 @@
#: SelectCreditItems.php:674 SelectCreditItems.php:1035
#: SelectOrderItems.php:1334 SelectOrderItems.php:1492
#: SelectOrderItems.php:1676 SelectOrderItems.php:1803 ShipmentCosting.php:149
-#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
-#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
+#: ShipmentCosting.php:150 Shipments.php:400 Shipments.php:402
+#: Shipments.php:403 Shipments.php:487 Shipments.php:489 SpecialOrder.php:617
#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:277
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
@@ -2386,7 +2386,7 @@
#: SelectCompletedOrder.php:554 SelectCreditItems.php:990
#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 SelectProduct.php:117
#: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194
-#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193
+#: Shipments.php:401 Shipments.php:488 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
@@ -3275,8 +3275,8 @@
msgstr "Popis položky"
#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104
-#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401
-#: Shipments.php:488
+#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:400
+#: Shipments.php:487
msgid "Ordered"
msgstr "Objednáno"
@@ -3305,7 +3305,7 @@
#: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:676
-#: SelectOrderItems.php:1337 Shipments.php:405 StockLocMovements.php:94
+#: SelectOrderItems.php:1337 Shipments.php:404 StockLocMovements.php:94
#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
@@ -3669,13 +3669,13 @@
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
-#: SupplierCredit.php:730 SupplierCredit.php:759 SupplierCredit.php:784
-#: SupplierCredit.php:818 SupplierCredit.php:852 SupplierCredit.php:884
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:958
-#: SupplierCredit.php:994 SupplierCredit.php:1034 SupplierCredit.php:1060
-#: 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
+#: SupplierCredit.php:725 SupplierCredit.php:754 SupplierCredit.php:779
+#: SupplierCredit.php:813 SupplierCredit.php:847 SupplierCredit.php:879
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:953
+#: SupplierCredit.php:989 SupplierCredit.php:1029 SupplierCredit.php:1055
+#: SupplierCredit.php:1087 SupplierCredit.php:1111 SupplierCredit.php:1143
+#: SupplierCredit.php:1159 SupplierCredit.php:1172 SupplierCredit.php:1179
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierCredit.php:1283
#: SupplierInvoice.php:660 SupplierInvoice.php:733 SupplierInvoice.php:761
#: SupplierInvoice.php:788 SupplierInvoice.php:820 SupplierInvoice.php:853
#: SupplierInvoice.php:883 SupplierInvoice.php:919 SupplierInvoice.php:945
@@ -3777,14 +3777,14 @@
#: StockTransfers.php:431 SupplierAllocations.php:117
#: SupplierAllocations.php:139 SupplierAllocations.php:157
#: SupplierAllocations.php:181 SupplierAllocations.php:215
-#: SupplierAllocations.php:236 SupplierCredit.php:730 SupplierCredit.php:759
-#: SupplierCredit.php:784 SupplierCredit.php:818 SupplierCredit.php:852
-#: SupplierCredit.php:884 SupplierCredit.php:921 SupplierCredit.php:946
-#: SupplierCredit.php:958 SupplierCredit.php:994 SupplierCredit.php:1034
-#: SupplierCredit.php:1060 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:660 SupplierInvoice.php:733
+#: SupplierAllocations.php:236 SupplierCredit.php:725 SupplierCredit.php:754
+#: SupplierCredit.php:779 SupplierCredit.php:813 SupplierCredit.php:847
+#: SupplierCredit.php:879 SupplierCredit.php:916 SupplierCredit.php:941
+#: SupplierCredit.php:953 SupplierCredit.php:989 SupplierCredit.php:1029
+#: SupplierCredit.php:1055 SupplierCredit.php:1087 SupplierCredit.php:1111
+#: SupplierCredit.php:1143 SupplierCredit.php:1159 SupplierCredit.php:1172
+#: SupplierCredit.php:1179 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X