Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dai...@us...> - 2011-03-29 09:20:26
|
Revision: 4524
http://web-erp.svn.sourceforge.net/web-erp/?rev=4524&view=rev
Author: daintree
Date: 2011-03-29 09:20:20 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
remove fpdi directory
Removed Paths:
-------------
trunk/fpdi/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-29 09:20:26
|
Revision: 4524
http://web-erp.svn.sourceforge.net/web-erp/?rev=4524&view=rev
Author: daintree
Date: 2011-03-29 09:20:20 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
remove fpdi directory
Removed Paths:
-------------
trunk/fpdi/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-29 09:14:03
|
Revision: 4523
http://web-erp.svn.sourceforge.net/web-erp/?rev=4523&view=rev
Author: daintree
Date: 2011-03-29 09:13:54 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
revert zh_CN.utf8 to pre 4.03RC2
Added Paths:
-----------
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
Added: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:13:54 UTC (rev 4523)
@@ -0,0 +1,37520 @@
+# weberp 简体中文界面文件
+# Copyright (C) 2007 Logic Works Ltd
+# This file is distributed under the same license as the webERP package.
+# FIRST AUTHOR <rom...@gm...>, 2006.
+# THIS VERSION FROM http://weberp-china.oicp.net
+msgid ""
+msgstr ""
+"Project-Id-Version: WEBERP3.05 VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-15 18:44+1200\n"
+"PO-Revision-Date: 2011-01-29 15:12+0000\n"
+"Last-Translator: Exson qu <hex...@gm...>\n"
+"Language-Team: WebERP Translation Team <web-erp-translation@lists."
+"sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-29 15:16+0000\n"
+"X-Generator: Launchpad (build 12274)\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SearchPath-0: webERPRC4\n"
+"X-Poedit-Basepath: C:\\改过自新\\\n"
+
+#: AccountGroups.php:9 index.php:1268
+msgid "Account Groups"
+msgstr "科目组"
+
+#: AccountGroups.php:19
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr "在递归检查中查询父账户组中的科目组发生错误"
+
+#: AccountGroups.php:20
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr "用于查询父账户组的科目组失败的SQL是"
+
+#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:187
+msgid "The SQL that was used to retrieve the information was"
+msgstr "用于查找交易数据的SQL是"
+
+#: AccountGroups.php:58
+msgid "Could not check whether the group exists because"
+msgstr "未能判定组别是否存在, 因为"
+
+#: AccountGroups.php:65
+msgid "The account group name already exists in the database"
+msgstr "科目组名称已经存在在数据库中。"
+
+#: AccountGroups.php:71
+msgid "The account group name cannot contain the character"
+msgstr "科目组名称不能包含这个字符"
+
+#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
+#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:32
+msgid "or the character"
+msgstr "或这个字符"
+
+#: AccountGroups.php:77
+msgid "The account group name must be at least one character long"
+msgstr "科目组名称必须不少于 1 个字"
+
+#: AccountGroups.php:84
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+"所选的父账户组看来会导致一个递归的账户结构-选择一个另外的父账户组或者将此账户"
+"组作为一个最顶层的账户组"
+
+#: AccountGroups.php:95
+msgid "Could not check whether the group is recursive because"
+msgstr "未能检查此组是否递归, 因为"
+
+#: AccountGroups.php:107
+msgid "The section in accounts must be an integer"
+msgstr "会计科目类别必须是整数"
+
+#: AccountGroups.php:113
+msgid "The sequence in the trial balance must be an integer"
+msgstr "试算表内行号必须是整数"
+
+#: AccountGroups.php:119
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "试算表内顺序必须是数字且小于"
+
+#: AccountGroups.php:136
+msgid "An error occurred in updating the account group"
+msgstr "更新科目组是发生了错误"
+
+#: AccountGroups.php:137
+msgid "The SQL that was used to update the account group was"
+msgstr "用于更新科目组失败的 SQL 是"
+
+#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
+msgid "Record Updated"
+msgstr "记录已更新"
+
+#: AccountGroups.php:157
+msgid "An error occurred in inserting the account group"
+msgstr "插入科目组时发生错误, 因为"
+
+#: AccountGroups.php:158
+msgid "The SQL that was used to insert the account group was"
+msgstr "用作插入科目组失败的 SQL 是"
+
+#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
+msgid "Record inserted"
+msgstr "记录已新增"
+
+#: AccountGroups.php:176
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr "从主表中查找组信息时发生错误"
+
+#: AccountGroups.php:181
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr "不能删除，已创建了属于这个科目组的会计科目"
+
+#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
+#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
+#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
+#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
+#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
+#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
+#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
+#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
+#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
+#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
+#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
+#: Stocks.php:471 Stocks.php:480 Stocks.php:488 Stocks.php:496 Stocks.php:504
+#: Stocks.php:512 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
+#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
+#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:142
+#: UnitsOfMeasure.php:149 WorkCentres.php:90 WorkCentres.php:96
+#: WWW_Access.php:87
+msgid "There are"
+msgstr "存在"
+
+#: AccountGroups.php:182
+msgid "general ledger accounts that refer to this account group"
+msgstr "属于此科目组的会计科目"
+
+#: AccountGroups.php:186
+msgid "An error occurred in retrieving the parent group information"
+msgstr "查找父组信息时发生错误"
+
+#: AccountGroups.php:191
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr "删除会计科目组失败, 由于它是其他账户组的父账户组。"
+
+#: AccountGroups.php:192
+msgid "account groups that have this group as its/there parent account group"
+msgstr "账户组将此账户作为他的/他们的父账户组"
+
+#: AccountGroups.php:195
+msgid "An error occurred in deleting the account group"
+msgstr "删除账户组是发生错误"
+
+#: AccountGroups.php:196
+msgid "The SQL that was used to delete the account group was"
+msgstr "用于账户组的 SQL 是"
+
+#: AccountGroups.php:198
+msgid "group has been deleted"
+msgstr "科目组已删除"
+
+#: AccountGroups.php:223
+msgid "The sql that was used to retrieve the account group information was "
+msgstr "用于查询账户组信息的SQL是 "
+
+#: AccountGroups.php:224
+msgid "Could not get account groups because"
+msgstr "不能取得科目组, 由于"
+
+#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
+#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
+#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
+#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
+#: CounterSales.php:1983 CounterSales.php:2107 Credit_Invoice.php:257
+#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
+#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
+#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
+#: EDIMessageFormat.php:106 FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13 FixedAssetRegister.php:238
+#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
+#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
+#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
+#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
+#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
+#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
+#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
+#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
+#: PurchData.php:141 PurchData.php:256 PurchData.php:275
+#: RecurringSalesOrders.php:311 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
+#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
+#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
+#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
+#: SelectCreditItems.php:272 SelectCustomer.php:322 SelectGLAccount.php:19
+#: SelectGLAccount.php:79 SelectOrderItems.php:607 SelectOrderItems.php:1431
+#: SelectOrderItems.php:1555 SelectProduct.php:456 SelectSalesOrder.php:155
+#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
+#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
+#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
+#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
+#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
+#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:65
+#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
+#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
+#: WWW_Users.php:38 Z_BottomUpCosts.php:51
+msgid "Search"
+msgstr "查找"
+
+#: AccountGroups.php:230
+msgid "Group Name"
+msgstr "科目组名称"
+
+#: AccountGroups.php:231 EDIMessageFormat.php:131
+msgid "Section"
+msgstr "会计要素"
+
+#: AccountGroups.php:232 AccountGroups.php:396
+msgid "Sequence In TB"
+msgstr "试算表行次"
+
+#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
+#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
+#: SelectGLAccount.php:45 SelectGLAccount.php:59
+msgid "Profit and Loss"
+msgstr "损益类"
+
+#: AccountGroups.php:234 AccountGroups.php:341
+msgid "Parent Group"
+msgstr "父组"
+
+#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
+#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
+#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
+#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
+#: CompanyPreferences.php:451 CompanyPreferences.php:453
+#: CompanyPreferences.php:463 CompanyPreferences.php:465
+#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
+#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
+#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
+#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
+#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
+#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
+#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
+#: PO_Header.php:758 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
+#: PurchData.php:192 PurchData.php:494 PurchData.php:497
+#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
+#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
+#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
+#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
+#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
+#: Stocks.php:871 Stocks.php:873 Stocks.php:891 Stocks.php:893
+#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
+#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
+#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
+#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
+#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:756
+#: SystemParameters.php:887 SystemParameters.php:889 SystemParameters.php:899
+#: SystemParameters.php:901 SystemParameters.php:955 SystemParameters.php:967
+#: SystemParameters.php:969 TaxGroups.php:292 TaxGroups.php:295
+#: TaxGroups.php:344 WWW_Users.php:610 WWW_Users.php:612
+msgid "Yes"
+msgstr "是"
+
+#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
+#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
+#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
+#: CompanyPreferences.php:438 CompanyPreferences.php:442
+#: CompanyPreferences.php:450 CompanyPreferences.php:454
+#: CompanyPreferences.php:462 CompanyPreferences.php:466
+#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
+#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
+#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
+#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
+#: Locations.php:375 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
+#: MRP.php:540 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:265 PaymentMethods.php:271 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:757 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
+#: PurchData.php:195 PurchData.php:495 PurchData.php:498
+#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
+#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
+#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
+#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
+#: Stocks.php:866 Stocks.php:868 Stocks.php:886 Stocks.php:888
+#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
+#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
+#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
+#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
+#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:757
+#: SystemParameters.php:886 SystemParameters.php:890 SystemParameters.php:898
+#: SystemParameters.php:902 SystemParameters.php:956 SystemParameters.php:966
+#: SystemParameters.php:970 TaxGroups.php:293 TaxGroups.php:296
+#: TaxGroups.php:346 WWW_Users.php:609 WWW_Users.php:613
+#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "否"
+
+#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
+#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
+#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
+#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
+#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
+#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
+#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
+#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
+#: Labels.php:414 Locations.php:382 MRPDemands.php:304 MRPDemandTypes.php:122
+#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
+#: PcClaimExpensesFromTab.php:229 PcExpenses.php:176 PcTabs.php:188
+#: PcTypeTabs.php:171 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
+#: Prices.php:227 PurchData.php:207 SalesCategories.php:263
+#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
+#: SalesTypes.php:206 SelectCustomer.php:609 SelectCustomer.php:625
+#: SelectCustomer.php:647 SelectCustomer.php:663 SelectCustomer.php:685
+#: SelectCustomer.php:701 Shippers.php:144 StockCategories.php:244
+#: SupplierContacts.php:153 SupplierTypes.php:192 SuppLoginSetup.php:274
+#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
+#: TaxProvinces.php:178 UnitsOfMeasure.php:201 WorkCentres.php:138
+#: WWW_Access.php:127 WWW_Users.php:312 includes/InputSerialItems.php:88
+#, php-format
+msgid "Edit"
+msgstr "编辑"
+
+#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
+#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
+#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
+#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
+#: CounterSales.php:781 Credit_Invoice.php:386 CreditStatus.php:176
+#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
+#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
+#: DiscountMatrix.php:178 EDIMessageFormat.php:153
+#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
+#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:383
+#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
+#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
+#: PcClaimExpensesFromTab.php:230 PcExpenses.php:177 PcExpensesTypeTab.php:161
+#: PcTabs.php:189 PcTypeTabs.php:172 PO_AuthorisationLevels.php:150
+#: PO_Items.php:758 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
+#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
+#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
+#: SalesTypes.php:207 SelectCreditItems.php:747 SelectCustomer.php:610
+#: SelectCustomer.php:626 SelectCustomer.php:648 SelectCustomer.php:664
+#: SelectCustomer.php:686 SelectCustomer.php:702 SelectOrderItems.php:1358
+#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
+#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
+#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:81 SuppInvGRNs.php:135
+#: SupplierContacts.php:154 SupplierTypes.php:194 SuppLoginSetup.php:275
+#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
+#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
+#: UnitsOfMeasure.php:202 WorkCentres.php:139 WOSerialNos.php:300
+#: WWW_Access.php:128 WWW_Users.php:313 includes/InputSerialItemsKeyed.php:54
+#, php-format
+msgid "Delete"
+msgstr "删除"
+
+#: AccountGroups.php:274
+msgid "Review Account Groups"
+msgstr "查看科目组"
+
+#: AccountGroups.php:294
+msgid "An error occurred in retrieving the account group information"
+msgstr "查找账户组信息时发生错误"
+
+#: AccountGroups.php:295
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr "用于查询科目组失败的SQL是"
+
+#: AccountGroups.php:298
+msgid "The account group name does not exist in the database"
+msgstr "科目组名称在数据库中不存在。"
+
+#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
+#: Z_ImportGLAccountGroups.php:28
+msgid "Account Group"
+msgstr "科目组"
+
+#: AccountGroups.php:338
+msgid "Account Group Name"
+msgstr "科目组名称"
+
+#: AccountGroups.php:348 AccountGroups.php:350
+msgid "Top Level Group"
+msgstr "顶层组"
+
+#: AccountGroups.php:364
+msgid "Section In Accounts"
+msgstr "会计要素"
+
+#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
+#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
+#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
+#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
+#: DiscountMatrix.php:141 EDIMessageFormat.php:249
+#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
+#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
+#: Locations.php:553 MRPDemands.php:402 MRPDemandTypes.php:182
+#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
+#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
+#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
+#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
+#: SupplierContacts.php:250 SuppLoginSetup.php:532 TaxAuthorities.php:313
+#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:253
+#: WorkCentres.php:261 WWW_Users.php:643
+msgid "Enter Information"
+msgstr "保存"
+
+#: AccountSections.php:9 index.php:1273
+msgid "Account Sections"
+msgstr "会计要素"
+
+#: AccountSections.php:68
+msgid "The account section already exists in the database"
+msgstr "会计要素已经存在于数据库"
+
+#: AccountSections.php:75
+msgid "The account section name cannot contain the character"
+msgstr "会计要素不能包含这个字符"
+
+#: AccountSections.php:81
+msgid "The account section name must contain at least one character"
+msgstr "会计要素名称必须包含至少一个字符"
+
+#: AccountSections.php:87 AccountSections.php:93
+msgid "The section number must be an integer"
+msgstr "会计要素编号必须是整数"
+
+#: AccountSections.php:138
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr "此会计要素已被科目组使用，不能删除"
+
+#: AccountSections.php:139
+msgid "general ledger accounts groups that refer to this account section"
+msgstr "个科目组需要此会计要素"
+
+#: AccountSections.php:150
+msgid "section has been deleted"
+msgstr "删除会计要素成功"
+
+#: AccountSections.php:175
+msgid "Could not get account group sections because"
+msgstr "找不到会计要素，原因是："
+
+#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
+msgid "Section Number"
+msgstr "会计要素编号"
+
+#: AccountSections.php:182 AccountSections.php:258
+msgid "Section Description"
+msgstr "会计要素名称"
+
+#: AccountSections.php:199
+msgid "Restricted"
+msgstr "不可修改"
+
+#: AccountSections.php:210
+msgid "Review Account Sections"
+msgstr "查看会计要素"
+
+#: AccountSections.php:228
+msgid "Could not retrieve the requested section please try again."
+msgstr "找不到会计要素, 请重试"
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:603
+#: SelectCustomer.php:632
+msgid "Customer Contacts"
+msgstr "顾客联系人"
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
+#: Z_CheckDebtorsControl.php:21
+msgid "Back to Customers"
+msgstr "返回客户"
+
+#: AddCustomerContacts.php:26
+msgid "Contacts for Customer: <b>"
+msgstr "客户的联系人"
+
+#: AddCustomerContacts.php:29
+msgid "Edit contact for <b>"
+msgstr "编辑联系人"
+
+#: AddCustomerContacts.php:41
+msgid "The Contact must be an integer."
+msgstr "联系人必须是整数"
+
+#: AddCustomerContacts.php:44
+msgid "The contact's name must be forty characters or less long"
+msgstr "联系人名称必须不多于50个字符"
+
+#: AddCustomerContacts.php:47
+msgid "The contact's name may not be empty"
+msgstr "联系人名称不能留空"
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
+#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:230
+#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:60
+#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:412 SalesAnalReptCols.php:129
+#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:355 Suppliers.php:514
+#: SupplierTypes.php:69
+msgid "has been updated"
+msgstr "已更新"
+
+#: AddCustomerContacts.php:70
+msgid "The contact record has been added"
+msgstr "联系人已新增"
+
+#: AddCustomerContacts.php:98
+msgid "The contact record has been deleted"
+msgstr "联系人记录已删除"
+
+#: AddCustomerContacts.php:112 CompanyPreferences.php:229
+#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
+#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:605
+#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:141
+#: SupplierCredit.php:433 SupplierInvoice.php:408 SuppTransGLAnalysis.php:96
+#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: includes/PDFTaxPageHeader.inc:37
+msgid "Name"
+msgstr "名称"
+
+#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
+#: Customers.php:906 Customers.php:972 SelectCustomer.php:606
+#: WWW_Access.php:111 WWW_Access.php:172
+msgid "Role"
+msgstr "职位"
+
+#: AddCustomerContacts.php:114 Customers.php:973
+msgid "Phone no"
+msgstr "电话"
+
+#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
+#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
+#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
+#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
+#: PcReportTab.php:348 SelectCustomer.php:608 SystemParameters.php:316
+#: WOSerialNos.php:277 WOSerialNos.php:279
+msgid "Notes"
+msgstr "备注"
+
+#: AddCustomerContacts.php:149
+msgid "Review all contacts for this Customer"
+msgstr "查看此顾客的所有联络人"
+
+#: AddCustomerContacts.php:179
+msgid "Contact Code"
+msgstr "联系人代码"
+
+#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:218
+msgid "Contact Name"
+msgstr "联系人名称"
+
+#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
+#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:225
+#: SelectCustomer.php:463 SelectOrderItems.php:639
+#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
+#: includes/PDFTransPageHeaderPortrait.inc:105
+msgid "Phone"
+msgstr "电话"
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:640
+#: SelectCustomer.php:670
+msgid "Customer Notes"
+msgstr "客户通知"
+
+#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+msgid "Back to Select Customer"
+msgstr "返回选择客户"
+
+#: AddCustomerNotes.php:31
+msgid "The contact priority must be an integer."
+msgstr "联系优先级必须是整数"
+
+#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr "联系人备注必须不多于200个字符"
+
+#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+msgid "The contact's notes may not be empty"
+msgstr "联系人备注不能留空"
+
+#: AddCustomerNotes.php:60
+msgid "The contact notes record has been added"
+msgstr "联系人备注记录已新增"
+
+#: AddCustomerNotes.php:87
+msgid "The contact note record has been deleted"
+msgstr "联系人备注记录已删除"
+
+#: AddCustomerNotes.php:98
+msgid "Notes for Customer"
+msgstr "客户通知："
+
+#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
+#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
+#: ContractCosting.php:149 CustomerAllocations.php:332
+#: CustomerAllocations.php:358 CustomerInquiry.php:191
+#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
+#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
+#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
+#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
+#: PrintCustTrans.php:616 PrintCustTransPortrait.php:790 ReverseGRN.php:378
+#: ShipmentCosting.php:503 ShipmentCosting.php:574 Shipments.php:467
+#: StockDispatch.php:188 StockDispatch.php:200 StockLocMovements.php:85
+#: StockMovements.php:98 StockSerialItemResearch.php:79
+#: SupplierAllocations.php:464 SupplierAllocations.php:576
+#: SupplierAllocations.php:646 SupplierInquiry.php:195
+#: SupplierTransInquiry.php:89 includes/PDFQuotationPageHeader.inc:91
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: includes/PDFTransPageHeader.inc:84
+#: includes/PDFTransPageHeaderPortrait.inc:58
+msgid "Date"
+msgstr "日期"
+
+#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:176
+#: Stocks.php:875 UpgradeDatabase.php:147 UpgradeDatabase.php:150
+#: UpgradeDatabase.php:153 UpgradeDatabase.php:156 UpgradeDatabase.php:159
+#: UpgradeDatabase.php:162 UpgradeDatabase.php:165 UpgradeDatabase.php:168
+#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
+#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
+#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
+#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
+#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
+msgid "Note"
+msgstr "备注"
+
+#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
+msgid "WWW"
+msgstr "WWW万维网"
+
+#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
+#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
+msgid "Priority"
+msgstr "优先级"
+
+#: AddCustomerNotes.php:143
+msgid "Review all notes for this Customer"
+msgstr "查看此顾客的所有通知"
+
+#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
+msgid "Note ID"
+msgstr "Note ID"
+
+#: AddCustomerNotes.php:177
+msgid "Contact Note"
+msgstr "联络人备注"
+
+#: AddCustomerTypeNotes.php:6 SelectCustomer.php:678
+msgid "Customer Type (Group) Notes"
+msgstr "顾客种类(组）备注"
+
+#: AddCustomerTypeNotes.php:31
+msgid "The Contact priority must be an integer."
+msgstr "联络人优先级必须是整数"
+
+#: AddCustomerTypeNotes.php:49 SelectCustomer.php:708
+msgid "Customer Group Notes"
+msgstr "顾客组通知"
+
+#: AddCustomerTypeNotes.php:60
+msgid "The contact group notes record has been added"
+msgstr "联系人组通知记录已增加"
+
+#: AddCustomerTypeNotes.php:84
+msgid "The contact group note record has been deleted"
+msgstr "联系人组通知记录已经删除"
+
+#: AddCustomerTypeNotes.php:95
+msgid "Notes for Customer Type"
+msgstr "顾客类型的通知："
+
+#: AddCustomerTypeNotes.php:106
+msgid "href"
+msgstr "href"
+
+#: AddCustomerTypeNotes.php:141
+msgid "Review all notes for this Customer Type"
+msgstr "查看此顾客类型的所有通知。"
+
+#: AddCustomerTypeNotes.php:182
+msgid "Contact Group Note"
+msgstr "联系人组通知"
+
+#: AddCustomerTypeNotes.php:184
+msgid "Web site"
+msgstr "网站"
+
+#: AgedDebtors.php:17
+msgid "Aged Customer Balance Listing"
+msgstr "应收账款帐龄分析表"
+
+#: AgedDebtors.php:18
+msgid "Aged Customer Balances"
+msgstr "欠款余额"
+
+#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+msgid "Aged Customer Account Analysis"
+msgstr "客户欠款分析"
+
+#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
+#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
+#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:90
+#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:174
+#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
+#: InventoryPlanning.php:209 InventoryPlanning.php:257
+#: InventoryPlanning.php:295 InventoryPlanningPrefSupplier.php:208
+#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
+#: InventoryPlanningPrefSupplier.php:355 InventoryPlanningPrefSupplier.php:401
+#: InventoryQuantities.php:83 InventoryValuation.php:76
+#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:111
+#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:529
+#: MRPReschedules.php:46 MRPReschedules.php:58 MRPShortages.php:137
+#: MRPShortages.php:149 OutstandingGRNs.php:51 OutstandingGRNs.php:63
+#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
+#: PDFLowGP.php:23 PDFStockCheckComparison.php:35
+#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
+#: ReorderLevel.php:59 SelectAsset.php:36 SelectProduct.php:37
+#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:325
+#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
+msgid "Problem Report"
+msgstr "问题报告"
+
+#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
+#: DebtorsAtPeriodEnd.php:60
+msgid "The customer details could not be retrieved by the SQL because"
+msgstr "客户明细资料无法从SQL取得, 因为"
+
+#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
+#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
+#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
+#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
+#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
+#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:93
+#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
+#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:177 GLTagProfit_Loss.php:189
+#: GLTrialBalance.php:154 GLTrialBalance.php:166 InventoryPlanning.php:102
+#: InventoryPlanning.php:177 InventoryPlanning.php:212
+#: InventoryPlanning.php:260 InventoryPlanning.php:298
+#: InventoryPlanning.php:361 InventoryPlanningPrefSupplier.php:211
+#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
+#: InventoryPlanningPrefSupplier.php:358 InventoryPlanningPrefSupplier.php:404
+#: InventoryPlanningPrefSupplier.php:460 InventoryQuantities.php:86
+#: InventoryQuantities.php:97 InventoryValuation.php:79
+#: InventoryValuation.php:90 MailInventoryValuation.php:118
+#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedPurchaseOrders.php:125 MRPPlannedWorkOrders.php:108
+#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:318 MRPReport.php:41
+#: MRPReport.php:52 MRPReport.php:150 MRPReschedules.php:49
+#: MRPReschedules.php:61 MRPShortages.php:140 MRPShortages.php:152
+#: OutstandingGRNs.php:54 OutstandingGRNs.php:66 PcReportTab.php:236
+#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFGrn.php:124
+#: PDFLowGP.php:63 PDFLowGP.php:75 PDFPriceList.php:124 PDFQuotation.php:237
+#: PDFRemittanceAdvice.php:84 PDFStockCheckComparison.php:39
+#: PDFStockCheckComparison.php:65 PDFStockCheckComparison.php:266
+#: PDFTopItems.php:125 PO_PDFPurchOrder.php:30 PO_PDFPurchOrder.php:144
+#: PrintCustOrder_generic.php:182 PrintCustOrder.php:198
+#: PrintSalesOrder_generic.php:183 ReorderLevel.php:62 ReorderLevel.php:151
+#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:25 StockCheck.php:47
+#: StockCheck.php:68 StockCheck.php:98 StockCheck.php:142 StockCheck.php:153
+#: StockCheck.php:194 StockDispatch.php:93 StockDispatch.php:105
+#: SupplierBalsAtPeriodEnd.php:57 SupplierBalsAtPeriodEnd.php:68
+#: SuppPaymentRun.php:109 SuppPaymentRun.php:120 SuppPaymentRun.php:184
+#: SuppPaymentRun.php:214 SuppPriceList.php:121 Tax.php:64 Tax.php:177
+#: Tax.php:286 Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
+#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
+#: Z_DataExport.php:420 Z_DataExport.php:472 Z_poRebuildDefault.php:38
+#: includes/PDFPaymentRun_PymtFooter.php:57
+#: includes/PDFPaymentRun_PymtFooter.php:87
+#: includes/PDFPaymentRun_PymtFooter.php:116
+#: includes/PDFPaymentRun_PymtFooter.php:152
+#: includes/PDFPaymentRun_PymtFooter.php:183
+#: includes/PDFPaymentRun_PymtFooter.php:215
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:340
+msgid "Back to the menu"
+msgstr "返回主菜单"
+
+#: AgedDebtors.php:367
+msgid "The details of outstanding transactions for customer"
+msgstr "该用户未清算的交易明细"
+
+#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
+#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:472
+#: PO_Items.php:601 PO_Items.php:628 SalesAnalReptCols.php:356
+#: SpecialOrder.php:369 StockLocTransferReceive.php:373
+#: StockQuantityByDate.php:106 includes/SelectOrderItems_IntoCart.inc:53
+msgid "could not be retrieved because"
+msgstr "不能取得, 因为"
+
+#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
+#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:963
+#: ConfirmDispatch_Invoice.php:977 Contracts.php:581 CounterSales.php:1323
+#: CounterSales.php:1337 Credit_Invoice.php:707 Credit_Invoice.php:729
+#: CustomerReceipt.php:526 CustomerReceipt.php:658 CustomerReceipt.php:686
+#: CustomerTransInquiry.php:79 DeliveryDetails.php:395 GLProfit_Loss.php:578
+#: GLTagProfit_Loss.php:490 Payments.php:307 PDFRemittanceAdvice.php:86
+#: PurchData.php:89 PurchData.php:108 PurchData.php:244 ReverseGRN.php:191
+#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1383
+#: StockCheck.php:224 StockCostUpdate.php:79 StockCostUpdate.php:89
+#: StockLocStatus.php:142 StockMovements.php:92 StockQuantityByDate.php:82
+#: StockReorderLevel.php:39 StockStatus.php:271 StockTransfers.php:159
+#: StockUsageGraph.php:53 StockUsage.php:127 SupplierInquiry.php:79
+#: SupplierInquiry.php:101 SupplierInquiry.php:131 SupplierInquiry.php:177
+#: SupplierTransInquiry.php:81 SuppPaymentRun.php:111 SuppPaymentRun.php:186
+#: SuppPaymentRun.php:216 WorkOrderCosting.php:393 WorkOrderReceive.php:272
+#: WOSerialNos.php:44 Z_ChangeBranchCode.php:108 Z_ChangeCustomerCode.php:92
+#: Z_DeleteCreditNote.php:57 Z_DeleteInvoice.php:83
+#: includes/PDFPaymentRun_PymtFooter.php:59
+#: includes/PDFPaymentRun_PymtFooter.php:89
+#: includes/PDFPaymentRun_PymtFooter.php:118
+#: includes/PDFPaymentRun_PymtFooter.php:154
+#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:86
+#: includes/ConnectDB_mysql.inc:68
+msgid "The SQL that failed was"
+msgstr "运行失败的 SQL 是"
+
+#: AgedDebtors.php:438
+msgid "There are no customers meeting the criteria specified to list"
+msgstr "没有符合条件的客户"
+
+#: AgedDebtors.php:464
+msgid "Aged Debtor Analysis"
+msgstr "应收账款账龄分析表"
+
+#: AgedDebtors.php:477 DebtorsAtPeriodEnd.php:148
+msgid "From Customer Code"
+msgstr "由客户编号"
+
+#: AgedDebtors.php:478 DebtorsAtPeriodEnd.php:149
+msgid "To Customer Code"
+msgstr "到客户编号"
+
+#: AgedDebtors.php:480 AgedSuppliers.php:293
+msgid "All balances or overdues only"
+msgstr "全部余额或只包含过期未付的"
+
+#: AgedDebtors.php:481
+msgid "All customers with balances"
+msgstr "所有有余额的客户"
+
+#: AgedDebtors.php:482 AgedSuppliers.php:296
+msgid "Overdue accounts only"
+msgstr "只显示过期未付的"
+
+#: AgedDebtors.php:483
+msgid "Held accounts only"
+msgstr "只显示被冻结的客户"
+
+#: AgedDebtors.php:486
+msgid "Only Show Customers Of"
+msgstr "负责客户的销售员："
+
+#: AgedDebtors.php:498
+msgid "Only show customers trading in"
+msgstr "客户的货币"
+
+#: AgedDebtors.php:514
+msgid "Summary or detailed report"
+msgstr "汇总或明细"
+
+#: AgedDebtors.php:516 AgedSuppliers.php:316 InventoryValuation.php:238
+msgid "Summary Report"
+msgstr "汇总报表"
+
+#: AgedDebtors.php:517 AgedSuppliers.php:317 InventoryValuation.php:239
+msgid "Detailed Report"
+msgstr "明细报表"
+
+#: AgedDebtors.php:520 AgedSuppliers.php:320 BOMExtendedQty.php:300
+#: BOMIndented.php:278 BOMIndentedReverse.php:266 BOMListing.php:142
+#: DebtorsAtPeriodEnd.php:166 InventoryPlanning.php:442
+#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:188
+#: InventoryValuation.php:242 MRPPlannedPurchaseOrders.php:279
+#: MRPPlannedWorkOrders.php:344 MRPReschedules.php:166 MRPShortages.php:262
+#: OutstandingGRNs.php:185 PDFCustomerList.php:412 PDFLowGP.php:168
+#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
+#: PDFStockCheckComparison.php:379 PrintCustTrans.php:416
+#: PrintCustTransPortrait.php:560 ReorderLevel.php:229 StockDispatch.php:309
+#: SupplierBalsAtPeriodEnd.php:155 SuppPriceList.php:237 Tax.php:352
+msgid "Print PDF"
+msgstr "打印到PDF"
+
+#: AgedSuppliers.php:18
+msgid "Aged Supplier Listing"
+msgstr "应付账款账龄分析表"
+
+#: AgedSuppliers.php:19
+msgid "Aged Suppliers"
+msgstr "供应商"
+
+#: AgedSuppliers.php:105
+msgid "Aged Supplier Account Analysis"
+msgstr "应付账款账龄分析"
+
+#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
+msgid "The Supplier details could not be retrieved by the SQL because"
+msgstr "供应商明细资料未能由SQL取得, 因为"
+
+#: AgedSuppliers.php:187
+msgid "Aged Supplier Account Analysis - Problem Report"
+msgstr "应付账款帐龄分析-问题报告"
+
+#: AgedSuppliers.php:189
+msgid "The details of outstanding transactions for Supplier"
+msgstr "该供应商未清算的交易明细"
+
+#: AgedSuppliers.php:273
+msgid "Aged Supplier Analysis"
+msgstr "应付账款帐龄分析"
+
+#: AgedSuppliers.php:286 OutstandingGRNs.php:180 PDFRemittanceAdvice.php:138
+#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:259
+msgid "From Supplier Code"
+msgstr "从供应商编号"
+
+#: AgedSuppliers.php:289 OutstandingGRNs.php:182 PDFRemittanceAdvice.php:140
+#: SupplierBalsAtPeriodEnd.php:134 SuppPaymentRun.php:261
+msgid "To Supplier Code"
+msgstr "到供应商编号"
+
+#: AgedSuppliers.php:295
+msgid "All suppliers with balances"
+msgstr "全部有余额的供应商"
+
+#: AgedSuppliers.php:299
+msgid "For suppliers trading in"
+msgstr "供应商货币"
+
+#: AgedSuppliers.php:314 InventoryValuation.php:237
+msgid "Summary or Detailed Report"
+msgstr "汇总或明细表"
+
+#: Areas.php:8
+msgid "Sales Area Maintenance"
+msgstr "销售区域"
+
+#: Areas.php:41
+msgid "The area code must be three characters or less long"
+msgstr "区域编号长度必须是或少于3个字符"
+
+#: Areas.php:46
+msgid "The area code entered already exists"
+msgstr "输入的区域代码已经存在"
+
+#: Areas.php:51
+msgid "The area description must be twenty five characters or less long"
+msgstr "区域说明长度必须是或少于25个字符"
+
+#: Areas.php:56
+msgid "The area code may not be empty"
+msgstr "区域编号不能为空"
+
+#: Areas.php:61
+msgid "The area description may not be empty"
+msgstr "区域说明不能为空"
+
+#: Areas.php:74
+msgid "Area code"
+msgstr "区域编号"
+
+#: Areas.php:88
+msgid "New area code"
+msgstr "新区域编号"
+
+#: Areas.php:88
+msgid "has been inserted"
+msgstr "已插入"
+
+#: Areas.php:95
+msgid "The area could not be added or updated because"
+msgstr "区域编号不能新增或更新, 因为"
+
+#: Areas.php:116
+msgid ""
+"Cannot delete this area because customer branches have been created using "
+"this area"
+msgstr "不能删除此销售区域因为已有客户分公司在这区域"
+
+#: Areas.php:117
+msgid "branches using this area code"
+msgstr "家此区域编号的分公司"
+
+#: Areas.php:125
+msgid ""
+"Cannot delete this area because sales analysis records exist that use this "
+"area"
+msgstr "不能删除这个区域因为此区域已用于现有的销售分析记录"
+
+#: Areas.php:126
+msgid "sales analysis records referring this area code"
+msgstr "条此区域的销售分析记录"
+
+#: Areas.php:133 Areas.php:149 Areas.php:202 Areas.php:213
+msgid "Area Code"
+msgstr "区域编号"
+
+#: Areas.php:133 CustomerTypes.php:166 Factors.php:142
+#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:328
+#: MRPDemands.php:248 PcAssignCashToTab.php:118 PcClaimExpensesFromTab.php:109
+#: PcExpenses.php:127 PcExpensesTypeTab.php:83 PcTabs.php:124
+#: PcTypeTabs.php:134 SalesAnalReptCols.php:215 SalesCategories.php:139
+#: SalesTypes.php:163 StockCategories.php:199 Suppliers.php:639
+#: SupplierTypes.php:153 Z_DeleteInvoice.php:142
+msgid "has been deleted"
+msgstr "已删除"
+
+#: Areas.php:150 Areas.php:218
+msgid "Area Name"
+msgstr "区域名称"
+
+#: Areas.php:167
+msgid "View Customers from this Area"
+msgstr "查看此区域的顾客"
+
+#: Areas.php:177
+msgid "Review Areas Defined"
+msgstr "查看销售区域"
+
+#: AuditTrail.php:9
+msgid "Audit Trail"
+msgstr "审核追踪"
+
+#: AuditTrail.php:23
+msgid "Incorrect date format used, please re-enter"
+msgstr "输入的日期无效, 请输入有效日期格式"
+
+#: AuditTrail.php:37 BOMIndented.php:317 BOMIndentedReverse.php:305
+#: MRPCalendar.php:260
+msgid "From Date"
+msgstr "从 日期"
+
+#: AuditTrail.php:39 BOMIndented.php:318 BOMIndentedReverse.php:306
+#: MRPCalendar.php:262
+msgid "To Date"
+msgstr "到 日期"
+
+#: AuditTrail.php:43 PO_AuthorisationLevels.php:123
+#: PO_AuthorisationLevels.php:160 PO_AuthorisationLevels.php:163
+#: UserSettings.php:111
+msgid "User ID"
+msgstr "用户 ID"
+
+#: AuditTrail.php:56
+msgid "Table "
+msgstr "表 "
+
+#: AuditTrail.php:68 MRPReport.php:789 PO_SelectPurchOrder.php:357
+#: SelectContract.php:196 SelectProduct.php:710
+msgid "View"
+msgstr "查看"
+
+#: AuditTrail.php:144
+msgid "Date/Time"
+msgstr "日期/时间"
+
+#: AuditTrail.php:145 PcReportTab.php:283 includes/header.inc:52
+msgid "User"
+msgstr "用户"
+
+#: AuditTrail.php:146 BankReconciliation.php:185 BankReconciliation.php:257
+#: CustomerAllocations.php:356 CustomerInquiry.php:189
+#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
+#: CustWhereAlloc.php:18 CustWhereAlloc.php:87 DailyBankTransactions.php:98
+#: GLAccountInquiry.php:152 GLAccountReport.php:367 GLJournal.php:256
+#: MRPReschedules.php:204 SelectCustomer.php:462 ShipmentCosting.php:501
+#: ShipmentCosting.php:572 StockCategories.php:219 StockLocMovements.php:83
+#: StockMovements.php:97 SupplierAllocations.php:462 SupplierInquiry.php:193
+#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
+#: Z_CheckAllocationsFrom.php:27 Z_CheckAllocationsFrom.php:50
+#: Z_CheckAllocs.php:59 Z_CheckGLTransBalance.php:12
+#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
+#: includes/PDFTaxPageHeader.inc:34
+msgid "Type"
+msgstr "凭证类型"
+
+#: AuditTrail.php:147
+msgid "Table"
+msgstr "表"
+
+#: AuditTrail.php:148 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
+#: api/api_xml-rpc.php:1892
+msgid "Field Name"
+msgstr "字段名"
+
+#: AuditTrail.php:149 SystemParameters.php:315
+#: includes/PDFInventoryValnPageHeader.inc:38
+#: includes/PDFOstdgGRNsPageHeader.inc:43
+msgid "Value"
+msgstr "价值"
+
+#: BankAccounts.php:9
+msgid "Bank Accounts Maintenance"
+msgstr "银行账户维护"
+
+#: BankAccounts.php:13 TaxAuthorities.php:149
+msgid "Bank"
+msgstr "纳税专户银行"
+
+#: BankAccounts.php:14
+msgid ""
+"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
+"Codes. Set Default for Invoices to \"yes\" to print Account details on "
+"Invoices (only one account can be set to \"yes\")."
+msgstr ""
+"更新银行账户细节。账户代码是SWIFT或者BSB类型的银行代码。将发票默认项设置为"
+"\"是\"来在发票上打印账户的细节 （仅一个账户可以被设置为\"是\")"
+
+#: BankAccounts.php:46
+msgid "The bank account code already exists in the database"
+msgstr "输入的银行账户代码已经存在于数据库"
+
+#: BankAccounts.php:52
+msgid "The bank account name must be fifty characters or less long"
+msgstr "银行账户名称长度必须是或少于50个字"
+
+#: BankAccounts.php:58
+msgid "The bank account name may not be empty."
+msgstr "银行账户名称不能留空"
+
+#: BankAccounts.php:64
+msgid "The bank account number may not be empty."
+msgstr "银行账户号码不能留空"
+
+#: BankAccounts.php:70
+msgid "The bank account number must be fifty characters or less long"
+msgstr "银行帐号长度必须是或少于50个字"
+
+#: BankAccounts.php:76
+msgid "The bank address must be fifty characters or less long"
+msgstr "银行地址必须是或少于50个字"
+
+#: BankAccounts.php:95
+msgid ""
+"Note that it is not possible to change the currency of the account once "
+"there are transactions against it"
+msgstr "注意：一旦已经记录了交易，就不能再改变账户的币种。"
+
+#: BankAccounts.php:108
+msgid "The bank account details have been updated"
+msgstr "银行帐号已更新"
+
+#: BankAccounts.php:129
+msgid "The new bank account has been entered"
+msgstr "新建银行账户成功"
+
+#: BankAccounts.php:134
+msgid "The bank account could not be inserted or modified because"
+msgstr "新建或更新银行账户失败，原因是"
+
+#: BankAccounts.php:135
+msgid "The SQL used to insert/modify the bank account details was"
+msgstr "用于新建或更新银行账户的SQL是"
+
+#: BankAccounts.php:162
+msgid ""
+"Cannot delete this bank account because transactions have been created using "
+"this account"
+msgstr "不能删除此银行账户，因为此账户已有交易"
+
+#: BankAccounts.php:163
+msgid "transactions with this bank account code"
+msgstr "笔此银行账户的交易"
+
+#: BankAccounts.php:169
+msgid "Bank account deleted"
+msgstr "银行账户已删除"
+
+#: BankAccounts.php:190
+msgid "The bank accounts set up could not be retrieved because"
+msgstr "设置的银行账户没找到，原因是"
+
+#: BankAccounts.php:191
+msgid "The SQL used to retrieve the bank account details was"
+msgstr "用于查找银行账户的SQL是"
+
+#: BankAccounts.php:196 GLJournal.php:280
+msgid "GL Account Code"
+msgstr "总帐账户代码"
+
+#: BankAccounts.php:197 BankAccounts.php:326
+msgid "Bank Account Name"
+msgstr "银行账户名称"
+
+#: BankAccounts.php:198 BankAccounts.php:328
+msgid "Bank Account Code"
+msgstr "银行账户代码"
+
+#: BankAccounts.php:199 BankAccounts.php:330
+msgid "Bank Account Number"
+msgstr "银行账号"
+
+#: BankAccounts.php:200 BankAccounts.php:332
+msgid "Bank Address"
+msgstr "银行地址"
+
+#: BankAccounts.php:201 CustomerReceipt.php:756 CustomerTransInquiry.php:95
+#: OffersReceived.php:98 PcReportTab.php:291 PcTabs.php:147 PcTabs.php:295
+#: PDFPrintLabel.php:94 PO_AuthorisationLevels.php:125
+#: PO_AuthorisationLevels.php:180 PO_AuthorisationLevels.php:183
+#: PO_AuthoriseMyOrders.php:107 PO_Header.php:534
+#: PO_SelectOSPurchOrder.php:444 PO_SelectPurchOrder.php:359
+#: PricesByCost.php:228 Prices.php:198 Prices.php:293 PurchData.php:172
+#: PurchData.php:340 PurchData.php:453 SelectSupplier.php:251
+#: SupplierCredit.php:264 SupplierInvoice.php:232 SupplierTransInquiry.php:95
+#: SuppPriceList.php:274 includes/PDFBankingSummaryPageHeader.inc:42
+#: includes/PDFDebtorBalsPageHeader.inc:33
+#: includes/PDFSupplierBalsPageHeader.inc:36
+msgid "Currency"
+msgstr "货币"
+
+#: BankAccounts.php:202 BankAccounts.php:351
+msgid "Default for Invoices"
+msgstr "发票默认值"
+
+#: BankAccounts.php:251
+msgid "Show All Bank Accounts Defined"
+msgstr "显示全部银行账户"
+
+#: BankAccounts.php:284 BankAccounts.php:287
+msgid "Bank Account GL Code"
+msgstr "会计科目"
+
+#: BankAccounts.php:334
+msgid "Currency Of Account"
+msgstr "账户的货币"
+
+#: BankMatching.php:8
+msgid "Bank Account Matching"
+msgstr "银行账户对账"
+
+#: BankMatching.php:15 PDFCustTransListing.php:44 Z_CheckDebtorsControl.php:80
+msgid "Receipts"
+msgstr "收款"
+
+#: BankMatching.php:16 BankMatching.php:23
+msgid "Bank Matching"
+msgstr "银行对账"
+
+#: BankMatching.php:16
+msgid "Bank Account Matching - Receipts"
+msgstr "银行账户对账-收款"
+
+#: BankMatching.php:22 PaymentAllocations.php:33 PaymentMethods.php:13
+#: PDFSuppTransListing.php:44
+msgid "Payments"
+msgstr "付款"
+
+#: BankMatching.php:23
+msgid "Bank Account Matching - Payments"
+msgstr "银行账户对账-付款"
+
+#: BankMatching.php:27
+msgid "This page must be called with a bank transaction type"
+msgstr "这个页面必须指定银行交易类别"
+
+#: BankMatching.php:27
+msgid "It should not be called directly"
+msgstr "不能直接调用"
+
+#: BankMatching.php:40
+msgid "Could not retrieve transaction information"
+msgstr "找不到此交易信息"
+
+#: BankMatching.php:47
+msgid "Could not match off this payment because"
+msgstr "无法确认这笔付款, 因为"
+
+#: BankMatching.php:58
+msgid "Could not update the amount matched off this bank transaction because"
+msgstr "无法更新银行对账记录, 因为"
+
+#: BankMatching.php:64
+msgid "Could not unclear this bank transaction because"
+msgstr "无法取消确认此银行交易, 因为"
+
+#: BankMatching.php:72
+msgid ""
+"Use this screen to match webERP Receipts and Payments to your Bank "
+"Statement. Check your bank statement and click the check-box when you find "
+"the matching transaction."
+msgstr ""
+"使用此屏幕来核对webERP与您银行收款和付款对账单。核对您的银行对账单并且当您发"
+"现符合的交易时点击核取框。"
+
+#: BankMatching.php:80 BankReconciliation.php:97 CustomerReceipt.php:729
+#: DailyBankTransactions.php:28 Payments.php:732 PDFChequeListing.php:46
+#: TaxAuthorities.php:150 TaxAuthorities.php:306
+msgid "Bank Account"
+msgstr "银行账户"
+
+#: BankMatching.php:102
+msgid "Show"
+msgstr "显示"
+
+#: BankMatching.php:102 CreditItemsControlled.php:78 FreightCosts.php:270
+#: GoodsReceivedControlled.php:67 GoodsReceived.php:69
+#: StockLocTransferReceive.php:426 SupplierAllocations.php:443
+#: SuppShiptChgs.php:126
+msgid "from"
+msgstr "来自"
+
+#: BankMatching.php:105 ConfirmDispatchControlled_Invoice.php:59
+#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:281
+#: GLAccountCSV.php:172 GLAccountReport.php:102 Payments.php:712
+#: PcReportTab.php:105 PDFChequeListing.php:108 PDFChequeListing.php:118
+#: PDFChequeListing.php:205 PDFDeliveryDifferences.php:166
+#: PDFDeliveryDifferences.php:179 PDFDeliveryDifferences.php:287
+#: PDFDIFOT.php:172 PDFDIFOT.php:185 PDFDIFOT.php:289 PDFOrdersInvoiced.php:74
+#: PDFOrdersInvoiced.php:271 PDFOrderStatus.php:75 PDFOrderStatus.php:250
+#: PO_PDFPurchOrder.php:302 PricesBasedOnMarkUp.php:216
+#: PricesBasedOnMarkUp.php:355 PrintCustStatements.php:50
+#: PrintCustTrans.php:37 PrintCustTrans.php:40 PrintCustTransPortrait.php:60
+#: PrintCustTransPortrait.php:63 SalesGraph.php:200 SalesGraph.php:229
+#: SalesGraph.php:233 StockLocTransferReceive.php:310
+#: StockLocTransferReceive.php:426 Stocks.php:231 Stocks.php:236
+#: StockStatus.php:305 StockStatus.php:347 StockTransfers.php:397
+#: includes/PDFAgedDebtorsPageHeader.inc:18
+#: includes/PDFAgedSuppliersPageHeader.inc:17
+#: includes/PDFChequeListingPageHeader.inc:17
+#: includes/PDFDeliveryDifferencesPageHeader.inc:19
+#: includes/PDFDeliveryDifferencesPageHeader.inc:21
+#: includes/PDFDIFOTPageHeader.inc:19 includes/PDFDIFOTPageHeader.inc:21
+#: includes/PDFOrdersInvoicedPageHeader.inc:19
+#: includes/PDFOrdersInvoicedPageHeader.inc:21
+#: includes/PDFOrderStatusPageHeader.inc:19
+#: includes/PDFOrderStatusPageHeader.inc:21
+#: includes/PDFStockLocTransferHeader.inc:31
+msgid "to"
+msgstr "到"
+
+#: BankMatching.php:107
+msgid "Choose outstanding"
+msgstr "选择未清算"
+
+#: BankMatching.php:107
+msgid "only or all"
+msgstr "或全部"
+
+#: BankMatching.php:107 BankMatching.php:111 BankMatching.php:114
+#: BankMatching.php:122 BankMatching.php:125
+msgid "in the date range"
+msgstr "记录"
+
+#: BankMatching.php:111 BankMatching.php:114 BankMatching.php:122
+#: BankMatching.php:125
+msgid "Show all"
+msgstr "显示全部"
+
+#: BankMatching.php:112 BankMatching.php:115
+msgid "Show unmatched"
+msgstr "只显示未清算的"
+
+#: BankMatching.php:112 BankMatching.php:115 ReverseGRN.php:103
+#: includes/PDFCustomerListPageHeader.inc:46
+#: includes/PDFDeliveryDifferencesPageHeader.inc:24
+#: includes/PDFDIFOTPageHeader.inc:24
+#: includes/PDFOrdersInvoicedPageHeader.inc:24
+#: includes/PDFOrderStatusPageHeader.inc:24
+msgid "only"
+msgstr "仅"
+
+#: BankMatching.php:119
+msgid "Choose to display only the first 20 matching"
+msgstr "只显示前20条"
+
+#: BankMatching.php:120
+msgid "or all"
+msgstr "或全部"
+
+#: BankMatching.php:120
+msgid "meeting the criteria"
+msgstr "记录"
+
+#: BankMatching.php:123 BankMatching.php:126
+msgid "Show only the first 20"
+msgstr "只显示首 20"
+
+#: BankMatching.php:131
+msgid "Show selected"
+msgstr "显示符合条件的"
+
+#: BankMatching.php:132
+msgid "Show reconciliation"
+msgstr "显示银行对账单"
+
+#: BankMatching.php:138 BankMatching.php:144
+msgid "The date entered for the field to show"
+msgstr "输入的日期"
+
+#: BankMatching.php:138
+msgid "before"
+msgstr "日期早于"
+
+#: BankMatching.php:139 BankMatching.php:145
+msgid "is not entered in a recognised date format"
+msgstr "格式不正确"
+
+#: BankMatching.php:139 BankMatching.php:145
+msgid "Entry is expected in the format"
+msgstr "按正确格式输入日期"
+
+#: BankMatching.php:144
+msgid "after"
+msgstr "之后"
+
+#: BankMatching.php:218
+msgid "The payments with the selected criteria could not be retrieved because"
+msgstr "未能提取符合条件的付款, 因为"
+
+#: BankMatching.php:221 ShipmentCosting.php:502 ShipmentCosting.php:573
+#: SupplierAllocations.php:465
+msgid "Ref"
+msgstr "摘要"
+
+#: BankMatching.php:224 ConfirmDispatch_Invoice.php:273 Credit_Invoice.php:281
+#: CustomerAllocations.php:359 CustomerReceipt.php:845
+#: CustomerTransInquiry.php:94 CustWhereAlloc.php:91 PaymentAllocations.php:78
+#: Payments.php:925 Payments.php:927 Payments.php:936
+#: PcAssignCashToTab.php:214 PcAssignCashToTab.php:335
+#: PcAuthorizeExpenses.php:83 PcClaimExpensesFromTab.php:193
+#: PcClaimExpensesFromTab.php:342 PcReportTab.php:175 PcReportTab.php:347
+#: PrintCheque.php:70 PrintCheque.php:84 SelectCreditItems.php:661
+#: SuppContractChgs.php:73 SuppContractChgs.php:142 SuppFixedAssetChgs.php:71
+#: SuppFixedAssetChgs.php:137 SupplierAllocations.php:466
+#: SupplierCredit.php:341 SupplierCredit.php:369 SupplierCredit.php:399
+#: SupplierCredit.php:434 SupplierInvoice.php:313 SupplierInvoice.php:344
+#: SupplierInvoice.php:373 SupplierInvoice.php:409 SupplierTransInquiry.php:94
+#: SuppShiptChgs.php:77 SuppShiptChgs.php:134 SuppTransGLAnalysis.php:97
+#: SuppTransGLAnalysis.php:174 Z_CheckAllocs.php:63
+#: includes/PDFBankingSummaryPageHeader.inc:55
+#: includes/PDFChequeListingPageHeader.inc:37
+msgid "Amount"
+msgstr "金额"
+
+#: BankMatching.php:225 BankReconciliation.php:189 BankReconciliation.php:261
+#: PDFOrdersInvoiced.php:348 PDFOrderStatus.php:316
+#: PO_SelectOSPurchOrder.php:215 PO_SelectPurchOrder.php:175
+#: Shipt_Select.php:186 SuppCreditGRNs.php:225
+#: includes/PDFStatementPageHeader.inc:173
+#: includes/PDFStatementPageHeader.inc:180
+msgid "Outstanding"
+msgstr "未清算"
+
+#: BankMatching.php:226
+msgid "Clear"
+msgstr "清算"
+
+#: BankMatching.php:226 BankMatching.php:255
+msgid "Unclear"
+msgstr "未清算"
+
+#: BankMatching.php:299
+msgid "Update Matching"
+msgstr "保存"
+
+#: BankReconciliation.php:10
+msgid "Bank Reconciliation"
+msgstr "银行对账单"
+
+#: BankReconciliation.php:20
+msgid ""
+"The entry in the bank statement balance is not numeric. The balance on the "
+"bank statement should be entered. The exchange difference has not been "
+"calculated and no general ledger journal has been created"
+msgstr ""
+"输入的银行对账表余额不是数字。银行对账表的余额需要输入。汇兑差异没有被计算并"
+"且没有创建总帐日记帐。"
+
+#: BankReconciliation.php:29
+msgid "Could not retrieve the exchange rate for the selected bank account"
+msgstr "无法查询所选银行账户的汇率, 因为"
+
+#: BankReconciliation.php:59 BankReconciliation.php:77
+msgid "reconciliation on"
+msgstr "对账于"
+
+#: BankReconciliation.php:62
+msgid "Cannot insert a GL entry for the exchange difference because"
+msgstr "未能插入汇兑差异的总账凭证, 因为"
+
+#: BankReconciliation.php:63
+msgid "The SQL that failed to insert the exchange difference GL entry was"
+msgstr "插入汇率差异总账凭证失败的SQL是"
+
+#: BankReconciliation.php:83
+msgid "Exchange difference of"
+msgstr "汇兑差异"
+
+#: BankReconciliation.php:83
+msgid "has been posted"
+msgstr "已过账"
+
+#: BankReconciliation.php:93 SuppPaymentRun.php:300
+msgid "The bank accounts could not be retrieved by the SQL because"
+msgstr "找不到银行账户，因为"
+
+#: BankReconciliation.php:94 CustomerReceipt.php:720
+#: DailyBankTransactions.php:25 Payments.php:729 SuppPaymentRun.php:302
+msgid "The SQL used to retrieve the bank accounts was"
+msgstr "找不到银行账户的SQL是"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+msgid "Bank Accounts have not yet been defined"
+msgstr "尚未定义银行账户"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+msgid "You must first"
+msgstr "您必须首先"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
+msgid "define the bank accounts"
+msgstr "定义银行账户"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
+msgid "and general ledger accounts to be affected"
+msgstr "和对应的会计科目"
+
+#: BankReconciliation.php:119
+msgid "Show bank reconciliation statement"
+msgstr "显示银行对账单"
+
+#: BankReconciliation.php:134
+msgid "The bank account balance could not be returned by the SQL because"
+msgstr "无法返回银行账户余额，原因是"
+
+#: BankReconciliation.php:147
+msgid ""
+"Could not retrieve the currency and exchange rate for the selected bank "
+"account"
+msgstr "无法找到所选银行账户的货币和汇率, 因为"
+
+#: BankReconciliation.php:155
+msgid "Balance as at"
+msgstr "余额截止"
+
+#: BankReconciliation.php:178
+msgid "The unpresented cheques could not be retrieved by the SQL because"
+msgstr "未找到企业已付银行未付记录, 因为"
+
+#: BankReconciliation.php:181
+msgid "Add back unpresented cheques"
+msgstr "加：企业已付银行未付"
+
+#: BankReconciliation.php:186 BankReconciliation.php:258
+#: CustomerAllocations.php:331 CustomerAllocations.php:357
+#: CustomerInquiry.php:190 CustomerTransInquiry.php:86 CustWhereAlloc.php:88
+#: EmailCustTrans.php:17 GLAccountInquiry.php:153 PrintCustTrans.php:378
+#: PrintCustTrans.php:542 PrintCustTrans.php:696 PrintCustTrans.php:735
+#: PrintCustTransPortrait.php:504 PrintCustTransPortrait.php:704
+#: PrintCustTransPortrait.php:894 PrintCustTransPortrait.php:939
+#: StockMovements.php:97 SupplierAllocations.php:463
+#: SupplierAllocations.php:575 SupplierAllocations.php:645
+#: SupplierTransInquiry.php:87 Z_CheckAllocs.php:60
+#: Z_CheckGLTransBalance.php:13 includes/PDFQuotationPageHeader.inc:87
+#: includes/PDFStatementPageHeader.inc:168
+#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:80
+#: includes/PDFTransPageHeaderPortrait.inc:52
+msgid "Number"
+msgstr "编号"
+
+#: BankReconciliation.php:187 BankReconciliation.php:259
+#: ContractCosting.php:148 CustomerInquiry.php:193 CustomerTransInquiry.php:90
+#: CustWhereAlloc.php:89 DailyBankTransactions.php:99 GLAccountReport.php:368
+#: PaymentAllocations.php:75 PaymentAllocations.php:76
+#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
+#: StockCounts.php:135 StockLocMovements.php:88 StockMovements.php:100
+#: Z_CheckAllocs.php:61 includes/PDFBankingSummaryPageHeader.inc:40
+#: includes/PDFCustTransListingPageHeader.inc:49
+#: includes/PDFStockComparisonPageHeader.inc:36
+#: includes/PDFStockTransListingPageHeader.inc:68
+#: includes/PDFStockTransListingPageHeader.inc:72
+#: includes/PDFSuppTransListingPageHeader.inc:49
+msgid "Reference"
+msgstr "摘要"
+
+#: BankReconciliation.php:188 BankReconciliation.php:260
+msgid "Orig Amount"
+msgstr "凭证金额"
+
+#: BankReconciliation.php:231
+msgid "Total of all unpresented cheques"
+msgstr "企业已付银行未付合计："
+
+#: BankReconciliation.php:249
+msgid "The uncleared deposits could not be retrieved by the SQL because"
+msgstr "未找到企业已收银行未收记录, 因为"
+
+#: BankReconciliation.php:253
+msgid "Less deposits not cleared"
+msgstr "减：企业已收银行未收"
+
+#: BankReconciliation.php:303
+msgid "To...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-29 09:14:03
|
Revision: 4523
http://web-erp.svn.sourceforge.net/web-erp/?rev=4523&view=rev
Author: daintree
Date: 2011-03-29 09:13:54 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
revert zh_CN.utf8 to pre 4.03RC2
Added Paths:
-----------
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
Added: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:13:54 UTC (rev 4523)
@@ -0,0 +1,37520 @@
+# weberp 简体中文界面文件
+# Copyright (C) 2007 Logic Works Ltd
+# This file is distributed under the same license as the webERP package.
+# FIRST AUTHOR <rom...@gm...>, 2006.
+# THIS VERSION FROM http://weberp-china.oicp.net
+msgid ""
+msgstr ""
+"Project-Id-Version: WEBERP3.05 VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-15 18:44+1200\n"
+"PO-Revision-Date: 2011-01-29 15:12+0000\n"
+"Last-Translator: Exson qu <hex...@gm...>\n"
+"Language-Team: WebERP Translation Team <web-erp-translation@lists."
+"sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-29 15:16+0000\n"
+"X-Generator: Launchpad (build 12274)\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SearchPath-0: webERPRC4\n"
+"X-Poedit-Basepath: C:\\改过自新\\\n"
+
+#: AccountGroups.php:9 index.php:1268
+msgid "Account Groups"
+msgstr "科目组"
+
+#: AccountGroups.php:19
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr "在递归检查中查询父账户组中的科目组发生错误"
+
+#: AccountGroups.php:20
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr "用于查询父账户组的科目组失败的SQL是"
+
+#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:187
+msgid "The SQL that was used to retrieve the information was"
+msgstr "用于查找交易数据的SQL是"
+
+#: AccountGroups.php:58
+msgid "Could not check whether the group exists because"
+msgstr "未能判定组别是否存在, 因为"
+
+#: AccountGroups.php:65
+msgid "The account group name already exists in the database"
+msgstr "科目组名称已经存在在数据库中。"
+
+#: AccountGroups.php:71
+msgid "The account group name cannot contain the character"
+msgstr "科目组名称不能包含这个字符"
+
+#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
+#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:32
+msgid "or the character"
+msgstr "或这个字符"
+
+#: AccountGroups.php:77
+msgid "The account group name must be at least one character long"
+msgstr "科目组名称必须不少于 1 个字"
+
+#: AccountGroups.php:84
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+"所选的父账户组看来会导致一个递归的账户结构-选择一个另外的父账户组或者将此账户"
+"组作为一个最顶层的账户组"
+
+#: AccountGroups.php:95
+msgid "Could not check whether the group is recursive because"
+msgstr "未能检查此组是否递归, 因为"
+
+#: AccountGroups.php:107
+msgid "The section in accounts must be an integer"
+msgstr "会计科目类别必须是整数"
+
+#: AccountGroups.php:113
+msgid "The sequence in the trial balance must be an integer"
+msgstr "试算表内行号必须是整数"
+
+#: AccountGroups.php:119
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "试算表内顺序必须是数字且小于"
+
+#: AccountGroups.php:136
+msgid "An error occurred in updating the account group"
+msgstr "更新科目组是发生了错误"
+
+#: AccountGroups.php:137
+msgid "The SQL that was used to update the account group was"
+msgstr "用于更新科目组失败的 SQL 是"
+
+#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
+msgid "Record Updated"
+msgstr "记录已更新"
+
+#: AccountGroups.php:157
+msgid "An error occurred in inserting the account group"
+msgstr "插入科目组时发生错误, 因为"
+
+#: AccountGroups.php:158
+msgid "The SQL that was used to insert the account group was"
+msgstr "用作插入科目组失败的 SQL 是"
+
+#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
+msgid "Record inserted"
+msgstr "记录已新增"
+
+#: AccountGroups.php:176
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr "从主表中查找组信息时发生错误"
+
+#: AccountGroups.php:181
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr "不能删除，已创建了属于这个科目组的会计科目"
+
+#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
+#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
+#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
+#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
+#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
+#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
+#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
+#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
+#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
+#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
+#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
+#: Stocks.php:471 Stocks.php:480 Stocks.php:488 Stocks.php:496 Stocks.php:504
+#: Stocks.php:512 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
+#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
+#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:142
+#: UnitsOfMeasure.php:149 WorkCentres.php:90 WorkCentres.php:96
+#: WWW_Access.php:87
+msgid "There are"
+msgstr "存在"
+
+#: AccountGroups.php:182
+msgid "general ledger accounts that refer to this account group"
+msgstr "属于此科目组的会计科目"
+
+#: AccountGroups.php:186
+msgid "An error occurred in retrieving the parent group information"
+msgstr "查找父组信息时发生错误"
+
+#: AccountGroups.php:191
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr "删除会计科目组失败, 由于它是其他账户组的父账户组。"
+
+#: AccountGroups.php:192
+msgid "account groups that have this group as its/there parent account group"
+msgstr "账户组将此账户作为他的/他们的父账户组"
+
+#: AccountGroups.php:195
+msgid "An error occurred in deleting the account group"
+msgstr "删除账户组是发生错误"
+
+#: AccountGroups.php:196
+msgid "The SQL that was used to delete the account group was"
+msgstr "用于账户组的 SQL 是"
+
+#: AccountGroups.php:198
+msgid "group has been deleted"
+msgstr "科目组已删除"
+
+#: AccountGroups.php:223
+msgid "The sql that was used to retrieve the account group information was "
+msgstr "用于查询账户组信息的SQL是 "
+
+#: AccountGroups.php:224
+msgid "Could not get account groups because"
+msgstr "不能取得科目组, 由于"
+
+#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
+#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
+#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
+#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
+#: CounterSales.php:1983 CounterSales.php:2107 Credit_Invoice.php:257
+#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
+#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
+#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
+#: EDIMessageFormat.php:106 FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13 FixedAssetRegister.php:238
+#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
+#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
+#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
+#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
+#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
+#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
+#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
+#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
+#: PurchData.php:141 PurchData.php:256 PurchData.php:275
+#: RecurringSalesOrders.php:311 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
+#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
+#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
+#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
+#: SelectCreditItems.php:272 SelectCustomer.php:322 SelectGLAccount.php:19
+#: SelectGLAccount.php:79 SelectOrderItems.php:607 SelectOrderItems.php:1431
+#: SelectOrderItems.php:1555 SelectProduct.php:456 SelectSalesOrder.php:155
+#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
+#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
+#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
+#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
+#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
+#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:65
+#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
+#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
+#: WWW_Users.php:38 Z_BottomUpCosts.php:51
+msgid "Search"
+msgstr "查找"
+
+#: AccountGroups.php:230
+msgid "Group Name"
+msgstr "科目组名称"
+
+#: AccountGroups.php:231 EDIMessageFormat.php:131
+msgid "Section"
+msgstr "会计要素"
+
+#: AccountGroups.php:232 AccountGroups.php:396
+msgid "Sequence In TB"
+msgstr "试算表行次"
+
+#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
+#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
+#: SelectGLAccount.php:45 SelectGLAccount.php:59
+msgid "Profit and Loss"
+msgstr "损益类"
+
+#: AccountGroups.php:234 AccountGroups.php:341
+msgid "Parent Group"
+msgstr "父组"
+
+#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
+#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
+#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
+#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
+#: CompanyPreferences.php:451 CompanyPreferences.php:453
+#: CompanyPreferences.php:463 CompanyPreferences.php:465
+#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
+#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
+#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
+#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
+#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
+#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
+#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
+#: PO_Header.php:758 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
+#: PurchData.php:192 PurchData.php:494 PurchData.php:497
+#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
+#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
+#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
+#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
+#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
+#: Stocks.php:871 Stocks.php:873 Stocks.php:891 Stocks.php:893
+#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
+#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
+#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
+#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
+#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:756
+#: SystemParameters.php:887 SystemParameters.php:889 SystemParameters.php:899
+#: SystemParameters.php:901 SystemParameters.php:955 SystemParameters.php:967
+#: SystemParameters.php:969 TaxGroups.php:292 TaxGroups.php:295
+#: TaxGroups.php:344 WWW_Users.php:610 WWW_Users.php:612
+msgid "Yes"
+msgstr "是"
+
+#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
+#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
+#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
+#: CompanyPreferences.php:438 CompanyPreferences.php:442
+#: CompanyPreferences.php:450 CompanyPreferences.php:454
+#: CompanyPreferences.php:462 CompanyPreferences.php:466
+#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
+#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
+#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
+#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
+#: Locations.php:375 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
+#: MRP.php:540 PaymentMethods.php:203 PaymentMethods.php:204
+#: PaymentMethods.php:265 PaymentMethods.php:271 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:757 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
+#: PurchData.php:195 PurchData.php:495 PurchData.php:498
+#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
+#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
+#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
+#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
+#: Stocks.php:866 Stocks.php:868 Stocks.php:886 Stocks.php:888
+#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
+#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
+#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
+#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
+#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:757
+#: SystemParameters.php:886 SystemParameters.php:890 SystemParameters.php:898
+#: SystemParameters.php:902 SystemParameters.php:956 SystemParameters.php:966
+#: SystemParameters.php:970 TaxGroups.php:293 TaxGroups.php:296
+#: TaxGroups.php:346 WWW_Users.php:609 WWW_Users.php:613
+#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "否"
+
+#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
+#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
+#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
+#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
+#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
+#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
+#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
+#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
+#: Labels.php:414 Locations.php:382 MRPDemands.php:304 MRPDemandTypes.php:122
+#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
+#: PcClaimExpensesFromTab.php:229 PcExpenses.php:176 PcTabs.php:188
+#: PcTypeTabs.php:171 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
+#: Prices.php:227 PurchData.php:207 SalesCategories.php:263
+#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
+#: SalesTypes.php:206 SelectCustomer.php:609 SelectCustomer.php:625
+#: SelectCustomer.php:647 SelectCustomer.php:663 SelectCustomer.php:685
+#: SelectCustomer.php:701 Shippers.php:144 StockCategories.php:244
+#: SupplierContacts.php:153 SupplierTypes.php:192 SuppLoginSetup.php:274
+#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
+#: TaxProvinces.php:178 UnitsOfMeasure.php:201 WorkCentres.php:138
+#: WWW_Access.php:127 WWW_Users.php:312 includes/InputSerialItems.php:88
+#, php-format
+msgid "Edit"
+msgstr "编辑"
+
+#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
+#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
+#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
+#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
+#: CounterSales.php:781 Credit_Invoice.php:386 CreditStatus.php:176
+#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
+#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
+#: DiscountMatrix.php:178 EDIMessageFormat.php:153
+#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
+#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:383
+#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
+#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
+#: PcClaimExpensesFromTab.php:230 PcExpenses.php:177 PcExpensesTypeTab.php:161
+#: PcTabs.php:189 PcTypeTabs.php:172 PO_AuthorisationLevels.php:150
+#: PO_Items.php:758 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
+#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
+#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
+#: SalesTypes.php:207 SelectCreditItems.php:747 SelectCustomer.php:610
+#: SelectCustomer.php:626 SelectCustomer.php:648 SelectCustomer.php:664
+#: SelectCustomer.php:686 SelectCustomer.php:702 SelectOrderItems.php:1358
+#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
+#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
+#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:81 SuppInvGRNs.php:135
+#: SupplierContacts.php:154 SupplierTypes.php:194 SuppLoginSetup.php:275
+#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
+#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
+#: UnitsOfMeasure.php:202 WorkCentres.php:139 WOSerialNos.php:300
+#: WWW_Access.php:128 WWW_Users.php:313 includes/InputSerialItemsKeyed.php:54
+#, php-format
+msgid "Delete"
+msgstr "删除"
+
+#: AccountGroups.php:274
+msgid "Review Account Groups"
+msgstr "查看科目组"
+
+#: AccountGroups.php:294
+msgid "An error occurred in retrieving the account group information"
+msgstr "查找账户组信息时发生错误"
+
+#: AccountGroups.php:295
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr "用于查询科目组失败的SQL是"
+
+#: AccountGroups.php:298
+msgid "The account group name does not exist in the database"
+msgstr "科目组名称在数据库中不存在。"
+
+#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
+#: Z_ImportGLAccountGroups.php:28
+msgid "Account Group"
+msgstr "科目组"
+
+#: AccountGroups.php:338
+msgid "Account Group Name"
+msgstr "科目组名称"
+
+#: AccountGroups.php:348 AccountGroups.php:350
+msgid "Top Level Group"
+msgstr "顶层组"
+
+#: AccountGroups.php:364
+msgid "Section In Accounts"
+msgstr "会计要素"
+
+#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
+#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
+#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
+#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
+#: DiscountMatrix.php:141 EDIMessageFormat.php:249
+#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
+#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
+#: Locations.php:553 MRPDemands.php:402 MRPDemandTypes.php:182
+#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
+#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
+#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
+#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
+#: SupplierContacts.php:250 SuppLoginSetup.php:532 TaxAuthorities.php:313
+#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:253
+#: WorkCentres.php:261 WWW_Users.php:643
+msgid "Enter Information"
+msgstr "保存"
+
+#: AccountSections.php:9 index.php:1273
+msgid "Account Sections"
+msgstr "会计要素"
+
+#: AccountSections.php:68
+msgid "The account section already exists in the database"
+msgstr "会计要素已经存在于数据库"
+
+#: AccountSections.php:75
+msgid "The account section name cannot contain the character"
+msgstr "会计要素不能包含这个字符"
+
+#: AccountSections.php:81
+msgid "The account section name must contain at least one character"
+msgstr "会计要素名称必须包含至少一个字符"
+
+#: AccountSections.php:87 AccountSections.php:93
+msgid "The section number must be an integer"
+msgstr "会计要素编号必须是整数"
+
+#: AccountSections.php:138
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr "此会计要素已被科目组使用，不能删除"
+
+#: AccountSections.php:139
+msgid "general ledger accounts groups that refer to this account section"
+msgstr "个科目组需要此会计要素"
+
+#: AccountSections.php:150
+msgid "section has been deleted"
+msgstr "删除会计要素成功"
+
+#: AccountSections.php:175
+msgid "Could not get account group sections because"
+msgstr "找不到会计要素，原因是："
+
+#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
+msgid "Section Number"
+msgstr "会计要素编号"
+
+#: AccountSections.php:182 AccountSections.php:258
+msgid "Section Description"
+msgstr "会计要素名称"
+
+#: AccountSections.php:199
+msgid "Restricted"
+msgstr "不可修改"
+
+#: AccountSections.php:210
+msgid "Review Account Sections"
+msgstr "查看会计要素"
+
+#: AccountSections.php:228
+msgid "Could not retrieve the requested section please try again."
+msgstr "找不到会计要素, 请重试"
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:603
+#: SelectCustomer.php:632
+msgid "Customer Contacts"
+msgstr "顾客联系人"
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
+#: Z_CheckDebtorsControl.php:21
+msgid "Back to Customers"
+msgstr "返回客户"
+
+#: AddCustomerContacts.php:26
+msgid "Contacts for Customer: <b>"
+msgstr "客户的联系人"
+
+#: AddCustomerContacts.php:29
+msgid "Edit contact for <b>"
+msgstr "编辑联系人"
+
+#: AddCustomerContacts.php:41
+msgid "The Contact must be an integer."
+msgstr "联系人必须是整数"
+
+#: AddCustomerContacts.php:44
+msgid "The contact's name must be forty characters or less long"
+msgstr "联系人名称必须不多于50个字符"
+
+#: AddCustomerContacts.php:47
+msgid "The contact's name may not be empty"
+msgstr "联系人名称不能留空"
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
+#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:230
+#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:60
+#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:412 SalesAnalReptCols.php:129
+#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:355 Suppliers.php:514
+#: SupplierTypes.php:69
+msgid "has been updated"
+msgstr "已更新"
+
+#: AddCustomerContacts.php:70
+msgid "The contact record has been added"
+msgstr "联系人已新增"
+
+#: AddCustomerContacts.php:98
+msgid "The contact record has been deleted"
+msgstr "联系人记录已删除"
+
+#: AddCustomerContacts.php:112 CompanyPreferences.php:229
+#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
+#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:605
+#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:141
+#: SupplierCredit.php:433 SupplierInvoice.php:408 SuppTransGLAnalysis.php:96
+#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: includes/PDFTaxPageHeader.inc:37
+msgid "Name"
+msgstr "名称"
+
+#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
+#: Customers.php:906 Customers.php:972 SelectCustomer.php:606
+#: WWW_Access.php:111 WWW_Access.php:172
+msgid "Role"
+msgstr "职位"
+
+#: AddCustomerContacts.php:114 Customers.php:973
+msgid "Phone no"
+msgstr "电话"
+
+#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
+#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
+#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
+#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
+#: PcReportTab.php:348 SelectCustomer.php:608 SystemParameters.php:316
+#: WOSerialNos.php:277 WOSerialNos.php:279
+msgid "Notes"
+msgstr "备注"
+
+#: AddCustomerContacts.php:149
+msgid "Review all contacts for this Customer"
+msgstr "查看此顾客的所有联络人"
+
+#: AddCustomerContacts.php:179
+msgid "Contact Code"
+msgstr "联系人代码"
+
+#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:218
+msgid "Contact Name"
+msgstr "联系人名称"
+
+#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
+#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:225
+#: SelectCustomer.php:463 SelectOrderItems.php:639
+#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
+#: includes/PDFTransPageHeaderPortrait.inc:105
+msgid "Phone"
+msgstr "电话"
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:640
+#: SelectCustomer.php:670
+msgid "Customer Notes"
+msgstr "客户通知"
+
+#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+msgid "Back to Select Customer"
+msgstr "返回选择客户"
+
+#: AddCustomerNotes.php:31
+msgid "The contact priority must be an integer."
+msgstr "联系优先级必须是整数"
+
+#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr "联系人备注必须不多于200个字符"
+
+#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+msgid "The contact's notes may not be empty"
+msgstr "联系人备注不能留空"
+
+#: AddCustomerNotes.php:60
+msgid "The contact notes record has been added"
+msgstr "联系人备注记录已新增"
+
+#: AddCustomerNotes.php:87
+msgid "The contact note record has been deleted"
+msgstr "联系人备注记录已删除"
+
+#: AddCustomerNotes.php:98
+msgid "Notes for Customer"
+msgstr "客户通知："
+
+#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
+#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
+#: ContractCosting.php:149 CustomerAllocations.php:332
+#: CustomerAllocations.php:358 CustomerInquiry.php:191
+#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
+#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
+#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
+#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
+#: PrintCustTrans.php:616 PrintCustTransPortrait.php:790 ReverseGRN.php:378
+#: ShipmentCosting.php:503 ShipmentCosting.php:574 Shipments.php:467
+#: StockDispatch.php:188 StockDispatch.php:200 StockLocMovements.php:85
+#: StockMovements.php:98 StockSerialItemResearch.php:79
+#: SupplierAllocations.php:464 SupplierAllocations.php:576
+#: SupplierAllocations.php:646 SupplierInquiry.php:195
+#: SupplierTransInquiry.php:89 includes/PDFQuotationPageHeader.inc:91
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: includes/PDFTransPageHeader.inc:84
+#: includes/PDFTransPageHeaderPortrait.inc:58
+msgid "Date"
+msgstr "日期"
+
+#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:176
+#: Stocks.php:875 UpgradeDatabase.php:147 UpgradeDatabase.php:150
+#: UpgradeDatabase.php:153 UpgradeDatabase.php:156 UpgradeDatabase.php:159
+#: UpgradeDatabase.php:162 UpgradeDatabase.php:165 UpgradeDatabase.php:168
+#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
+#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
+#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
+#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
+#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
+msgid "Note"
+msgstr "备注"
+
+#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
+msgid "WWW"
+msgstr "WWW万维网"
+
+#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
+#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
+msgid "Priority"
+msgstr "优先级"
+
+#: AddCustomerNotes.php:143
+msgid "Review all notes for this Customer"
+msgstr "查看此顾客的所有通知"
+
+#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
+msgid "Note ID"
+msgstr "Note ID"
+
+#: AddCustomerNotes.php:177
+msgid "Contact Note"
+msgstr "联络人备注"
+
+#: AddCustomerTypeNotes.php:6 SelectCustomer.php:678
+msgid "Customer Type (Group) Notes"
+msgstr "顾客种类(组）备注"
+
+#: AddCustomerTypeNotes.php:31
+msgid "The Contact priority must be an integer."
+msgstr "联络人优先级必须是整数"
+
+#: AddCustomerTypeNotes.php:49 SelectCustomer.php:708
+msgid "Customer Group Notes"
+msgstr "顾客组通知"
+
+#: AddCustomerTypeNotes.php:60
+msgid "The contact group notes record has been added"
+msgstr "联系人组通知记录已增加"
+
+#: AddCustomerTypeNotes.php:84
+msgid "The contact group note record has been deleted"
+msgstr "联系人组通知记录已经删除"
+
+#: AddCustomerTypeNotes.php:95
+msgid "Notes for Customer Type"
+msgstr "顾客类型的通知："
+
+#: AddCustomerTypeNotes.php:106
+msgid "href"
+msgstr "href"
+
+#: AddCustomerTypeNotes.php:141
+msgid "Review all notes for this Customer Type"
+msgstr "查看此顾客类型的所有通知。"
+
+#: AddCustomerTypeNotes.php:182
+msgid "Contact Group Note"
+msgstr "联系人组通知"
+
+#: AddCustomerTypeNotes.php:184
+msgid "Web site"
+msgstr "网站"
+
+#: AgedDebtors.php:17
+msgid "Aged Customer Balance Listing"
+msgstr "应收账款帐龄分析表"
+
+#: AgedDebtors.php:18
+msgid "Aged Customer Balances"
+msgstr "欠款余额"
+
+#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+msgid "Aged Customer Account Analysis"
+msgstr "客户欠款分析"
+
+#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
+#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
+#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:90
+#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:174
+#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
+#: InventoryPlanning.php:209 InventoryPlanning.php:257
+#: InventoryPlanning.php:295 InventoryPlanningPrefSupplier.php:208
+#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
+#: InventoryPlanningPrefSupplier.php:355 InventoryPlanningPrefSupplier.php:401
+#: InventoryQuantities.php:83 InventoryValuation.php:76
+#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:111
+#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:529
+#: MRPReschedules.php:46 MRPReschedules.php:58 MRPShortages.php:137
+#: MRPShortages.php:149 OutstandingGRNs.php:51 OutstandingGRNs.php:63
+#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
+#: PDFLowGP.php:23 PDFStockCheckComparison.php:35
+#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
+#: ReorderLevel.php:59 SelectAsset.php:36 SelectProduct.php:37
+#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:325
+#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
+msgid "Problem Report"
+msgstr "问题报告"
+
+#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
+#: DebtorsAtPeriodEnd.php:60
+msgid "The customer details could not be retrieved by the SQL because"
+msgstr "客户明细资料无法从SQL取得, 因为"
+
+#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
+#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
+#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
+#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
+#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
+#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:93
+#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
+#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:177 GLTagProfit_Loss.php:189
+#: GLTrialBalance.php:154 GLTrialBalance.php:166 InventoryPlanning.php:102
+#: InventoryPlanning.php:177 InventoryPlanning.php:212
+#: InventoryPlanning.php:260 InventoryPlanning.php:298
+#: InventoryPlanning.php:361 InventoryPlanningPrefSupplier.php:211
+#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
+#: InventoryPlanningPrefSupplier.php:358 InventoryPlanningPrefSupplier.php:404
+#: InventoryPlanningPrefSupplier.php:460 InventoryQuantities.php:86
+#: InventoryQuantities.php:97 InventoryValuation.php:79
+#: InventoryValuation.php:90 MailInventoryValuation.php:118
+#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedPurchaseOrders.php:125 MRPPlannedWorkOrders.php:108
+#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:318 MRPReport.php:41
+#: MRPReport.php:52 MRPReport.php:150 MRPReschedules.php:49
+#: MRPReschedules.php:61 MRPShortages.php:140 MRPShortages.php:152
+#: OutstandingGRNs.php:54 OutstandingGRNs.php:66 PcReportTab.php:236
+#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFGrn.php:124
+#: PDFLowGP.php:63 PDFLowGP.php:75 PDFPriceList.php:124 PDFQuotation.php:237
+#: PDFRemittanceAdvice.php:84 PDFStockCheckComparison.php:39
+#: PDFStockCheckComparison.php:65 PDFStockCheckComparison.php:266
+#: PDFTopItems.php:125 PO_PDFPurchOrder.php:30 PO_PDFPurchOrder.php:144
+#: PrintCustOrder_generic.php:182 PrintCustOrder.php:198
+#: PrintSalesOrder_generic.php:183 ReorderLevel.php:62 ReorderLevel.php:151
+#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:25 StockCheck.php:47
+#: StockCheck.php:68 StockCheck.php:98 StockCheck.php:142 StockCheck.php:153
+#: StockCheck.php:194 StockDispatch.php:93 StockDispatch.php:105
+#: SupplierBalsAtPeriodEnd.php:57 SupplierBalsAtPeriodEnd.php:68
+#: SuppPaymentRun.php:109 SuppPaymentRun.php:120 SuppPaymentRun.php:184
+#: SuppPaymentRun.php:214 SuppPriceList.php:121 Tax.php:64 Tax.php:177
+#: Tax.php:286 Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
+#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
+#: Z_DataExport.php:420 Z_DataExport.php:472 Z_poRebuildDefault.php:38
+#: includes/PDFPaymentRun_PymtFooter.php:57
+#: includes/PDFPaymentRun_PymtFooter.php:87
+#: includes/PDFPaymentRun_PymtFooter.php:116
+#: includes/PDFPaymentRun_PymtFooter.php:152
+#: includes/PDFPaymentRun_PymtFooter.php:183
+#: includes/PDFPaymentRun_PymtFooter.php:215
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:340
+msgid "Back to the menu"
+msgstr "返回主菜单"
+
+#: AgedDebtors.php:367
+msgid "The details of outstanding transactions for customer"
+msgstr "该用户未清算的交易明细"
+
+#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
+#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:472
+#: PO_Items.php:601 PO_Items.php:628 SalesAnalReptCols.php:356
+#: SpecialOrder.php:369 StockLocTransferReceive.php:373
+#: StockQuantityByDate.php:106 includes/SelectOrderItems_IntoCart.inc:53
+msgid "could not be retrieved because"
+msgstr "不能取得, 因为"
+
+#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
+#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:963
+#: ConfirmDispatch_Invoice.php:977 Contracts.php:581 CounterSales.php:1323
+#: CounterSales.php:1337 Credit_Invoice.php:707 Credit_Invoice.php:729
+#: CustomerReceipt.php:526 CustomerReceipt.php:658 CustomerReceipt.php:686
+#: CustomerTransInquiry.php:79 DeliveryDetails.php:395 GLProfit_Loss.php:578
+#: GLTagProfit_Loss.php:490 Payments.php:307 PDFRemittanceAdvice.php:86
+#: PurchData.php:89 PurchData.php:108 PurchData.php:244 ReverseGRN.php:191
+#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1383
+#: StockCheck.php:224 StockCostUpdate.php:79 StockCostUpdate.php:89
+#: StockLocStatus.php:142 StockMovements.php:92 StockQuantityByDate.php:82
+#: StockReorderLevel.php:39 StockStatus.php:271 StockTransfers.php:159
+#: StockUsageGraph.php:53 StockUsage.php:127 SupplierInquiry.php:79
+#: SupplierInquiry.php:101 SupplierInquiry.php:131 SupplierInquiry.php:177
+#: SupplierTransInquiry.php:81 SuppPaymentRun.php:111 SuppPaymentRun.php:186
+#: SuppPaymentRun.php:216 WorkOrderCosting.php:393 WorkOrderReceive.php:272
+#: WOSerialNos.php:44 Z_ChangeBranchCode.php:108 Z_ChangeCustomerCode.php:92
+#: Z_DeleteCreditNote.php:57 Z_DeleteInvoice.php:83
+#: includes/PDFPaymentRun_PymtFooter.php:59
+#: includes/PDFPaymentRun_PymtFooter.php:89
+#: includes/PDFPaymentRun_PymtFooter.php:118
+#: includes/PDFPaymentRun_PymtFooter.php:154
+#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:86
+#: includes/ConnectDB_mysql.inc:68
+msgid "The SQL that failed was"
+msgstr "运行失败的 SQL 是"
+
+#: AgedDebtors.php:438
+msgid "There are no customers meeting the criteria specified to list"
+msgstr "没有符合条件的客户"
+
+#: AgedDebtors.php:464
+msgid "Aged Debtor Analysis"
+msgstr "应收账款账龄分析表"
+
+#: AgedDebtors.php:477 DebtorsAtPeriodEnd.php:148
+msgid "From Customer Code"
+msgstr "由客户编号"
+
+#: AgedDebtors.php:478 DebtorsAtPeriodEnd.php:149
+msgid "To Customer Code"
+msgstr "到客户编号"
+
+#: AgedDebtors.php:480 AgedSuppliers.php:293
+msgid "All balances or overdues only"
+msgstr "全部余额或只包含过期未付的"
+
+#: AgedDebtors.php:481
+msgid "All customers with balances"
+msgstr "所有有余额的客户"
+
+#: AgedDebtors.php:482 AgedSuppliers.php:296
+msgid "Overdue accounts only"
+msgstr "只显示过期未付的"
+
+#: AgedDebtors.php:483
+msgid "Held accounts only"
+msgstr "只显示被冻结的客户"
+
+#: AgedDebtors.php:486
+msgid "Only Show Customers Of"
+msgstr "负责客户的销售员："
+
+#: AgedDebtors.php:498
+msgid "Only show customers trading in"
+msgstr "客户的货币"
+
+#: AgedDebtors.php:514
+msgid "Summary or detailed report"
+msgstr "汇总或明细"
+
+#: AgedDebtors.php:516 AgedSuppliers.php:316 InventoryValuation.php:238
+msgid "Summary Report"
+msgstr "汇总报表"
+
+#: AgedDebtors.php:517 AgedSuppliers.php:317 InventoryValuation.php:239
+msgid "Detailed Report"
+msgstr "明细报表"
+
+#: AgedDebtors.php:520 AgedSuppliers.php:320 BOMExtendedQty.php:300
+#: BOMIndented.php:278 BOMIndentedReverse.php:266 BOMListing.php:142
+#: DebtorsAtPeriodEnd.php:166 InventoryPlanning.php:442
+#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:188
+#: InventoryValuation.php:242 MRPPlannedPurchaseOrders.php:279
+#: MRPPlannedWorkOrders.php:344 MRPReschedules.php:166 MRPShortages.php:262
+#: OutstandingGRNs.php:185 PDFCustomerList.php:412 PDFLowGP.php:168
+#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
+#: PDFStockCheckComparison.php:379 PrintCustTrans.php:416
+#: PrintCustTransPortrait.php:560 ReorderLevel.php:229 StockDispatch.php:309
+#: SupplierBalsAtPeriodEnd.php:155 SuppPriceList.php:237 Tax.php:352
+msgid "Print PDF"
+msgstr "打印到PDF"
+
+#: AgedSuppliers.php:18
+msgid "Aged Supplier Listing"
+msgstr "应付账款账龄分析表"
+
+#: AgedSuppliers.php:19
+msgid "Aged Suppliers"
+msgstr "供应商"
+
+#: AgedSuppliers.php:105
+msgid "Aged Supplier Account Analysis"
+msgstr "应付账款账龄分析"
+
+#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
+msgid "The Supplier details could not be retrieved by the SQL because"
+msgstr "供应商明细资料未能由SQL取得, 因为"
+
+#: AgedSuppliers.php:187
+msgid "Aged Supplier Account Analysis - Problem Report"
+msgstr "应付账款帐龄分析-问题报告"
+
+#: AgedSuppliers.php:189
+msgid "The details of outstanding transactions for Supplier"
+msgstr "该供应商未清算的交易明细"
+
+#: AgedSuppliers.php:273
+msgid "Aged Supplier Analysis"
+msgstr "应付账款帐龄分析"
+
+#: AgedSuppliers.php:286 OutstandingGRNs.php:180 PDFRemittanceAdvice.php:138
+#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:259
+msgid "From Supplier Code"
+msgstr "从供应商编号"
+
+#: AgedSuppliers.php:289 OutstandingGRNs.php:182 PDFRemittanceAdvice.php:140
+#: SupplierBalsAtPeriodEnd.php:134 SuppPaymentRun.php:261
+msgid "To Supplier Code"
+msgstr "到供应商编号"
+
+#: AgedSuppliers.php:295
+msgid "All suppliers with balances"
+msgstr "全部有余额的供应商"
+
+#: AgedSuppliers.php:299
+msgid "For suppliers trading in"
+msgstr "供应商货币"
+
+#: AgedSuppliers.php:314 InventoryValuation.php:237
+msgid "Summary or Detailed Report"
+msgstr "汇总或明细表"
+
+#: Areas.php:8
+msgid "Sales Area Maintenance"
+msgstr "销售区域"
+
+#: Areas.php:41
+msgid "The area code must be three characters or less long"
+msgstr "区域编号长度必须是或少于3个字符"
+
+#: Areas.php:46
+msgid "The area code entered already exists"
+msgstr "输入的区域代码已经存在"
+
+#: Areas.php:51
+msgid "The area description must be twenty five characters or less long"
+msgstr "区域说明长度必须是或少于25个字符"
+
+#: Areas.php:56
+msgid "The area code may not be empty"
+msgstr "区域编号不能为空"
+
+#: Areas.php:61
+msgid "The area description may not be empty"
+msgstr "区域说明不能为空"
+
+#: Areas.php:74
+msgid "Area code"
+msgstr "区域编号"
+
+#: Areas.php:88
+msgid "New area code"
+msgstr "新区域编号"
+
+#: Areas.php:88
+msgid "has been inserted"
+msgstr "已插入"
+
+#: Areas.php:95
+msgid "The area could not be added or updated because"
+msgstr "区域编号不能新增或更新, 因为"
+
+#: Areas.php:116
+msgid ""
+"Cannot delete this area because customer branches have been created using "
+"this area"
+msgstr "不能删除此销售区域因为已有客户分公司在这区域"
+
+#: Areas.php:117
+msgid "branches using this area code"
+msgstr "家此区域编号的分公司"
+
+#: Areas.php:125
+msgid ""
+"Cannot delete this area because sales analysis records exist that use this "
+"area"
+msgstr "不能删除这个区域因为此区域已用于现有的销售分析记录"
+
+#: Areas.php:126
+msgid "sales analysis records referring this area code"
+msgstr "条此区域的销售分析记录"
+
+#: Areas.php:133 Areas.php:149 Areas.php:202 Areas.php:213
+msgid "Area Code"
+msgstr "区域编号"
+
+#: Areas.php:133 CustomerTypes.php:166 Factors.php:142
+#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:328
+#: MRPDemands.php:248 PcAssignCashToTab.php:118 PcClaimExpensesFromTab.php:109
+#: PcExpenses.php:127 PcExpensesTypeTab.php:83 PcTabs.php:124
+#: PcTypeTabs.php:134 SalesAnalReptCols.php:215 SalesCategories.php:139
+#: SalesTypes.php:163 StockCategories.php:199 Suppliers.php:639
+#: SupplierTypes.php:153 Z_DeleteInvoice.php:142
+msgid "has been deleted"
+msgstr "已删除"
+
+#: Areas.php:150 Areas.php:218
+msgid "Area Name"
+msgstr "区域名称"
+
+#: Areas.php:167
+msgid "View Customers from this Area"
+msgstr "查看此区域的顾客"
+
+#: Areas.php:177
+msgid "Review Areas Defined"
+msgstr "查看销售区域"
+
+#: AuditTrail.php:9
+msgid "Audit Trail"
+msgstr "审核追踪"
+
+#: AuditTrail.php:23
+msgid "Incorrect date format used, please re-enter"
+msgstr "输入的日期无效, 请输入有效日期格式"
+
+#: AuditTrail.php:37 BOMIndented.php:317 BOMIndentedReverse.php:305
+#: MRPCalendar.php:260
+msgid "From Date"
+msgstr "从 日期"
+
+#: AuditTrail.php:39 BOMIndented.php:318 BOMIndentedReverse.php:306
+#: MRPCalendar.php:262
+msgid "To Date"
+msgstr "到 日期"
+
+#: AuditTrail.php:43 PO_AuthorisationLevels.php:123
+#: PO_AuthorisationLevels.php:160 PO_AuthorisationLevels.php:163
+#: UserSettings.php:111
+msgid "User ID"
+msgstr "用户 ID"
+
+#: AuditTrail.php:56
+msgid "Table "
+msgstr "表 "
+
+#: AuditTrail.php:68 MRPReport.php:789 PO_SelectPurchOrder.php:357
+#: SelectContract.php:196 SelectProduct.php:710
+msgid "View"
+msgstr "查看"
+
+#: AuditTrail.php:144
+msgid "Date/Time"
+msgstr "日期/时间"
+
+#: AuditTrail.php:145 PcReportTab.php:283 includes/header.inc:52
+msgid "User"
+msgstr "用户"
+
+#: AuditTrail.php:146 BankReconciliation.php:185 BankReconciliation.php:257
+#: CustomerAllocations.php:356 CustomerInquiry.php:189
+#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
+#: CustWhereAlloc.php:18 CustWhereAlloc.php:87 DailyBankTransactions.php:98
+#: GLAccountInquiry.php:152 GLAccountReport.php:367 GLJournal.php:256
+#: MRPReschedules.php:204 SelectCustomer.php:462 ShipmentCosting.php:501
+#: ShipmentCosting.php:572 StockCategories.php:219 StockLocMovements.php:83
+#: StockMovements.php:97 SupplierAllocations.php:462 SupplierInquiry.php:193
+#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
+#: Z_CheckAllocationsFrom.php:27 Z_CheckAllocationsFrom.php:50
+#: Z_CheckAllocs.php:59 Z_CheckGLTransBalance.php:12
+#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
+#: includes/PDFTaxPageHeader.inc:34
+msgid "Type"
+msgstr "凭证类型"
+
+#: AuditTrail.php:147
+msgid "Table"
+msgstr "表"
+
+#: AuditTrail.php:148 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
+#: api/api_xml-rpc.php:1892
+msgid "Field Name"
+msgstr "字段名"
+
+#: AuditTrail.php:149 SystemParameters.php:315
+#: includes/PDFInventoryValnPageHeader.inc:38
+#: includes/PDFOstdgGRNsPageHeader.inc:43
+msgid "Value"
+msgstr "价值"
+
+#: BankAccounts.php:9
+msgid "Bank Accounts Maintenance"
+msgstr "银行账户维护"
+
+#: BankAccounts.php:13 TaxAuthorities.php:149
+msgid "Bank"
+msgstr "纳税专户银行"
+
+#: BankAccounts.php:14
+msgid ""
+"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
+"Codes. Set Default for Invoices to \"yes\" to print Account details on "
+"Invoices (only one account can be set to \"yes\")."
+msgstr ""
+"更新银行账户细节。账户代码是SWIFT或者BSB类型的银行代码。将发票默认项设置为"
+"\"是\"来在发票上打印账户的细节 （仅一个账户可以被设置为\"是\")"
+
+#: BankAccounts.php:46
+msgid "The bank account code already exists in the database"
+msgstr "输入的银行账户代码已经存在于数据库"
+
+#: BankAccounts.php:52
+msgid "The bank account name must be fifty characters or less long"
+msgstr "银行账户名称长度必须是或少于50个字"
+
+#: BankAccounts.php:58
+msgid "The bank account name may not be empty."
+msgstr "银行账户名称不能留空"
+
+#: BankAccounts.php:64
+msgid "The bank account number may not be empty."
+msgstr "银行账户号码不能留空"
+
+#: BankAccounts.php:70
+msgid "The bank account number must be fifty characters or less long"
+msgstr "银行帐号长度必须是或少于50个字"
+
+#: BankAccounts.php:76
+msgid "The bank address must be fifty characters or less long"
+msgstr "银行地址必须是或少于50个字"
+
+#: BankAccounts.php:95
+msgid ""
+"Note that it is not possible to change the currency of the account once "
+"there are transactions against it"
+msgstr "注意：一旦已经记录了交易，就不能再改变账户的币种。"
+
+#: BankAccounts.php:108
+msgid "The bank account details have been updated"
+msgstr "银行帐号已更新"
+
+#: BankAccounts.php:129
+msgid "The new bank account has been entered"
+msgstr "新建银行账户成功"
+
+#: BankAccounts.php:134
+msgid "The bank account could not be inserted or modified because"
+msgstr "新建或更新银行账户失败，原因是"
+
+#: BankAccounts.php:135
+msgid "The SQL used to insert/modify the bank account details was"
+msgstr "用于新建或更新银行账户的SQL是"
+
+#: BankAccounts.php:162
+msgid ""
+"Cannot delete this bank account because transactions have been created using "
+"this account"
+msgstr "不能删除此银行账户，因为此账户已有交易"
+
+#: BankAccounts.php:163
+msgid "transactions with this bank account code"
+msgstr "笔此银行账户的交易"
+
+#: BankAccounts.php:169
+msgid "Bank account deleted"
+msgstr "银行账户已删除"
+
+#: BankAccounts.php:190
+msgid "The bank accounts set up could not be retrieved because"
+msgstr "设置的银行账户没找到，原因是"
+
+#: BankAccounts.php:191
+msgid "The SQL used to retrieve the bank account details was"
+msgstr "用于查找银行账户的SQL是"
+
+#: BankAccounts.php:196 GLJournal.php:280
+msgid "GL Account Code"
+msgstr "总帐账户代码"
+
+#: BankAccounts.php:197 BankAccounts.php:326
+msgid "Bank Account Name"
+msgstr "银行账户名称"
+
+#: BankAccounts.php:198 BankAccounts.php:328
+msgid "Bank Account Code"
+msgstr "银行账户代码"
+
+#: BankAccounts.php:199 BankAccounts.php:330
+msgid "Bank Account Number"
+msgstr "银行账号"
+
+#: BankAccounts.php:200 BankAccounts.php:332
+msgid "Bank Address"
+msgstr "银行地址"
+
+#: BankAccounts.php:201 CustomerReceipt.php:756 CustomerTransInquiry.php:95
+#: OffersReceived.php:98 PcReportTab.php:291 PcTabs.php:147 PcTabs.php:295
+#: PDFPrintLabel.php:94 PO_AuthorisationLevels.php:125
+#: PO_AuthorisationLevels.php:180 PO_AuthorisationLevels.php:183
+#: PO_AuthoriseMyOrders.php:107 PO_Header.php:534
+#: PO_SelectOSPurchOrder.php:444 PO_SelectPurchOrder.php:359
+#: PricesByCost.php:228 Prices.php:198 Prices.php:293 PurchData.php:172
+#: PurchData.php:340 PurchData.php:453 SelectSupplier.php:251
+#: SupplierCredit.php:264 SupplierInvoice.php:232 SupplierTransInquiry.php:95
+#: SuppPriceList.php:274 includes/PDFBankingSummaryPageHeader.inc:42
+#: includes/PDFDebtorBalsPageHeader.inc:33
+#: includes/PDFSupplierBalsPageHeader.inc:36
+msgid "Currency"
+msgstr "货币"
+
+#: BankAccounts.php:202 BankAccounts.php:351
+msgid "Default for Invoices"
+msgstr "发票默认值"
+
+#: BankAccounts.php:251
+msgid "Show All Bank Accounts Defined"
+msgstr "显示全部银行账户"
+
+#: BankAccounts.php:284 BankAccounts.php:287
+msgid "Bank Account GL Code"
+msgstr "会计科目"
+
+#: BankAccounts.php:334
+msgid "Currency Of Account"
+msgstr "账户的货币"
+
+#: BankMatching.php:8
+msgid "Bank Account Matching"
+msgstr "银行账户对账"
+
+#: BankMatching.php:15 PDFCustTransListing.php:44 Z_CheckDebtorsControl.php:80
+msgid "Receipts"
+msgstr "收款"
+
+#: BankMatching.php:16 BankMatching.php:23
+msgid "Bank Matching"
+msgstr "银行对账"
+
+#: BankMatching.php:16
+msgid "Bank Account Matching - Receipts"
+msgstr "银行账户对账-收款"
+
+#: BankMatching.php:22 PaymentAllocations.php:33 PaymentMethods.php:13
+#: PDFSuppTransListing.php:44
+msgid "Payments"
+msgstr "付款"
+
+#: BankMatching.php:23
+msgid "Bank Account Matching - Payments"
+msgstr "银行账户对账-付款"
+
+#: BankMatching.php:27
+msgid "This page must be called with a bank transaction type"
+msgstr "这个页面必须指定银行交易类别"
+
+#: BankMatching.php:27
+msgid "It should not be called directly"
+msgstr "不能直接调用"
+
+#: BankMatching.php:40
+msgid "Could not retrieve transaction information"
+msgstr "找不到此交易信息"
+
+#: BankMatching.php:47
+msgid "Could not match off this payment because"
+msgstr "无法确认这笔付款, 因为"
+
+#: BankMatching.php:58
+msgid "Could not update the amount matched off this bank transaction because"
+msgstr "无法更新银行对账记录, 因为"
+
+#: BankMatching.php:64
+msgid "Could not unclear this bank transaction because"
+msgstr "无法取消确认此银行交易, 因为"
+
+#: BankMatching.php:72
+msgid ""
+"Use this screen to match webERP Receipts and Payments to your Bank "
+"Statement. Check your bank statement and click the check-box when you find "
+"the matching transaction."
+msgstr ""
+"使用此屏幕来核对webERP与您银行收款和付款对账单。核对您的银行对账单并且当您发"
+"现符合的交易时点击核取框。"
+
+#: BankMatching.php:80 BankReconciliation.php:97 CustomerReceipt.php:729
+#: DailyBankTransactions.php:28 Payments.php:732 PDFChequeListing.php:46
+#: TaxAuthorities.php:150 TaxAuthorities.php:306
+msgid "Bank Account"
+msgstr "银行账户"
+
+#: BankMatching.php:102
+msgid "Show"
+msgstr "显示"
+
+#: BankMatching.php:102 CreditItemsControlled.php:78 FreightCosts.php:270
+#: GoodsReceivedControlled.php:67 GoodsReceived.php:69
+#: StockLocTransferReceive.php:426 SupplierAllocations.php:443
+#: SuppShiptChgs.php:126
+msgid "from"
+msgstr "来自"
+
+#: BankMatching.php:105 ConfirmDispatchControlled_Invoice.php:59
+#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:281
+#: GLAccountCSV.php:172 GLAccountReport.php:102 Payments.php:712
+#: PcReportTab.php:105 PDFChequeListing.php:108 PDFChequeListing.php:118
+#: PDFChequeListing.php:205 PDFDeliveryDifferences.php:166
+#: PDFDeliveryDifferences.php:179 PDFDeliveryDifferences.php:287
+#: PDFDIFOT.php:172 PDFDIFOT.php:185 PDFDIFOT.php:289 PDFOrdersInvoiced.php:74
+#: PDFOrdersInvoiced.php:271 PDFOrderStatus.php:75 PDFOrderStatus.php:250
+#: PO_PDFPurchOrder.php:302 PricesBasedOnMarkUp.php:216
+#: PricesBasedOnMarkUp.php:355 PrintCustStatements.php:50
+#: PrintCustTrans.php:37 PrintCustTrans.php:40 PrintCustTransPortrait.php:60
+#: PrintCustTransPortrait.php:63 SalesGraph.php:200 SalesGraph.php:229
+#: SalesGraph.php:233 StockLocTransferReceive.php:310
+#: StockLocTransferReceive.php:426 Stocks.php:231 Stocks.php:236
+#: StockStatus.php:305 StockStatus.php:347 StockTransfers.php:397
+#: includes/PDFAgedDebtorsPageHeader.inc:18
+#: includes/PDFAgedSuppliersPageHeader.inc:17
+#: includes/PDFChequeListingPageHeader.inc:17
+#: includes/PDFDeliveryDifferencesPageHeader.inc:19
+#: includes/PDFDeliveryDifferencesPageHeader.inc:21
+#: includes/PDFDIFOTPageHeader.inc:19 includes/PDFDIFOTPageHeader.inc:21
+#: includes/PDFOrdersInvoicedPageHeader.inc:19
+#: includes/PDFOrdersInvoicedPageHeader.inc:21
+#: includes/PDFOrderStatusPageHeader.inc:19
+#: includes/PDFOrderStatusPageHeader.inc:21
+#: includes/PDFStockLocTransferHeader.inc:31
+msgid "to"
+msgstr "到"
+
+#: BankMatching.php:107
+msgid "Choose outstanding"
+msgstr "选择未清算"
+
+#: BankMatching.php:107
+msgid "only or all"
+msgstr "或全部"
+
+#: BankMatching.php:107 BankMatching.php:111 BankMatching.php:114
+#: BankMatching.php:122 BankMatching.php:125
+msgid "in the date range"
+msgstr "记录"
+
+#: BankMatching.php:111 BankMatching.php:114 BankMatching.php:122
+#: BankMatching.php:125
+msgid "Show all"
+msgstr "显示全部"
+
+#: BankMatching.php:112 BankMatching.php:115
+msgid "Show unmatched"
+msgstr "只显示未清算的"
+
+#: BankMatching.php:112 BankMatching.php:115 ReverseGRN.php:103
+#: includes/PDFCustomerListPageHeader.inc:46
+#: includes/PDFDeliveryDifferencesPageHeader.inc:24
+#: includes/PDFDIFOTPageHeader.inc:24
+#: includes/PDFOrdersInvoicedPageHeader.inc:24
+#: includes/PDFOrderStatusPageHeader.inc:24
+msgid "only"
+msgstr "仅"
+
+#: BankMatching.php:119
+msgid "Choose to display only the first 20 matching"
+msgstr "只显示前20条"
+
+#: BankMatching.php:120
+msgid "or all"
+msgstr "或全部"
+
+#: BankMatching.php:120
+msgid "meeting the criteria"
+msgstr "记录"
+
+#: BankMatching.php:123 BankMatching.php:126
+msgid "Show only the first 20"
+msgstr "只显示首 20"
+
+#: BankMatching.php:131
+msgid "Show selected"
+msgstr "显示符合条件的"
+
+#: BankMatching.php:132
+msgid "Show reconciliation"
+msgstr "显示银行对账单"
+
+#: BankMatching.php:138 BankMatching.php:144
+msgid "The date entered for the field to show"
+msgstr "输入的日期"
+
+#: BankMatching.php:138
+msgid "before"
+msgstr "日期早于"
+
+#: BankMatching.php:139 BankMatching.php:145
+msgid "is not entered in a recognised date format"
+msgstr "格式不正确"
+
+#: BankMatching.php:139 BankMatching.php:145
+msgid "Entry is expected in the format"
+msgstr "按正确格式输入日期"
+
+#: BankMatching.php:144
+msgid "after"
+msgstr "之后"
+
+#: BankMatching.php:218
+msgid "The payments with the selected criteria could not be retrieved because"
+msgstr "未能提取符合条件的付款, 因为"
+
+#: BankMatching.php:221 ShipmentCosting.php:502 ShipmentCosting.php:573
+#: SupplierAllocations.php:465
+msgid "Ref"
+msgstr "摘要"
+
+#: BankMatching.php:224 ConfirmDispatch_Invoice.php:273 Credit_Invoice.php:281
+#: CustomerAllocations.php:359 CustomerReceipt.php:845
+#: CustomerTransInquiry.php:94 CustWhereAlloc.php:91 PaymentAllocations.php:78
+#: Payments.php:925 Payments.php:927 Payments.php:936
+#: PcAssignCashToTab.php:214 PcAssignCashToTab.php:335
+#: PcAuthorizeExpenses.php:83 PcClaimExpensesFromTab.php:193
+#: PcClaimExpensesFromTab.php:342 PcReportTab.php:175 PcReportTab.php:347
+#: PrintCheque.php:70 PrintCheque.php:84 SelectCreditItems.php:661
+#: SuppContractChgs.php:73 SuppContractChgs.php:142 SuppFixedAssetChgs.php:71
+#: SuppFixedAssetChgs.php:137 SupplierAllocations.php:466
+#: SupplierCredit.php:341 SupplierCredit.php:369 SupplierCredit.php:399
+#: SupplierCredit.php:434 SupplierInvoice.php:313 SupplierInvoice.php:344
+#: SupplierInvoice.php:373 SupplierInvoice.php:409 SupplierTransInquiry.php:94
+#: SuppShiptChgs.php:77 SuppShiptChgs.php:134 SuppTransGLAnalysis.php:97
+#: SuppTransGLAnalysis.php:174 Z_CheckAllocs.php:63
+#: includes/PDFBankingSummaryPageHeader.inc:55
+#: includes/PDFChequeListingPageHeader.inc:37
+msgid "Amount"
+msgstr "金额"
+
+#: BankMatching.php:225 BankReconciliation.php:189 BankReconciliation.php:261
+#: PDFOrdersInvoiced.php:348 PDFOrderStatus.php:316
+#: PO_SelectOSPurchOrder.php:215 PO_SelectPurchOrder.php:175
+#: Shipt_Select.php:186 SuppCreditGRNs.php:225
+#: includes/PDFStatementPageHeader.inc:173
+#: includes/PDFStatementPageHeader.inc:180
+msgid "Outstanding"
+msgstr "未清算"
+
+#: BankMatching.php:226
+msgid "Clear"
+msgstr "清算"
+
+#: BankMatching.php:226 BankMatching.php:255
+msgid "Unclear"
+msgstr "未清算"
+
+#: BankMatching.php:299
+msgid "Update Matching"
+msgstr "保存"
+
+#: BankReconciliation.php:10
+msgid "Bank Reconciliation"
+msgstr "银行对账单"
+
+#: BankReconciliation.php:20
+msgid ""
+"The entry in the bank statement balance is not numeric. The balance on the "
+"bank statement should be entered. The exchange difference has not been "
+"calculated and no general ledger journal has been created"
+msgstr ""
+"输入的银行对账表余额不是数字。银行对账表的余额需要输入。汇兑差异没有被计算并"
+"且没有创建总帐日记帐。"
+
+#: BankReconciliation.php:29
+msgid "Could not retrieve the exchange rate for the selected bank account"
+msgstr "无法查询所选银行账户的汇率, 因为"
+
+#: BankReconciliation.php:59 BankReconciliation.php:77
+msgid "reconciliation on"
+msgstr "对账于"
+
+#: BankReconciliation.php:62
+msgid "Cannot insert a GL entry for the exchange difference because"
+msgstr "未能插入汇兑差异的总账凭证, 因为"
+
+#: BankReconciliation.php:63
+msgid "The SQL that failed to insert the exchange difference GL entry was"
+msgstr "插入汇率差异总账凭证失败的SQL是"
+
+#: BankReconciliation.php:83
+msgid "Exchange difference of"
+msgstr "汇兑差异"
+
+#: BankReconciliation.php:83
+msgid "has been posted"
+msgstr "已过账"
+
+#: BankReconciliation.php:93 SuppPaymentRun.php:300
+msgid "The bank accounts could not be retrieved by the SQL because"
+msgstr "找不到银行账户，因为"
+
+#: BankReconciliation.php:94 CustomerReceipt.php:720
+#: DailyBankTransactions.php:25 Payments.php:729 SuppPaymentRun.php:302
+msgid "The SQL used to retrieve the bank accounts was"
+msgstr "找不到银行账户的SQL是"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+msgid "Bank Accounts have not yet been defined"
+msgstr "尚未定义银行账户"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+msgid "You must first"
+msgstr "您必须首先"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
+msgid "define the bank accounts"
+msgstr "定义银行账户"
+
+#: BankReconciliation.php:100 CustomerReceipt.php:734
+#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
+msgid "and general ledger accounts to be affected"
+msgstr "和对应的会计科目"
+
+#: BankReconciliation.php:119
+msgid "Show bank reconciliation statement"
+msgstr "显示银行对账单"
+
+#: BankReconciliation.php:134
+msgid "The bank account balance could not be returned by the SQL because"
+msgstr "无法返回银行账户余额，原因是"
+
+#: BankReconciliation.php:147
+msgid ""
+"Could not retrieve the currency and exchange rate for the selected bank "
+"account"
+msgstr "无法找到所选银行账户的货币和汇率, 因为"
+
+#: BankReconciliation.php:155
+msgid "Balance as at"
+msgstr "余额截止"
+
+#: BankReconciliation.php:178
+msgid "The unpresented cheques could not be retrieved by the SQL because"
+msgstr "未找到企业已付银行未付记录, 因为"
+
+#: BankReconciliation.php:181
+msgid "Add back unpresented cheques"
+msgstr "加：企业已付银行未付"
+
+#: BankReconciliation.php:186 BankReconciliation.php:258
+#: CustomerAllocations.php:331 CustomerAllocations.php:357
+#: CustomerInquiry.php:190 CustomerTransInquiry.php:86 CustWhereAlloc.php:88
+#: EmailCustTrans.php:17 GLAccountInquiry.php:153 PrintCustTrans.php:378
+#: PrintCustTrans.php:542 PrintCustTrans.php:696 PrintCustTrans.php:735
+#: PrintCustTransPortrait.php:504 PrintCustTransPortrait.php:704
+#: PrintCustTransPortrait.php:894 PrintCustTransPortrait.php:939
+#: StockMovements.php:97 SupplierAllocations.php:463
+#: SupplierAllocations.php:575 SupplierAllocations.php:645
+#: SupplierTransInquiry.php:87 Z_CheckAllocs.php:60
+#: Z_CheckGLTransBalance.php:13 includes/PDFQuotationPageHeader.inc:87
+#: includes/PDFStatementPageHeader.inc:168
+#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:80
+#: includes/PDFTransPageHeaderPortrait.inc:52
+msgid "Number"
+msgstr "编号"
+
+#: BankReconciliation.php:187 BankReconciliation.php:259
+#: ContractCosting.php:148 CustomerInquiry.php:193 CustomerTransInquiry.php:90
+#: CustWhereAlloc.php:89 DailyBankTransactions.php:99 GLAccountReport.php:368
+#: PaymentAllocations.php:75 PaymentAllocations.php:76
+#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
+#: StockCounts.php:135 StockLocMovements.php:88 StockMovements.php:100
+#: Z_CheckAllocs.php:61 includes/PDFBankingSummaryPageHeader.inc:40
+#: includes/PDFCustTransListingPageHeader.inc:49
+#: includes/PDFStockComparisonPageHeader.inc:36
+#: includes/PDFStockTransListingPageHeader.inc:68
+#: includes/PDFStockTransListingPageHeader.inc:72
+#: includes/PDFSuppTransListingPageHeader.inc:49
+msgid "Reference"
+msgstr "摘要"
+
+#: BankReconciliation.php:188 BankReconciliation.php:260
+msgid "Orig Amount"
+msgstr "凭证金额"
+
+#: BankReconciliation.php:231
+msgid "Total of all unpresented cheques"
+msgstr "企业已付银行未付合计："
+
+#: BankReconciliation.php:249
+msgid "The uncleared deposits could not be retrieved by the SQL because"
+msgstr "未找到企业已收银行未收记录, 因为"
+
+#: BankReconciliation.php:253
+msgid "Less deposits not cleared"
+msgstr "减：企业已收银行未收"
+
+#: BankReconciliation.php:303
+msgid "To...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-29 09:10:27
|
Revision: 4522
http://web-erp.svn.sourceforge.net/web-erp/?rev=4522&view=rev
Author: daintree
Date: 2011-03-29 09:10:18 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
try to get zh_CN back!
Removed Paths:
-------------
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
Deleted: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Deleted: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:04:20 UTC (rev 4521)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:10:18 UTC (rev 4522)
@@ -1,37789 +0,0 @@
-# weberp 簡體中文介面檔
-# Copyright (C) 2007 Logic Works Ltd
-# This file is distributed under the same license as the webERP package.
-# FIRST AUTHOR <rom...@gm...>, 2006.
-# THIS VERSION FROM http://weberp-china.oicp.net
-msgid ""
-msgstr ""
-"Project-Id-Version: WEBERP3.05 VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-27 19:34+1200\n"
-"PO-Revision-Date: 2011-02-25 18:22+0800\n"
-"Last-Translator: Exson qu <hex...@ya...>\n"
-"Language-Team: WebERP Translation Team <web-erp-translation@lists."
-"sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-29 15:16+0000\n"
-"X-Generator: Launchpad (build 12274)\n"
-"X-Poedit-Country: CHINA\n"
-"X-Poedit-Basepath: C:\\改過自新\\\n"
-"X-Poedit-SearchPath-0: webERPRC4\n"
-
-#: AccountGroups.php:9 index.php:1272
-msgid "Account Groups"
-msgstr "科目組"
-
-#: AccountGroups.php:19
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr "在遞迴檢查中查詢父帳戶組中的科目組發生錯誤"
-
-#: AccountGroups.php:20
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
-msgstr "用於查詢父帳戶組的科目組失敗的SQL是"
-
-#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
-#: AccountGroups.php:187
-msgid "The SQL that was used to retrieve the information was"
-msgstr "用於查找交易資料的SQL是"
-
-#: AccountGroups.php:58
-msgid "Could not check whether the group exists because"
-msgstr "未能判定組別是否存在, 因為"
-
-#: AccountGroups.php:65
-msgid "The account group name already exists in the database"
-msgstr "科目組名稱已經存在在資料庫中。"
-
-#: AccountGroups.php:71
-msgid "The account group name cannot contain the character"
-msgstr "科目組名稱不能包含這個字元"
-
-#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
-#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:30
-msgid "or the character"
-msgstr "或這個字元"
-
-#: AccountGroups.php:77
-msgid "The account group name must be at least one character long"
-msgstr "科目組名稱必須不少於 1 個字"
-
-#: AccountGroups.php:84
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"所選的父帳戶組看來會導致一個遞迴的帳戶結構-選擇一個另外的父帳戶組或者將此帳戶"
-"組作為一個最頂層的帳戶組"
-
-#: AccountGroups.php:95
-msgid "Could not check whether the group is recursive because"
-msgstr "未能檢查此組是否遞迴, 因為"
-
-#: AccountGroups.php:107
-msgid "The section in accounts must be an integer"
-msgstr "會計科目類別必須是整數"
-
-#: AccountGroups.php:113
-msgid "The sequence in the trial balance must be an integer"
-msgstr "試算表內行號必須是整數"
-
-#: AccountGroups.php:119
-msgid "The sequence in the TB must be numeric and less than"
-msgstr "試算表內順序必須是數位且小於"
-
-#: AccountGroups.php:136
-msgid "An error occurred in updating the account group"
-msgstr "更新科目組是發生了錯誤"
-
-#: AccountGroups.php:137
-msgid "The SQL that was used to update the account group was"
-msgstr "用於更新科目組失敗的 SQL 是"
-
-#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
-msgid "Record Updated"
-msgstr "記錄已更新"
-
-#: AccountGroups.php:157
-msgid "An error occurred in inserting the account group"
-msgstr "插入科目組時發生錯誤, 因為"
-
-#: AccountGroups.php:158
-msgid "The SQL that was used to insert the account group was"
-msgstr "用作插入科目組失敗的 SQL 是"
-
-#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
-msgid "Record inserted"
-msgstr "記錄已新增"
-
-#: AccountGroups.php:176
-msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr "從主表中查找組資訊時發生錯誤"
-
-#: AccountGroups.php:181
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr "不能刪除，已創建了屬於這個科目組的會計科目"
-
-#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
-#: Currencies.php:144 Currencies.php:152 Currencies.php:159
-#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
-#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
-#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
-#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
-#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
-#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
-#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
-#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:129 SalesCategories.php:127 SalesCategories.php:135
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
-#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
-#: Stocks.php:469 Stocks.php:478 Stocks.php:486 Stocks.php:494 Stocks.php:502
-#: Stocks.php:510 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
-#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
-#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:140
-#: WorkCentres.php:90 WorkCentres.php:96 WWW_Access.php:87
-msgid "There are"
-msgstr "存在"
-
-#: AccountGroups.php:182
-msgid "general ledger accounts that refer to this account group"
-msgstr "屬於此科目組的會計科目"
-
-#: AccountGroups.php:186
-msgid "An error occurred in retrieving the parent group information"
-msgstr "查找父組資訊時發生錯誤"
-
-#: AccountGroups.php:191
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr "刪除會計科目組失敗, 由於它是其他帳戶組的父帳戶組。"
-
-#: AccountGroups.php:192
-msgid "account groups that have this group as its/there parent account group"
-msgstr "帳戶組將此帳戶作為他的/他們的父帳戶組"
-
-#: AccountGroups.php:195
-msgid "An error occurred in deleting the account group"
-msgstr "刪除帳戶組是發生錯誤"
-
-#: AccountGroups.php:196
-msgid "The SQL that was used to delete the account group was"
-msgstr "用於帳戶組的 SQL 是"
-
-#: AccountGroups.php:198
-msgid "group has been deleted"
-msgstr "科目組已刪除"
-
-#: AccountGroups.php:223
-msgid "The sql that was used to retrieve the account group information was "
-msgstr "用於查詢帳戶組資訊的SQL是 "
-
-#: AccountGroups.php:224
-msgid "Could not get account groups because"
-msgstr "不能取得科目組, 由於"
-
-#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
-#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
-#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
-#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
-#: CounterSales.php:1983 CounterSales.php:2107 Credit_Invoice.php:256
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
-#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
-#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
-#: EDIMessageFormat.php:106 FixedAssetLocations.php:9
-#: FixedAssetRegister.php:13 FixedAssetRegister.php:238
-#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
-#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:374
-#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
-#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
-#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
-#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
-#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
-#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
-#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
-#: PurchData.php:141 PurchData.php:256 PurchData.php:275
-#: RecurringSalesOrders.php:311 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
-#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
-#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
-#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:202
-#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
-#: SelectGLAccount.php:79 SelectOrderItems.php:607 SelectOrderItems.php:1431
-#: SelectOrderItems.php:1555 SelectProduct.php:473 SelectSalesOrder.php:457
-#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
-#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
-#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
-#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
-#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:62
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
-#: WorkOrderCosting.php:14 WorkOrderEntry.php:10 WorkOrderIssue.php:22
-#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
-#: WWW_Users.php:33 Z_BottomUpCosts.php:51
-msgid "Search"
-msgstr "查找"
-
-#: AccountGroups.php:230
-msgid "Group Name"
-msgstr "科目組名稱"
-
-#: AccountGroups.php:231 EDIMessageFormat.php:131
-msgid "Section"
-msgstr "會計要素"
-
-#: AccountGroups.php:232 AccountGroups.php:396
-msgid "Sequence In TB"
-msgstr "試算表行次"
-
-#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
-#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
-#: SelectGLAccount.php:45 SelectGLAccount.php:59
-msgid "Profit and Loss"
-msgstr "損益類"
-
-#: AccountGroups.php:234 AccountGroups.php:341
-msgid "Parent Group"
-msgstr "父組"
-
-#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
-#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
-#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
-#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
-#: CompanyPreferences.php:451 CompanyPreferences.php:453
-#: CompanyPreferences.php:463 CompanyPreferences.php:465
-#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
-#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
-#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
-#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: MRPCalendar.php:222 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
-#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:264
-#: PaymentMethods.php:270 PDFChequeListing.php:63
-#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
-#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:754 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
-#: PurchData.php:192 PurchData.php:494 PurchData.php:497
-#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
-#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
-#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
-#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
-#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
-#: Stocks.php:869 Stocks.php:871 Stocks.php:889 Stocks.php:891
-#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
-#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
-#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
-#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
-#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:756
-#: SystemParameters.php:887 SystemParameters.php:889 SystemParameters.php:899
-#: SystemParameters.php:901 SystemParameters.php:955 SystemParameters.php:967
-#: SystemParameters.php:969 TaxGroups.php:292 TaxGroups.php:295
-#: TaxGroups.php:344 WWW_Users.php:605 WWW_Users.php:607
-msgid "Yes"
-msgstr "是"
-
-#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
-#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
-#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
-#: CompanyPreferences.php:438 CompanyPreferences.php:442
-#: CompanyPreferences.php:450 CompanyPreferences.php:454
-#: CompanyPreferences.php:462 CompanyPreferences.php:466
-#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
-#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
-#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
-#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
-#: MRPCalendar.php:224 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:265
-#: PaymentMethods.php:271 PDFChequeListing.php:62
-#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:753 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
-#: PurchData.php:195 PurchData.php:495 PurchData.php:498
-#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
-#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
-#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
-#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
-#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
-#: Stocks.php:864 Stocks.php:866 Stocks.php:884 Stocks.php:886
-#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
-#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
-#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
-#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
-#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:757
-#: SystemParameters.php:886 SystemParameters.php:890 SystemParameters.php:898
-#: SystemParameters.php:902 SystemParameters.php:956 SystemParameters.php:966
-#: SystemParameters.php:970 TaxGroups.php:293 TaxGroups.php:296
-#: TaxGroups.php:346 WWW_Users.php:604 WWW_Users.php:608
-#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
-msgid "No"
-msgstr "否"
-
-#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
-#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
-#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
-#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
-#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
-#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
-#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
-#: Labels.php:414 Locations.php:380 MRPDemands.php:304 MRPDemandTypes.php:122
-#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
-#: PcClaimExpensesFromTab.php:229 PcExpenses.php:186 PcTabs.php:188
-#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
-#: Prices.php:227 PurchData.php:207 SalesCategories.php:263
-#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
-#: SalesTypes.php:206 SelectCustomer.php:610 SelectCustomer.php:626
-#: SelectCustomer.php:648 SelectCustomer.php:664 SelectCustomer.php:686
-#: SelectCustomer.php:702 Shippers.php:144 StockCategories.php:244
-#: SupplierContacts.php:153 SupplierTypes.php:192 SuppLoginSetup.php:274
-#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
-#: TaxProvinces.php:178 UnitsOfMeasure.php:190 WorkCentres.php:138
-#: WWW_Access.php:127 WWW_Users.php:307 includes/InputSerialItems.php:88
-#: includes/OutputSerialItems.php:21
-#, php-format
-msgid "Edit"
-msgstr "編輯"
-
-#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
-#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
-#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:385 CreditStatus.php:176
-#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
-#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
-#: DiscountMatrix.php:178 EDIMessageFormat.php:153
-#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
-#: GLAccounts.php:320 GLJournal.php:401 Labels.php:414 Locations.php:381
-#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
-#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
-#: PcClaimExpensesFromTab.php:230 PcExpenses.php:187 PcExpensesTypeTab.php:164
-#: PcTabs.php:189 PcTypeTabs.php:175 PO_AuthorisationLevels.php:150
-#: PO_Items.php:762 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
-#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
-#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
-#: SalesTypes.php:207 SelectCreditItems.php:745 SelectCustomer.php:611
-#: SelectCustomer.php:627 SelectCustomer.php:649 SelectCustomer.php:665
-#: SelectCustomer.php:687 SelectCustomer.php:703 SelectOrderItems.php:1358
-#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
-#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
-#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:81 SuppInvGRNs.php:135
-#: SupplierContacts.php:154 SupplierTypes.php:194 SuppLoginSetup.php:275
-#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
-#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
-#: UnitsOfMeasure.php:191 WorkCentres.php:139 WOSerialNos.php:300
-#: WWW_Access.php:128 WWW_Users.php:308 includes/InputSerialItemsKeyed.php:57
-#: includes/OutputSerialItems.php:98
-#, php-format
-msgid "Delete"
-msgstr "刪除"
-
-#: AccountGroups.php:274
-msgid "Review Account Groups"
-msgstr "查看科目組"
-
-#: AccountGroups.php:294
-msgid "An error occurred in retrieving the account group information"
-msgstr "查找帳戶組資訊時發生錯誤"
-
-#: AccountGroups.php:295
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
-msgstr "用於查詢科目組失敗的SQL是"
-
-#: AccountGroups.php:298
-msgid "The account group name does not exist in the database"
-msgstr "科目組名稱在資料庫中不存在。"
-
-#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
-#: Z_ImportGLAccountGroups.php:28
-msgid "Account Group"
-msgstr "科目組"
-
-#: AccountGroups.php:338
-msgid "Account Group Name"
-msgstr "科目組名稱"
-
-#: AccountGroups.php:348 AccountGroups.php:350
-msgid "Top Level Group"
-msgstr "頂層組"
-
-#: AccountGroups.php:364
-msgid "Section In Accounts"
-msgstr "會計要素"
-
-#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
-#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
-#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
-#: DiscountMatrix.php:141 EDIMessageFormat.php:249
-#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
-#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
-#: Locations.php:558 MRPDemands.php:402 MRPDemandTypes.php:182
-#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
-#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
-#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
-#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
-#: SupplierContacts.php:250 SuppLoginSetup.php:532 TaxAuthorities.php:313
-#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:242
-#: WorkCentres.php:261 WWW_Users.php:638
-msgid "Enter Information"
-msgstr "保存"
-
-#: AccountSections.php:9 index.php:1277
-msgid "Account Sections"
-msgstr "會計要素"
-
-#: AccountSections.php:68
-msgid "The account section already exists in the database"
-msgstr "會計要素已經存在於資料庫"
-
-#: AccountSections.php:75
-msgid "The account section name cannot contain the character"
-msgstr "會計要素不能包含這個字元"
-
-#: AccountSections.php:81
-msgid "The account section name must contain at least one character"
-msgstr "會計要素名稱必須包含至少一個字元"
-
-#: AccountSections.php:87 AccountSections.php:93
-msgid "The section number must be an integer"
-msgstr "會計要素編號必須是整數"
-
-#: AccountSections.php:138
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
-msgstr "此會計要素已被科目組使用，不能刪除"
-
-#: AccountSections.php:139
-msgid "general ledger accounts groups that refer to this account section"
-msgstr "個科目組需要此會計要素"
-
-#: AccountSections.php:150
-msgid "section has been deleted"
-msgstr "刪除會計要素成功"
-
-#: AccountSections.php:175
-msgid "Could not get account group sections because"
-msgstr "找不到會計要素，原因是："
-
-#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
-msgid "Section Number"
-msgstr "會計要素編號"
-
-#: AccountSections.php:182 AccountSections.php:258
-msgid "Section Description"
-msgstr "會計要素名稱"
-
-#: AccountSections.php:199
-msgid "Restricted"
-msgstr "不可修改"
-
-#: AccountSections.php:210
-msgid "Review Account Sections"
-msgstr "查看會計要素"
-
-#: AccountSections.php:228
-msgid "Could not retrieve the requested section please try again."
-msgstr "找不到會計要素, 請重試"
-
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:604
-#: SelectCustomer.php:633
-msgid "Customer Contacts"
-msgstr "顧客聯繫人"
-
-#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
-#: Z_CheckDebtorsControl.php:21
-msgid "Back to Customers"
-msgstr "返回客戶"
-
-#: AddCustomerContacts.php:26
-msgid "Contacts for Customer: <b>"
-msgstr "客戶的聯繫人"
-
-#: AddCustomerContacts.php:29
-msgid "Edit contact for <b>"
-msgstr "編輯聯繫人"
-
-#: AddCustomerContacts.php:41
-msgid "The Contact must be an integer."
-msgstr "聯繫人必須是整數"
-
-#: AddCustomerContacts.php:44
-msgid "The contact's name must be forty characters or less long"
-msgstr "聯繫人名稱必須不多於50個字元"
-
-#: AddCustomerContacts.php:47
-msgid "The contact's name may not be empty"
-msgstr "聯繫人名稱不能留空"
-
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
-#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:236
-#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:70
-#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:411 SalesAnalReptCols.php:129
-#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:353 Suppliers.php:514
-#: SupplierTypes.php:69
-msgid "has been updated"
-msgstr "已更新"
-
-#: AddCustomerContacts.php:70
-msgid "The contact record has been added"
-msgstr "聯繫人已新增"
-
-#: AddCustomerContacts.php:98
-msgid "The contact record has been deleted"
-msgstr "聯繫人記錄已刪除"
-
-#: AddCustomerContacts.php:112 CompanyPreferences.php:229
-#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
-#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:606
-#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:141
-#: SupplierCredit.php:437 SupplierInvoice.php:408 SuppTransGLAnalysis.php:96
-#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
-#: includes/PDFTaxPageHeader.inc:37
-msgid "Name"
-msgstr "名稱"
-
-#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
-#: Customers.php:906 Customers.php:972 SelectCustomer.php:607
-#: WWW_Access.php:111 WWW_Access.php:172
-msgid "Role"
-msgstr "職位"
-
-#: AddCustomerContacts.php:114 Customers.php:973
-msgid "Phone no"
-msgstr "電話"
-
-#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
-#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
-#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
-#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
-#: PcReportTab.php:348 SelectCustomer.php:609 SystemParameters.php:316
-#: WOSerialNos.php:277 WOSerialNos.php:279
-msgid "Notes"
-msgstr "備註"
-
-#: AddCustomerContacts.php:149
-msgid "Review all contacts for this Customer"
-msgstr "查看此顧客的所有聯絡人"
-
-#: AddCustomerContacts.php:179
-msgid "Contact Code"
-msgstr "聯繫人代碼"
-
-#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:218
-msgid "Contact Name"
-msgstr "聯繫人名稱"
-
-#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
-#: PO_Header.php:956 PO_Header.php:1026 SelectCreditItems.php:223
-#: SelectCustomer.php:464 SelectOrderItems.php:639
-#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
-#: includes/PDFTransPageHeaderPortrait.inc:105
-msgid "Phone"
-msgstr "電話"
-
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:641
-#: SelectCustomer.php:671
-msgid "Customer Notes"
-msgstr "客戶通知"
-
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
-msgid "Back to Select Customer"
-msgstr "返回選擇客戶"
-
-#: AddCustomerNotes.php:31
-msgid "The contact priority must be an integer."
-msgstr "聯繫優先順序必須是整數"
-
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
-msgid "The contact's notes must be two hundred characters or less long"
-msgstr "聯繫人備註必須不多於200個字元"
-
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
-msgid "The contact's notes may not be empty"
-msgstr "聯繫人備註不能留空"
-
-#: AddCustomerNotes.php:60
-msgid "The contact notes record has been added"
-msgstr "聯繫人備註記錄已新增"
-
-#: AddCustomerNotes.php:87
-msgid "The contact note record has been deleted"
-msgstr "聯繫人備註記錄已刪除"
-
-#: AddCustomerNotes.php:98
-msgid "Notes for Customer"
-msgstr "客戶通知："
-
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
-#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
-#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
-#: ContractCosting.php:149 CustomerAllocations.php:332
-#: CustomerAllocations.php:358 CustomerInquiry.php:191
-#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
-#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
-#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
-#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
-#: PrintCustTrans.php:616 PrintCustTransPortrait.php:790 ReverseGRN.php:378
-#: ShipmentCosting.php:503 ShipmentCosting.php:574 Shipments.php:467
-#: StockDispatch.php:188 StockDispatch.php:200 StockLocMovements.php:85
-#: StockMovements.php:98 StockSerialItemResearch.php:79
-#: SupplierAllocations.php:464 SupplierAllocations.php:576
-#: SupplierAllocations.php:646 SupplierInquiry.php:195
-#: SupplierTransInquiry.php:89 includes/PDFQuotationPageHeader.inc:91
-#: includes/PDFQuotationPortraitPageHeader.inc:90
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
-#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:58
-msgid "Date"
-msgstr "日期"
-
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:176
-#: Stocks.php:873 UpgradeDatabase.php:147 UpgradeDatabase.php:150
-#: UpgradeDatabase.php:153 UpgradeDatabase.php:156 UpgradeDatabase.php:159
-#: UpgradeDatabase.php:162 UpgradeDatabase.php:165 UpgradeDatabase.php:168
-#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
-#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
-#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
-#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
-#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
-msgid "Note"
-msgstr "備註"
-
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
-msgid "WWW"
-msgstr "WWW萬維網"
-
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
-#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
-msgid "Priority"
-msgstr "優先順序"
-
-#: AddCustomerNotes.php:143
-msgid "Review all notes for this Customer"
-msgstr "查看此顧客的所有通知"
-
-#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
-msgid "Note ID"
-msgstr "Note ID"
-
-#: AddCustomerNotes.php:177
-msgid "Contact Note"
-msgstr "聯絡人備註"
-
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:679
-msgid "Customer Type (Group) Notes"
-msgstr "顧客種類(組）備註"
-
-#: AddCustomerTypeNotes.php:31
-msgid "The Contact priority must be an integer."
-msgstr "聯絡人優先順序必須是整數"
-
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:709
-msgid "Customer Group Notes"
-msgstr "顧客組通知"
-
-#: AddCustomerTypeNotes.php:60
-msgid "The contact group notes record has been added"
-msgstr "聯繫人組通知記錄已增加"
-
-#: AddCustomerTypeNotes.php:84
-msgid "The contact group note record has been deleted"
-msgstr "聯繫人組通知記錄已經刪除"
-
-#: AddCustomerTypeNotes.php:95
-msgid "Notes for Customer Type"
-msgstr "顧客類型的通知："
-
-#: AddCustomerTypeNotes.php:106
-msgid "href"
-msgstr "href"
-
-#: AddCustomerTypeNotes.php:141
-msgid "Review all notes for this Customer Type"
-msgstr "查看此顧客類型的所有通知。"
-
-#: AddCustomerTypeNotes.php:182
-msgid "Contact Group Note"
-msgstr "聯繫人組通知"
-
-#: AddCustomerTypeNotes.php:184
-msgid "Web site"
-msgstr "網站"
-
-#: AgedDebtors.php:17
-msgid "Aged Customer Balance Listing"
-msgstr "應收賬款帳齡分析表"
-
-#: AgedDebtors.php:18
-msgid "Aged Customer Balances"
-msgstr "欠款餘額"
-
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-msgid "Aged Customer Account Analysis"
-msgstr "客戶欠款分析"
-
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
-#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
-#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:90
-#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:174
-#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
-#: InventoryPlanning.php:209 InventoryPlanning.php:257
-#: InventoryPlanning.php:295 InventoryPlanningPrefSupplier.php:208
-#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
-#: InventoryPlanningPrefSupplier.php:355 InventoryPlanningPrefSupplier.php:401
-#: InventoryQuantities.php:83 InventoryValuation.php:76
-#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:114
-#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:529
-#: MRPReschedules.php:46 MRPReschedules.php:58 MRPShortages.php:145
-#: MRPShortages.php:157 OutstandingGRNs.php:51 OutstandingGRNs.php:63
-#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
-#: PDFLowGP.php:23 PDFStockCheckComparison.php:35
-#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
-#: ReorderLevel.php:59 SelectAsset.php:36 SelectProduct.php:37
-#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:325
-#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
-msgid "Problem Report"
-msgstr "問題報告"
-
-#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
-#: DebtorsAtPeriodEnd.php:60
-msgid "The customer details could not be retrieved by the SQL because"
-msgstr "客戶明細資料無法從SQL取得, 因為"
-
-#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
-#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
-#: Credit_Invoice.php:185 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
-#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:93
-#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
-#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:177 GLTagProfit_Loss.php:189
-#: GLTrialBalance.php:154 GLTrialBalance.php:166 InventoryPlanning.php:102
-#: InventoryPlanning.php:177 InventoryPlanning.php:212
-#: InventoryPlanning.php:260 InventoryPlanning.php:298
-#: InventoryPlanning.php:361 InventoryPlanningPrefSupplier.php:211
-#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
-#: InventoryPlanningPrefSupplier.php:358 InventoryPlanningPrefSupplier.php:404
-#: InventoryPlanningPrefSupplier.php:460 InventoryQuantities.php:86
-#: InventoryQuantities.php:97 InventoryValuation.php:79
-#: InventoryValuation.php:90 MailInventoryValuation.php:118
-#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:117
-#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
-#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:318 MRPReport.php:41
-#: MRPReport.php:52 MRPReport.php:150 MRPReschedules.php:49
-#: MRPReschedules.php:61 MRPShortages.php:148 MRPShortages.php:160
-#: OutstandingGRNs.php:54 OutstandingGRNs.php:66 PcReportTab.php:236
-#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFGrn.php:124
-#: PDFLowGP.php:63 PDFLowGP.php:75 PDFPriceList.php:124 PDFQuotation.php:234
-#: PDFQuotationPortrait.php:235 PDFRemittanceAdvice.php:84
-#: PDFStockCheckComparison.php:39 PDFStockCheckComparison.php:65
-#: PDFStockCheckComparison.php:266 PDFTopItems.php:118 PO_PDFPurchOrder.php:30
-#: PO_PDFPurchOrder.php:144 PrintCustOrder_generic.php:180
-#: PrintCustOrder.php:198 ReorderLevel.php:62 ReorderLevel.php:151
-#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:23 StockCheck.php:47
-#: StockCheck.php:68 StockCheck.php:98 StockCheck.php:142 StockCheck.php:153
-#: StockCheck.php:195 StockDispatch.php:93 StockDispatch.php:105
-#: SupplierBalsAtPeriodEnd.php:57 SupplierBalsAtPeriodEnd.php:68
-#: SuppPaymentRun.php:109 SuppPaymentRun.php:120 SuppPaymentRun.php:184
-#: SuppPaymentRun.php:214 SuppPriceList.php:121 Tax.php:64 Tax.php:177
-#: Tax.php:286 Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
-#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
-#: Z_DataExport.php:420 Z_DataExport.php:472 Z_poRebuildDefault.php:38
-#: includes/PDFPaymentRun_PymtFooter.php:57
-#: includes/PDFPaymentRun_PymtFooter.php:87
-#: includes/PDFPaymentRun_PymtFooter.php:116
-#: includes/PDFPaymentRun_PymtFooter.php:152
-#: includes/PDFPaymentRun_PymtFooter.php:183
-#: includes/PDFPaymentRun_PymtFooter.php:215
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:340
-msgid "Back to the menu"
-msgstr "返回主菜單"
-
-#: AgedDebtors.php:367
-msgid "The details of outstanding transactions for customer"
-msgstr "該用戶未清算的交易明細"
-
-#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
-#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:471
-#: PO_Items.php:605 PO_Items.php:632 SalesAnalReptCols.php:356
-#: SpecialOrder.php:369 StockLocTransferReceive.php:373
-#: StockQuantityByDate.php:114 includes/SelectOrderItems_IntoCart.inc:53
-msgid "could not be retrieved because"
-msgstr "不能取得, 因為"
-
-#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
-#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:969
-#: ConfirmDispatch_Invoice.php:983 Contracts.php:581 CounterSales.php:1323
-#: CounterSales.php:1337 Credit_Invoice.php:706 Credit_Invoice.php:728
-#: CustomerReceipt.php:526 CustomerReceipt.php:658 CustomerReceipt.php:686
-#: CustomerTransInquiry.php:79 DeliveryDetails.php:395 GLProfit_Loss.php:578
-#: GLTagProfit_Loss.php:490 Payments.php:307 PDFRemittanceAdvice.php:86
-#: PurchData.php:89 PurchData.php:108 PurchData.php:244 ReverseGRN.php:191
-#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1381
-#: SelectSalesOrder.php:113 SelectSalesOrder.php:281 StockCheck.php:225
-#: StockCostUpdate.php:79 StockCostUpdate.php:89 StockLocStatus.php:142
-#: StockMovements.php:92 StockQuantityByDate.php:90 StockReorderLevel.php:39
-#: StockStatus.php:271 StockTransfers.php:159 StockUsageGraph.php:53
-#: StockUsage.php:132 SupplierInquiry.php:79 SupplierInquiry.php:101
-#: SupplierInquiry.php:131 SupplierInquiry.php:177 SupplierTransInquiry.php:81
-#: SuppPaymentRun.php:111 SuppPaymentRun.php:186 SuppPaymentRun.php:216
-#: WorkOrderCosting.php:393 WorkOrderReceive.php:272 WOSerialNos.php:44
-#: Z_ChangeBranchCode.php:108 Z_ChangeCustomerCode.php:92
-#: Z_DeleteCreditNote.php:57 Z_DeleteInvoice.php:83
-#: includes/PDFPaymentRun_PymtFooter.php:59
-#: includes/PDFPaymentRun_PymtFooter.php:89
-#: includes/PDFPaymentRun_PymtFooter.php:118
-#: includes/PDFPaymentRun_PymtFooter.php:154
-#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:79
-#: includes/ConnectDB_mysql.inc:68
-msgid "The SQL that failed was"
-msgstr "運行失敗的 SQL 是"
-
-#: AgedDebtors.php:438
-msgid "There are no customers meeting the criteria specified to list"
-msgstr "沒有符合條件的客戶"
-
-#: AgedDebtors.php:464
-msgid "Aged Debtor Analysis"
-msgstr "應收賬款賬齡分析表"
-
-#: AgedDebtors.php:477 DebtorsAtPeriodEnd.php:148
-msgid "From Customer Code"
-msgstr "由客戶編號"
-
-#: AgedDebtors.php:478 DebtorsAtPeriodEnd.php:149
-msgid "To Customer Code"
-msgstr "到客戶編號"
-
-#: AgedDebtors.php:480 AgedSuppliers.php:293
-msgid "All balances or overdues only"
-msgstr "全部餘額或只包含過期未付的"
-
-#: AgedDebtors.php:481
-msgid "All customers with balances"
-msgstr "所有有餘額的客戶"
-
-#: AgedDebtors.php:482 AgedSuppliers.php:296
-msgid "Overdue accounts only"
-msgstr "只顯示過期未付的"
-
-#: AgedDebtors.php:483
-msgid "Held accounts only"
-msgstr "只顯示被凍結的客戶"
-
-#: AgedDebtors.php:486
-msgid "Only Show Customers Of"
-msgstr "負責客戶的銷售員："
-
-#: AgedDebtors.php:498
-msgid "Only show customers trading in"
-msgstr "客戶的貨幣"
-
-#: AgedDebtors.php:514
-msgid "Summary or detailed report"
-msgstr "匯總或明細"
-
-#: AgedDebtors.php:516 AgedSuppliers.php:316 InventoryValuation.php:238
-msgid "Summary Report"
-msgstr "匯總報表"
-
-#: AgedDebtors.php:517 AgedSuppliers.php:317 InventoryValuation.php:239
-msgid "Detailed Report"
-msgstr "明細報表"
-
-#: AgedDebtors.php:520 AgedSuppliers.php:320 BOMExtendedQty.php:300
-#: BOMIndented.php:278 BOMIndentedReverse.php:266 BOMListing.php:142
-#: DebtorsAtPeriodEnd.php:166 InventoryPlanning.php:442
-#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:188
-#: InventoryValuation.php:242 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:344 MRPReschedules.php:166 MRPShortages.php:259
-#: OutstandingGRNs.php:185 PDFCustomerList.php:412 PDFLowGP.php:168
-#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
-#: PDFStockCheckComparison.php:379 PrintCustTrans.php:416
-#: PrintCustTransPortrait.php:560 ReorderLevel.php:229 StockDispatch.php:309
-#: SupplierBalsAtPeriodEnd.php:155 SuppPriceList.php:228 Tax.php:352
-msgid "Print PDF"
-msgstr "列印到PDF"
-
-#: AgedSuppliers.php:18
-msgid "Aged Supplier Listing"
-msgstr "應付賬款賬齡分析表"
-
-#: AgedSuppliers.php:19
-msgid "Aged Suppliers"
-msgstr "供應商"
-
-#: AgedSuppliers.php:105
-msgid "Aged Supplier Account Analysis"
-msgstr "應付賬款賬齡分析"
-
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
-msgid "The Supplier details could not be retrieved by the SQL because"
-msgstr "供應商明細資料未能由SQL取得, 因為"
-
-#: AgedSuppliers.php:187
-msgid "Aged Supplier Account Analysis - Problem Report"
-msgstr "應付賬款帳齡分析-問題報告"
-
-#: AgedSuppliers.php:189
-msgid "The details of outstanding transactions for Supplier"
-msgstr "該供應商未清算的交易明細"
-
-#: AgedSuppliers.php:273
-msgid "Aged Supplier Analysis"
-msgstr "應付賬款帳齡分析"
-
-#: AgedSuppliers.php:286 OutstandingGRNs.php:180 PDFRemittanceAdvice.php:138
-#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:259
-msgid "From Supplier Code"
-msgstr "從供應商編號"
-
-#: AgedSuppliers.php:289 OutstandingGRNs.php:182 PDFRemittanceAdvice.php:140
-#: SupplierBalsAtPeriodEnd.php:134 SuppPaymentRun.php:261
-msgid "To Supplier Code"
-msgstr "到供應商編號"
-
-#: AgedSuppliers.php:295
-msgid "All suppliers with balances"
-msgstr "全部有餘額的供應商"
-
-#: AgedSuppliers.php:299
-msgid "For suppliers trading in"
-msgstr "供應商貨幣"
-
-#: AgedSuppliers.php:314 InventoryValuation.php:237
-msgid "Summary or Detailed Report"
-msgstr "匯總或明細表"
-
-#: Areas.php:8
-msgid "Sales Area Maintenance"
-msgstr "銷售區域"
-
-#: Areas.php:41
-msgid "The area code must be three characters or less long"
-msgstr "區域編號長度必須是或少於3個字元"
-
-#: Areas.php:46
-msgid "The area code entered already exists"
-msgstr "輸入的區功能變數代碼已經存在"
-
-#: Areas.php:51
-msgid "The area description must be twenty five characters or less long"
-msgstr "區域說明長度必須是或少於25個字元"
-
-#: Areas.php:56
-msgid "The area code may not be empty"
-msgstr "區域編號不能為空"
-
-#: Areas.php:61
-msgid "The area description may not be empty"
-msgstr "區域說明不能為空"
-
-#: Areas.php:74
-msgid "Area code"
-msgstr "區域編號"
-
-#: Areas.php:88
-msgid "New area code"
-msgstr "新區域編號"
-
-#: Areas.php:88
-msgid "has been inserted"
-msgstr "已插入"
-
-#: Areas.php:95
-msgid "The area could not be added or updated because"
-msgstr "區域編號不能新增或更新, 因為"
-
-#: Areas.php:116
-msgid ""
-"Cannot delete this area because customer branches have been created using "
-"this area"
-msgstr "不能刪除此銷售區域因為已有客戶分公司在這區域"
-
-#: Areas.php:117
-msgid "branches using this area code"
-msgstr "家此區域編號的分公司"
-
-#: Areas.php:125
-msgid ""
-"Cannot delete this area because sales analysis records exist that use this "
-"area"
-msgstr "不能刪除這個區域因為此區域已用於現有的銷售分析記錄"
-
-#: Areas.php:126
-msgid "sales analysis records referring this area code"
-msgstr "條此區域的銷售分析記錄"
-
-#: Areas.php:133 Areas.php:149 Areas.php:202 Areas.php:213
-msgid "Area Code"
-msgstr "區域編號"
-
-#: Areas.php:133 CustomerTypes.php:166 Factors.php:142
-#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:328
-#: MRPDemands.php:248 PcAssignCashToTab.php:118 PcClaimExpensesFromTab.php:109
-#: PcExpenses.php:137 PcExpensesTypeTab.php:86 PcTabs.php:124
-#: PcTypeTabs.php:137 SalesAnalReptCols.php:215 SalesCategories.php:139
-#: SalesTypes.php:163 StockCategories.php:199 Suppliers.php:639
-#: SupplierTypes.php:153 Z_DeleteInvoice.php:142
-msgid "has been deleted"
-msgstr "已刪除"
-
-#: Areas.php:150 Areas.php:218
-msgid "Area Name"
-msgstr "區域名稱"
-
-#: Areas.php:167
-msgid "View Customers from this Area"
-msgstr "查看此區域的顧客"
-
-#: Areas.php:177
-msgid "Review Areas Defined"
-msgstr "查看銷售區域"
-
-#: AuditTrail.php:9
-msgid "Audit Trail"
-msgstr "審核追蹤"
-
-#: AuditTrail.php:23
-msgid "Incorrect date format used, please re-enter"
-msgstr "輸入的日期無效, 請輸入有效日期格式"
-
-#: AuditTrail.php:37 BOMIndented.php:317 BOMIndentedReverse.php:305
-#: MRPCalendar.php:260
-msgid "From Date"
-msgstr "從 日期"
-
-#: AuditTrail.php:39 BOMIndented.php:318 BOMIndentedReverse.php:306
-#: MRPCalendar.php:262
-msgid "To Date"
-msgstr "到 日期"
-
-#: AuditTrail.php:43 PO_AuthorisationLevels.php:123
-#: PO_AuthorisationLevels.php:160 PO_AuthorisationLevels.php:163
-#: UserSettings.php:109
-msgid "User ID"
-msgstr "用戶 ID"
-
-#: AuditTrail.php:56
-msgid "Table "
-msgstr "表 "
-
-#: AuditTrail.php:68 MRPReport.php:789 PO_SelectPurchOrder.php:363
-#: SelectContract.php:196 SelectProduct.php:727
-msgid "View"
-msgstr "查看"
-
-#: AuditTrail.php:144
-msgid "Date/Time"
-msgstr "日期/時間"
-
-#: AuditTrail.php:145 PcReportTab.php:283 includes/header.inc:52
-msgid "User"
-msgstr "用戶"
-
-#: AuditTrail.php:146 BankReconciliation.php:185 BankReconciliation.php:257
-#: CustomerAllocations.php:356 CustomerInquiry.php:189
-#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
-#: CustWhereAlloc.php:18 CustWhereAlloc.php:87 DailyBankTransactions.php:99
-#: GLAccountInquiry.php:152 GLAccountReport.php:367 GLJournal.php:256
-#: MRPReschedules.php:204 SelectCustomer.php:463 ShipmentCosting.php:501
-#: ShipmentCosting.php:572 StockCategories.php:219 StockLocMovements.php:83
-#: StockMovements.php:97 SupplierAllocations.php:462 SupplierInquiry.php:193
-#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
-#: Z_CheckAllocationsFrom.php:27 Z_CheckAllocationsFrom.php:50
-#: Z_CheckAllocs.php:59 Z_CheckGLTransBalance.php:12
-#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
-#: includes/PDFTaxPageHeader.inc:34
-msgid "Type"
-msgstr "憑證類型"
-
-#: AuditTrail.php:147
-msgid "Table"
-msgstr "表"
-
-#: AuditTrail.php:148 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1892
-msgid "Field Name"
-msgstr "欄位名"
-
-#: AuditTrail.php:149 SystemParameters.php:315
-#: includes/PDFInventoryValnPageHeader.inc:38
-#: includes/PDFOstdgGRNsPageHeader.inc:43
-msgid "Value"
-msgstr "價值"
-
-#: BankAccounts.php:9
-msgid "Bank Accounts Maintenance"
-msgstr "銀行帳戶維護"
-
-#: BankAccounts.php:13 TaxAuthorities.php:149
-msgid "Bank"
-msgstr "納稅專戶銀行"
-
-#: BankAccounts.php:14
-msgid ""
-"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
-"Codes. Set Default for Invoices to \"yes\" to print Account details on "
-"Invoices (only one account can be set to \"yes\")."
-msgstr ""
-"更新銀行帳戶細節。帳戶代碼是SWIFT或者BSB類型的銀行代碼。將發票默認項設置為"
-"\"是\"來在發票上列印帳戶的細節 （僅一個帳戶可以被設置為\"是\")"
-
-#: BankAccounts.php:46
-msgid "The bank account code already exists in the database"
-msgstr "輸入的銀行帳戶代碼已經存在於資料庫"
-
-#: BankAccounts.php:52
-msgid "The bank account name must be fifty characters or less long"
-msgstr "銀行帳戶名稱長度必須是或少於50個字"
-
-#: BankAccounts.php:58
-msgid "The bank account name may not be empty."
-msgstr "銀行帳戶名稱不能留空"
-
-#: BankAccounts.php:64
-msgid "The bank account number may not be empty."
-msgstr "銀行帳戶號碼不能留空"
-
-#: BankAccounts.php:70
-msgid "The bank account number must be fifty characters or less long"
-msgstr "銀行帳號長度必須是或少於50個字"
-
-#: BankAccounts.php:76
-msgid "The bank address must be fifty characters or less long"
-msgstr "銀行地址必須是或少於50個字"
-
-#: BankAccounts.php:95
-msgid ""
-"Note that it is not possible to change the currency of the account once "
-"there are transactions against it"
-msgstr "注意：一旦已經記錄了交易，就不能再改變帳戶的幣種。"
-
-#: BankAccounts.php:108
-msgid "The bank account details have been updated"
-msgstr "銀行帳號已更新"
-
-#: BankAccounts.php:129
-msgid "The new bank account has been entered"
-msgstr "新建銀行帳戶成功"
-
-#: BankAccounts.php:134
-msgid "The bank account could not be inserted or modified because"
-msgstr "新建或更新銀行帳戶失敗，原因是"
-
-#: BankAccounts.php:135
-msgid "The SQL used to insert/modify the bank account details was"
-msgstr "用於新建或更新銀行帳戶的SQL是"
-
-#: BankAccounts.php:162
-msgid ""
-"Cannot delete this bank account because transactions have been created using "
-"this account"
-msgstr "不能刪除此銀行帳戶，因為此帳戶已有交易"
-
-#: BankAccounts.php:163
-msgid "transactions with this bank account code"
-msgstr "筆此銀行帳戶的交易"
-
-#: BankAccounts.php:169
-msgid "Bank account deleted"
-msgstr "銀行帳戶已刪除"
-
-#: BankAccounts.php:190
-msgid "The bank accounts set up could not be retrieved because"
-msgstr "設置的銀行帳戶沒找到，原因是"
-
-#: BankAccounts.php:191
-msgid "The SQL used to retrieve the bank account details was"
-msgstr "用於查找銀行帳戶的SQL是"
-
-#: BankAccounts.php:196 GLJournal.php:280
-msgid "GL Account Code"
-msgstr "總帳帳戶代碼"
-
-#: BankAccounts.php:197 BankAccounts.php:326
-msgid "Bank Account Name"
-msgstr "銀行帳戶名稱"
-
-#: BankAccounts.php:198 BankAccounts.php:328
-msgid "Bank Account Code"
-msgstr "銀行帳戶代碼"
-
-#: BankAccounts.php:199 BankAccounts.php:330
-msgid "Bank Account Number"
-msgstr "銀行帳號"
-
-#: BankAccounts.php:200 BankAccounts.php:332
-msgid "Bank Address"
-msgstr "銀行地址"
-
-#: BankAccounts.php:201 CustomerReceipt.php:756 CustomerTransInquiry.php:95
-#: OffersReceived.php:98 PcReportTab.php:291 PcTabs.php:147 PcTabs.php:295
-#: PDFPrintLabel.php:94 PO_AuthorisationLevels.php:125
-#: PO_AuthorisationLevels.php:180 PO_AuthorisationLevels.php:183
-#: PO_AuthoriseMyOrders.php:107 PO_Header.php:534
-#: PO_SelectOSPurchOrder.php:444 PO_SelectPurchOrder.php:365
-#: PricesByCost.php:239 Prices.php:198 Prices.php:293 PurchData.php:172
-#: PurchData.php:340 PurchData.php:453 SelectSupplier.php:251
-#: SupplierCredit.php:268 SupplierInvoice.php:232 SupplierTransInquiry.php:95
-#: SuppPriceList.php:265 includes/PDFBankingSummaryPageHeader.inc:42
-#: includes/PDFDebtorBalsPageHeader.inc:33
-#: includes/PDFSupplierBalsPageHeader.inc:36
-msgid "Currency"
-msgstr "貨幣"
-
-#: BankAccounts.php:202 BankAccounts.php:351
-msgid "Default for Invoices"
-msgstr "發票預設值"
-
-#: BankAccounts.php:251
-msgid "Show All Bank Accounts Defined"
-msgstr "顯示全部銀行帳戶"
-
-#: BankAccounts.php:284 BankAccounts.php:287
-msgid "Bank Account GL Code"
-msgstr "會計科目"
-
-#: BankAccounts.php:334
-msgid "Currency Of Account"
-msgstr "帳戶的貨幣"
-
-#: BankMatching.php:8
-msgid "Bank Account Matching"
-msgstr "銀行帳戶對賬"
-
-#: BankMatching.php:15 PDFCustTransListing.php:44 Z_CheckDebtorsControl.php:80
-msgid "Receipts"
-msgstr "收款"
-
-#: BankMatching.php:16 BankMatching.php:23
-msgid "Bank Matching"
-msgstr "銀行對賬"
-
-#: BankMatching.php:16
-msgid "Bank Account Matching - Receipts"
-msgstr "銀行帳戶對賬-收款"
-
-#: BankMatching.php:22 PaymentAllocations.php:33 PaymentMethods.php:13
-#: PDFSuppTransListing.php:44
-msgid "Payments"
-msgstr "付款"
-
-#: BankMatching.php:23
-msgid "Bank Account Matching - Payments"
-msgstr "銀行帳戶對賬-付款"
-
-#: BankMatching.php:27
-msgid "This page must be called with a bank transaction type"
-msgstr "這個頁面必須指定銀行交易類別"
-
-#: BankMatching.php:27
-msgid "It should not be called directly"
-msgstr "不能直接調用"
-
-#: BankMatching.php:40
-msgid "Could not retrieve transaction information"
-msgstr "找不到此交易資訊"
-
-#: BankMatching.php:47
-msgid "Could not match off this payment because"
-msgstr "無法確認這筆付款, 因為"
-
-#: BankMatching.php:58
-msgid "Could not update the amount matched off this bank transaction because"
-msgstr "無法更新銀行對賬記錄, 因為"
-
-#: BankMatching.php:64
-msgid "Could not unclear this bank transaction because"
-msgstr "無法取消確認此銀行交易, 因為"
-
-#: BankMatching.php:72
-msgid ""
-"Use this screen to match webERP Receipts and Payments to your Bank "
-"Statement. Check your bank statement and click the check-box when you find "
-"the matching transaction."
-msgstr ""
-"使用此螢幕來核對webERP與您銀行收款和付款對帳單。核對您的銀行對帳單並且當您發"
-"現符合的交易時點擊核取框。"
-
-#: BankMatching.php:80 BankReconciliation.php:97 CustomerReceipt.php:729
-#: DailyBankTransactions.php:28 Payments.php:732 PDFChequeListing.php:46
-#: TaxAuthorities.php:150 TaxAuthorities.php:306
-msgid "Bank Account"
-msgstr "銀行帳戶"
-
-#: BankMatching.php:102
-msgid "Show"
-msgstr "顯示"
-
-#: BankMatching.php:102 CreditItemsControlled.php:78 FreightCosts.php:270
-#: GoodsReceivedControlled.php:65 GoodsReceived.php:67
-#: StockLocTransferReceive.php:426 SupplierAllocations.php:443
-#: SuppShiptChgs.php:126
-msgid "from"
-msgstr "來自"
-
-#: BankMatching.php:105 ConfirmDispatchControlled_Invoice.php:59
-#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:281
-#: GLAccountCSV.php:172 GLAccountReport.php:102 Payments.php:712
-#: PcReportTab.php:105 PDFChequeListing.php:108 PDFChequeListing.php:118
-#: PDFChequeListing.php:205 PDFDeliveryDifferences.php:166
-#: PDFDeliveryDifferences.php:179 PDFDeliveryDifferences.php:287
-#: PDFDIFOT.php:172 PDFDIFOT.php:185 PDFDIFOT.php:289 PDFOrdersInvoiced.php:74
-#: PDFOrdersInvoiced.php:271 PDFOrderStatus.php:75 PDFOrderStatus.php:250
-#: PO_PDFPurchOrder.php:302 PricesBasedOnMarkUp.php:216
-#: PricesBasedOnMarkUp.php:355 PrintCustStatements.php:50
-#: PrintCustTrans.php:37 PrintCustTrans.php:40 PrintCustTransPortrait.php:60
-#: PrintCustTransPortrait.php:63 SalesGraph.php:200 SalesGraph.php:229
-#: SalesGraph.php:233 StockLocTransferReceive.php:310
-#: StockLocTransferReceive.php:426 Stocks.php:229 Stocks.php:234
-#: StockStatus.php:309 StockStatus.php:350 StockTransfers.php:397
-#: includes/PDFAgedDebtorsPageHeader.inc:18
-#: includes/PDFAgedSuppliersPageHeader.inc:17
-#: includes/PDFChequeListingPageHeader.inc:17
-#: includes/PDFDeliveryDifferencesPageHeader.inc:19
-#: includes/PDFDeliveryDifferencesPageHeader.inc:21
-#: includes/PDFDIFOTPageHeader.inc:19 includes/PDFDIFOTPageHeader.inc:21
-#: includes/PDFOrdersInvoicedPageHeader.inc:19
-#: includes/PDFOrdersInvoicedPageHeader.inc:21
-#: includes/PDFOrderStatusPageHeader.inc:19
-#: includes/PDFOrderStatusPageHeader.inc:21
-#: includes/PDFStockLocTransferHeader.inc:31
-msgid "to"
-msgstr "到"
-
-#: BankMatching.php:107
-msgid "Choose outstanding"
-msgstr "選擇未清算"
-
-#: BankMatching.php:107
-msgid "only or all"
-msgstr "或全部"
-
-#: BankMatching.php:107 BankMatching.php:111 BankMatching.php:114
-#: BankMatching.php:122 BankMatching.php:125
-msgid "in the date range"
-msgstr "記錄"
-
-#: BankMatching.php:111 BankMatching.php:114 BankMatching.php:122
-#: BankMatching.php:125
-msgid "Show all"
-msgstr "顯示全部"
-
-#: BankMatching.php:112 BankMatching.php:115
-msgid "Show unmatched"
-msgstr "只顯示未清算的"
-
-#: BankMatching.php:112 BankMatching.php:115 ReverseGRN.php:103
-#: includes/PDFCustomerListPageHeader.inc:46
-#: includes/PDFDeliveryDifferencesPageHeader.inc:24
-#: includes/PDFDIFOTPageHeader.inc:24
-#: includes/PDFOrdersInvoicedPageHeader.inc:24
-#: includes/PDFOrderStatusPageHeader.inc:24
-msgid "only"
-msgstr "僅"
-
-#: BankMatching.php:119
-msgid "Choose to display only the first 20 matching"
-msgstr "只顯示前20條"
-
-#: BankMatching.php:120
-msgid "or all"
-msgstr "或全部"
-
-#: BankMatching.php:120
-msgid "meeting the criteria"
-msgstr "記錄"
-
-#: BankMatching.php:123 BankMatching.php:126
-msgid "Show only the first 20"
-msgstr "只顯示首 20"
-
-#: BankMatching.php:131
-msgid "Show selected"
-msgstr "顯示符合條件的"
-
-#: BankMatching.php:132
-msgid "Show reconciliation"
-msgstr "顯示銀行對帳單"
-
-#: BankMatching.php:138 BankMatching.php:144
-msgid "The date entered for the field to show"
-msgstr "輸入的日期"
-
-#: BankMatching.php:138
-msgid "before"
-msgstr "日期早於"
-
-#: BankMatching.php:139 BankMatching.php:145
-msgid "is not entered in a recognised date format"
-msgstr "格式不正確"
-
-#: BankMatching.php:139 BankMatching.php:145
-msgid "Entry is expected in the format"
-msgstr "按正確格式輸入日期"
-
-#: BankMatching.php:144
-msgid "after"
-msgstr "之後"
-
-#: BankMatching.php:218
-msgid "The payments with the selected criteria could not be retrieved because"
-msgstr "未能提取符合條件的付款, 因為"
-
-#: BankMatching.php:221 ShipmentCosting.php:502 ShipmentCosting.php:573
-#: SupplierAllocations.php:465
-msgid "Ref"
-msgstr "摘要"
-
-#: BankMatching.php:224 ConfirmDispatch_Invoice.php:279 Credit_Invoice.php:280
-#: CustomerAllocations.php:359 CustomerReceipt.php:845
-#: CustomerTransInquiry.php:94 CustWhereAlloc.php:91 PaymentAllocations.php:78
-#: Payments.php:925 Payments.php:927 Payments.php:936
-#: PcAssignCashToTab.php:214 PcAssignCashToTab.php:335
-#: PcAuthorizeExpenses.php:83 PcClaimExpensesFromTab.php:193
-#: PcClaimExpensesFromTab.php:342 PcReportTab.php:175 PcReportTab.php:347
-#: PrintCheque.php:70 PrintCheque.php:84 SelectCreditItems.php:659
-#: SuppContractChgs.php:73 SuppContractChgs.php:142 SuppFixedAssetChgs.php:71
-#: SuppFixedAssetChgs.php:137 SupplierAllocations.php:466
-#: SupplierCredit.php:345 SupplierCredit.php:373 SupplierCredit.php:403
-#: SupplierCredit.php:438 SupplierInvoice.php:313 SupplierInvoice.php:344
-#: SupplierInvoice.php:373 SupplierInvoice.php:409 SupplierTransInquiry.php:94
-#: SuppShiptChgs.php:77 SuppShiptChgs.php:134 SuppTransGLAnalysis.php:97
-#: SuppTransGLAnalysis.php:174 Z_CheckAllocs.php:63
-#: includes/PDFBankingSummaryPageHeader.inc:55
-#: includes/PDFChequeListingPageHeader.inc:37
-msgid "Amount"
-msgstr "金額"
-
-#: BankMatching.php:225 BankReconciliation.php:189 BankReconciliation.php:261
-#: PDFOrdersInvoiced.php:348 PDFOrderStatus.php:316
-#: PO_SelectOSPurchOrder.php:215 PO_SelectPurchOrder.php:180
-#: Shipt_Select.php:186 SuppCreditGRNs.php:225
-#: includes/PDFStatementPageHeader.inc:173
-#: includes/PDFStatementPageHeader.inc:180
-msgid "Outstanding"
-msgstr "未清算"
-
-#: BankMatching.php:226
-msgid "Clear"
-msgstr "清算"
-
-#: BankMatching.php:226 BankMatching.php:255
-msgid "Unclear"
-msgstr "未清算"
-
-#: BankMatching.php:299
-msgid "Update Matching"
-msgstr "保存"
-
-#: BankReconciliation.php:10
-msgid "Bank Reconciliation"
-msgstr "銀行對帳單"
-
-#: BankReconciliation.php:20
-msgid ""
-"The entry in the bank statement balance is not numeric. The balance on the "
-"bank statement should be entered. The exchange difference has not been "
-"calculated and no general ledger journal has been created"
-msgstr ""
-"輸入的銀行對賬表餘額不是數字。銀行對賬表的餘額需要輸入。匯兌差異沒有被計算並"
-"且沒有創建總帳日記帳。"
-
-#: BankReconciliation.php:29
-msgid "Could not retrieve the exchange rate for the selected bank account"
-msgstr "無法查詢所選銀行帳戶的匯率, 因為"
-
-#: BankReconciliation.php:59 BankReconciliation.php:77
-msgid "reconciliation on"
-msgstr "對賬於"
-
-#: BankReconciliation.php:62
-msgid "Cannot insert a GL entry for the exchange difference because"
-msgstr "未能插入匯兌差異的總賬憑證, 因為"
-
-#: BankReconciliation.php:63
-msgid "The SQL that failed to insert the exchange difference GL entry was"
-msgstr "插入匯率差異總賬憑證失敗的SQL是"
-
-#: BankReconciliation.php:83
-msgid "Exchange difference of"
-msgstr "匯兌差異"
-
-#: BankReconciliation.php:83
-msgid "has been posted"
-msgstr "已過賬"
-
-#: BankReconciliation.php:93 SuppPaymentRun.php:300
-msgid "The bank accounts could not be retrieved by the SQL because"
-msgstr "找不到銀行帳戶，因為"
-
-#: BankReconciliation.php:94 CustomerReceipt.php:720
-#: DailyBankTransactions.php:25 Payments.php:729 SuppPaymentRun.php:302
-msgid "The SQL used to retrieve the bank accounts was"
-msgstr "找不到銀行帳戶的SQL是"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-msgid "Bank Accounts have not yet been defined"
-msgstr "尚未定義銀行帳戶"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-msgid "You must first"
-msgstr "您必須首先"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
-msgid "define the bank accounts"
-msgstr "定義銀行帳戶"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
-msgid "and general ledger accounts to be affected"
-msgstr "和對應的會計科目"
-
-#: BankReconciliation.php:119
-msgid "Show bank reconciliation statement"
-msgstr "顯示銀行對帳單"
-
-#: BankReconciliation.php:134
-msgid "The bank account balance could not be returned by the SQL because"
-msgstr "無法返回銀行帳戶餘額，原因是"
-
-#: BankReconciliation.php:147
-msgid ""
-"Could not retrieve the currency and exchange rate for the selected bank "
-"account"
-msgstr "無法找到所選銀行帳戶的貨幣和匯率, 因為"
-
-#: BankReconciliation.php:155
-msgid "Balance as at"
-msgstr "餘額截止"
-
-#: BankReconciliation.php:178
-msgid "The unpresented cheques could not be retrieved by the SQL because"
-msgstr "未找到企業已付銀行未付記錄, 因為"
-
-#: BankReconciliation.php:181
-msgid "Add back unpresented cheques"
-msgstr "加：企業已付銀行未付"
-
-#: BankReconciliation.php:186 BankReconciliation.php:258
-#: CustomerAllocations.php:331 CustomerAllocations.php:357
-#: CustomerInquiry.php:190 CustomerTransInquiry.php:86 CustWhereAlloc.php:88
-#: EmailCustTrans.php:17 GLAccountInquiry.php:153 PrintCustTrans.php:378
-#: PrintCustTrans.php:542 PrintCustTrans.php:696 PrintCustTrans.php:735
-#: PrintCustTransPortrait.php:504 PrintCustTransPortrait.php:704
-#: PrintCustTransPortrait.php:894 PrintCustTransPortrait.php:939
-#: StockMovements.php:97 SupplierAllocations.php:463
-#: SupplierAllocations.php:575 SupplierAllocations.php:645
-#: SupplierTransInquiry.php:87 Z_CheckAllocs.php:60
-#: Z_CheckGLTransBalance.php:13 includes/PDFQuotationPageHeader.inc:87
-#: includes/PDFQuotationPortraitPageHeader.inc:86
-#: includes/PDFStatementPageHeader.inc:168
-#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:80
-#: includes/PDFTransPageHeaderPortrait.inc:52
-msgid "Number"
-msgstr "編號"
-
-#: BankReconciliation.php:187 BankReconciliation.php:259
-#: ContractCosting.php:148 CustomerInquiry.php:193 CustomerTransInquiry.php:90
-#: CustWhereAlloc.php:89 DailyBankTransactions.php:100 GLAccountReport.php:368
-#: PaymentAllocations.php:75 PaymentAllocations.php:76
-#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
-#: StockCounts.php:135 StockLocMovements.php:88 StockMovements.php:100
-#: Z_CheckAllocs.php:61 includes/PDFBankingSummaryPageHeader.inc:40
-#: includes/PDFCustTransListingPageHeader.inc:49
-#: includes/PDFStockComparisonPageHeader.inc:36
-#: includes/PDFStockTransListingPageHeader.inc:68
-#: includes/PDFStockTransListingPageHeader.inc:72
-#: includes/PDFSuppTransListingPageHeader.inc:49
-msgid "Reference"
-msgstr "摘要"
-
-#: BankReconciliation.php:188 BankReconciliation.php:260
-msgid "Orig Amount"
-msgstr "憑證金額"
-
-#: BankReconciliation.php:231
-msgid "Total of all unpresented cheques"
-msgstr "企業已付銀行未付合計："
-
-#: BankReconciliation.php:249
-msgid "The uncleared deposits could not be retrieved by the SQL because"
-msgstr "未找到企業已收銀行未收記錄, 因為"
-
-#: BankReconciliation.php:253
-msgid "Less deposits not cleared"
-msgstr "減：企業已收銀行未收"
-
-#: BankReconciliation.php:303
-msgid "Total of all unc...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-29 09:10:27
|
Revision: 4522
http://web-erp.svn.sourceforge.net/web-erp/?rev=4522&view=rev
Author: daintree
Date: 2011-03-29 09:10:18 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
try to get zh_CN back!
Removed Paths:
-------------
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
Deleted: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Deleted: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:04:20 UTC (rev 4521)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2011-03-29 09:10:18 UTC (rev 4522)
@@ -1,37789 +0,0 @@
-# weberp 簡體中文介面檔
-# Copyright (C) 2007 Logic Works Ltd
-# This file is distributed under the same license as the webERP package.
-# FIRST AUTHOR <rom...@gm...>, 2006.
-# THIS VERSION FROM http://weberp-china.oicp.net
-msgid ""
-msgstr ""
-"Project-Id-Version: WEBERP3.05 VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-27 19:34+1200\n"
-"PO-Revision-Date: 2011-02-25 18:22+0800\n"
-"Last-Translator: Exson qu <hex...@ya...>\n"
-"Language-Team: WebERP Translation Team <web-erp-translation@lists."
-"sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-29 15:16+0000\n"
-"X-Generator: Launchpad (build 12274)\n"
-"X-Poedit-Country: CHINA\n"
-"X-Poedit-Basepath: C:\\改過自新\\\n"
-"X-Poedit-SearchPath-0: webERPRC4\n"
-
-#: AccountGroups.php:9 index.php:1272
-msgid "Account Groups"
-msgstr "科目組"
-
-#: AccountGroups.php:19
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr "在遞迴檢查中查詢父帳戶組中的科目組發生錯誤"
-
-#: AccountGroups.php:20
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
-msgstr "用於查詢父帳戶組的科目組失敗的SQL是"
-
-#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
-#: AccountGroups.php:187
-msgid "The SQL that was used to retrieve the information was"
-msgstr "用於查找交易資料的SQL是"
-
-#: AccountGroups.php:58
-msgid "Could not check whether the group exists because"
-msgstr "未能判定組別是否存在, 因為"
-
-#: AccountGroups.php:65
-msgid "The account group name already exists in the database"
-msgstr "科目組名稱已經存在在資料庫中。"
-
-#: AccountGroups.php:71
-msgid "The account group name cannot contain the character"
-msgstr "科目組名稱不能包含這個字元"
-
-#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
-#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:30
-msgid "or the character"
-msgstr "或這個字元"
-
-#: AccountGroups.php:77
-msgid "The account group name must be at least one character long"
-msgstr "科目組名稱必須不少於 1 個字"
-
-#: AccountGroups.php:84
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"所選的父帳戶組看來會導致一個遞迴的帳戶結構-選擇一個另外的父帳戶組或者將此帳戶"
-"組作為一個最頂層的帳戶組"
-
-#: AccountGroups.php:95
-msgid "Could not check whether the group is recursive because"
-msgstr "未能檢查此組是否遞迴, 因為"
-
-#: AccountGroups.php:107
-msgid "The section in accounts must be an integer"
-msgstr "會計科目類別必須是整數"
-
-#: AccountGroups.php:113
-msgid "The sequence in the trial balance must be an integer"
-msgstr "試算表內行號必須是整數"
-
-#: AccountGroups.php:119
-msgid "The sequence in the TB must be numeric and less than"
-msgstr "試算表內順序必須是數位且小於"
-
-#: AccountGroups.php:136
-msgid "An error occurred in updating the account group"
-msgstr "更新科目組是發生了錯誤"
-
-#: AccountGroups.php:137
-msgid "The SQL that was used to update the account group was"
-msgstr "用於更新科目組失敗的 SQL 是"
-
-#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
-msgid "Record Updated"
-msgstr "記錄已更新"
-
-#: AccountGroups.php:157
-msgid "An error occurred in inserting the account group"
-msgstr "插入科目組時發生錯誤, 因為"
-
-#: AccountGroups.php:158
-msgid "The SQL that was used to insert the account group was"
-msgstr "用作插入科目組失敗的 SQL 是"
-
-#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
-msgid "Record inserted"
-msgstr "記錄已新增"
-
-#: AccountGroups.php:176
-msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr "從主表中查找組資訊時發生錯誤"
-
-#: AccountGroups.php:181
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr "不能刪除，已創建了屬於這個科目組的會計科目"
-
-#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
-#: Currencies.php:144 Currencies.php:152 Currencies.php:159
-#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
-#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
-#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
-#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
-#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
-#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
-#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
-#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:129 SalesCategories.php:127 SalesCategories.php:135
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
-#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
-#: Stocks.php:469 Stocks.php:478 Stocks.php:486 Stocks.php:494 Stocks.php:502
-#: Stocks.php:510 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
-#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
-#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:140
-#: WorkCentres.php:90 WorkCentres.php:96 WWW_Access.php:87
-msgid "There are"
-msgstr "存在"
-
-#: AccountGroups.php:182
-msgid "general ledger accounts that refer to this account group"
-msgstr "屬於此科目組的會計科目"
-
-#: AccountGroups.php:186
-msgid "An error occurred in retrieving the parent group information"
-msgstr "查找父組資訊時發生錯誤"
-
-#: AccountGroups.php:191
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr "刪除會計科目組失敗, 由於它是其他帳戶組的父帳戶組。"
-
-#: AccountGroups.php:192
-msgid "account groups that have this group as its/there parent account group"
-msgstr "帳戶組將此帳戶作為他的/他們的父帳戶組"
-
-#: AccountGroups.php:195
-msgid "An error occurred in deleting the account group"
-msgstr "刪除帳戶組是發生錯誤"
-
-#: AccountGroups.php:196
-msgid "The SQL that was used to delete the account group was"
-msgstr "用於帳戶組的 SQL 是"
-
-#: AccountGroups.php:198
-msgid "group has been deleted"
-msgstr "科目組已刪除"
-
-#: AccountGroups.php:223
-msgid "The sql that was used to retrieve the account group information was "
-msgstr "用於查詢帳戶組資訊的SQL是 "
-
-#: AccountGroups.php:224
-msgid "Could not get account groups because"
-msgstr "不能取得科目組, 由於"
-
-#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
-#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
-#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
-#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
-#: CounterSales.php:1983 CounterSales.php:2107 Credit_Invoice.php:256
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
-#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
-#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
-#: EDIMessageFormat.php:106 FixedAssetLocations.php:9
-#: FixedAssetRegister.php:13 FixedAssetRegister.php:238
-#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
-#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:374
-#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
-#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
-#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
-#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
-#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
-#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
-#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
-#: PurchData.php:141 PurchData.php:256 PurchData.php:275
-#: RecurringSalesOrders.php:311 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
-#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
-#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
-#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:202
-#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
-#: SelectGLAccount.php:79 SelectOrderItems.php:607 SelectOrderItems.php:1431
-#: SelectOrderItems.php:1555 SelectProduct.php:473 SelectSalesOrder.php:457
-#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
-#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
-#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
-#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
-#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:62
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
-#: WorkOrderCosting.php:14 WorkOrderEntry.php:10 WorkOrderIssue.php:22
-#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
-#: WWW_Users.php:33 Z_BottomUpCosts.php:51
-msgid "Search"
-msgstr "查找"
-
-#: AccountGroups.php:230
-msgid "Group Name"
-msgstr "科目組名稱"
-
-#: AccountGroups.php:231 EDIMessageFormat.php:131
-msgid "Section"
-msgstr "會計要素"
-
-#: AccountGroups.php:232 AccountGroups.php:396
-msgid "Sequence In TB"
-msgstr "試算表行次"
-
-#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
-#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
-#: SelectGLAccount.php:45 SelectGLAccount.php:59
-msgid "Profit and Loss"
-msgstr "損益類"
-
-#: AccountGroups.php:234 AccountGroups.php:341
-msgid "Parent Group"
-msgstr "父組"
-
-#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
-#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
-#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
-#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
-#: CompanyPreferences.php:451 CompanyPreferences.php:453
-#: CompanyPreferences.php:463 CompanyPreferences.php:465
-#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
-#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
-#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
-#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: MRPCalendar.php:222 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
-#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:264
-#: PaymentMethods.php:270 PDFChequeListing.php:63
-#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
-#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:754 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
-#: PurchData.php:192 PurchData.php:494 PurchData.php:497
-#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
-#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
-#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
-#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
-#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
-#: Stocks.php:869 Stocks.php:871 Stocks.php:889 Stocks.php:891
-#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
-#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
-#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
-#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
-#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:756
-#: SystemParameters.php:887 SystemParameters.php:889 SystemParameters.php:899
-#: SystemParameters.php:901 SystemParameters.php:955 SystemParameters.php:967
-#: SystemParameters.php:969 TaxGroups.php:292 TaxGroups.php:295
-#: TaxGroups.php:344 WWW_Users.php:605 WWW_Users.php:607
-msgid "Yes"
-msgstr "是"
-
-#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
-#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
-#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
-#: CompanyPreferences.php:438 CompanyPreferences.php:442
-#: CompanyPreferences.php:450 CompanyPreferences.php:454
-#: CompanyPreferences.php:462 CompanyPreferences.php:466
-#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
-#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
-#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
-#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
-#: MRPCalendar.php:224 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:265
-#: PaymentMethods.php:271 PDFChequeListing.php:62
-#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:753 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
-#: PurchData.php:195 PurchData.php:495 PurchData.php:498
-#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
-#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
-#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
-#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
-#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
-#: Stocks.php:864 Stocks.php:866 Stocks.php:884 Stocks.php:886
-#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
-#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
-#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
-#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
-#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:757
-#: SystemParameters.php:886 SystemParameters.php:890 SystemParameters.php:898
-#: SystemParameters.php:902 SystemParameters.php:956 SystemParameters.php:966
-#: SystemParameters.php:970 TaxGroups.php:293 TaxGroups.php:296
-#: TaxGroups.php:346 WWW_Users.php:604 WWW_Users.php:608
-#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
-msgid "No"
-msgstr "否"
-
-#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:131
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
-#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
-#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
-#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
-#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
-#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
-#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
-#: Labels.php:414 Locations.php:380 MRPDemands.php:304 MRPDemandTypes.php:122
-#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
-#: PcClaimExpensesFromTab.php:229 PcExpenses.php:186 PcTabs.php:188
-#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
-#: Prices.php:227 PurchData.php:207 SalesCategories.php:263
-#: SalesGLPostings.php:135 SalesGLPostings.php:247 SalesPeople.php:210
-#: SalesTypes.php:206 SelectCustomer.php:610 SelectCustomer.php:626
-#: SelectCustomer.php:648 SelectCustomer.php:664 SelectCustomer.php:686
-#: SelectCustomer.php:702 Shippers.php:144 StockCategories.php:244
-#: SupplierContacts.php:153 SupplierTypes.php:192 SuppLoginSetup.php:274
-#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
-#: TaxProvinces.php:178 UnitsOfMeasure.php:190 WorkCentres.php:138
-#: WWW_Access.php:127 WWW_Users.php:307 includes/InputSerialItems.php:88
-#: includes/OutputSerialItems.php:21
-#, php-format
-msgid "Edit"
-msgstr "編輯"
-
-#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:132
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
-#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
-#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:385 CreditStatus.php:176
-#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
-#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
-#: DiscountMatrix.php:178 EDIMessageFormat.php:153
-#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
-#: GLAccounts.php:320 GLJournal.php:401 Labels.php:414 Locations.php:381
-#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
-#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
-#: PcClaimExpensesFromTab.php:230 PcExpenses.php:187 PcExpensesTypeTab.php:164
-#: PcTabs.php:189 PcTypeTabs.php:175 PO_AuthorisationLevels.php:150
-#: PO_Items.php:762 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
-#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
-#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
-#: SalesTypes.php:207 SelectCreditItems.php:745 SelectCustomer.php:611
-#: SelectCustomer.php:627 SelectCustomer.php:649 SelectCustomer.php:665
-#: SelectCustomer.php:687 SelectCustomer.php:703 SelectOrderItems.php:1358
-#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
-#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
-#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:81 SuppInvGRNs.php:135
-#: SupplierContacts.php:154 SupplierTypes.php:194 SuppLoginSetup.php:275
-#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
-#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
-#: UnitsOfMeasure.php:191 WorkCentres.php:139 WOSerialNos.php:300
-#: WWW_Access.php:128 WWW_Users.php:308 includes/InputSerialItemsKeyed.php:57
-#: includes/OutputSerialItems.php:98
-#, php-format
-msgid "Delete"
-msgstr "刪除"
-
-#: AccountGroups.php:274
-msgid "Review Account Groups"
-msgstr "查看科目組"
-
-#: AccountGroups.php:294
-msgid "An error occurred in retrieving the account group information"
-msgstr "查找帳戶組資訊時發生錯誤"
-
-#: AccountGroups.php:295
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
-msgstr "用於查詢科目組失敗的SQL是"
-
-#: AccountGroups.php:298
-msgid "The account group name does not exist in the database"
-msgstr "科目組名稱在資料庫中不存在。"
-
-#: AccountGroups.php:314 GLAccounts.php:250 GLAccounts.php:299
-#: Z_ImportGLAccountGroups.php:28
-msgid "Account Group"
-msgstr "科目組"
-
-#: AccountGroups.php:338
-msgid "Account Group Name"
-msgstr "科目組名稱"
-
-#: AccountGroups.php:348 AccountGroups.php:350
-msgid "Top Level Group"
-msgstr "頂層組"
-
-#: AccountGroups.php:364
-msgid "Section In Accounts"
-msgstr "會計要素"
-
-#: AccountGroups.php:401 AccountSections.php:262 AddCustomerContacts.php:208
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:222
-#: BankAccounts.php:373 BOMs.php:725 COGSGLPostings.php:347
-#: CreditStatus.php:247 Currencies.php:339 CustLoginSetup.php:611
-#: DiscountMatrix.php:141 EDIMessageFormat.php:249
-#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
-#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
-#: Locations.php:558 MRPDemands.php:402 MRPDemandTypes.php:182
-#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
-#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
-#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
-#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
-#: SupplierContacts.php:250 SuppLoginSetup.php:532 TaxAuthorities.php:313
-#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:242
-#: WorkCentres.php:261 WWW_Users.php:638
-msgid "Enter Information"
-msgstr "保存"
-
-#: AccountSections.php:9 index.php:1277
-msgid "Account Sections"
-msgstr "會計要素"
-
-#: AccountSections.php:68
-msgid "The account section already exists in the database"
-msgstr "會計要素已經存在於資料庫"
-
-#: AccountSections.php:75
-msgid "The account section name cannot contain the character"
-msgstr "會計要素不能包含這個字元"
-
-#: AccountSections.php:81
-msgid "The account section name must contain at least one character"
-msgstr "會計要素名稱必須包含至少一個字元"
-
-#: AccountSections.php:87 AccountSections.php:93
-msgid "The section number must be an integer"
-msgstr "會計要素編號必須是整數"
-
-#: AccountSections.php:138
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
-msgstr "此會計要素已被科目組使用，不能刪除"
-
-#: AccountSections.php:139
-msgid "general ledger accounts groups that refer to this account section"
-msgstr "個科目組需要此會計要素"
-
-#: AccountSections.php:150
-msgid "section has been deleted"
-msgstr "刪除會計要素成功"
-
-#: AccountSections.php:175
-msgid "Could not get account group sections because"
-msgstr "找不到會計要素，原因是："
-
-#: AccountSections.php:181 AccountSections.php:238 AccountSections.php:255
-msgid "Section Number"
-msgstr "會計要素編號"
-
-#: AccountSections.php:182 AccountSections.php:258
-msgid "Section Description"
-msgstr "會計要素名稱"
-
-#: AccountSections.php:199
-msgid "Restricted"
-msgstr "不可修改"
-
-#: AccountSections.php:210
-msgid "Review Account Sections"
-msgstr "查看會計要素"
-
-#: AccountSections.php:228
-msgid "Could not retrieve the requested section please try again."
-msgstr "找不到會計要素, 請重試"
-
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:604
-#: SelectCustomer.php:633
-msgid "Customer Contacts"
-msgstr "顧客聯繫人"
-
-#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:24
-#: Z_CheckDebtorsControl.php:21
-msgid "Back to Customers"
-msgstr "返回客戶"
-
-#: AddCustomerContacts.php:26
-msgid "Contacts for Customer: <b>"
-msgstr "客戶的聯繫人"
-
-#: AddCustomerContacts.php:29
-msgid "Edit contact for <b>"
-msgstr "編輯聯繫人"
-
-#: AddCustomerContacts.php:41
-msgid "The Contact must be an integer."
-msgstr "聯繫人必須是整數"
-
-#: AddCustomerContacts.php:44
-msgid "The contact's name must be forty characters or less long"
-msgstr "聯繫人名稱必須不多於50個字元"
-
-#: AddCustomerContacts.php:47
-msgid "The contact's name may not be empty"
-msgstr "聯繫人名稱不能留空"
-
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
-#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:236
-#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:70
-#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:411 SalesAnalReptCols.php:129
-#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:353 Suppliers.php:514
-#: SupplierTypes.php:69
-msgid "has been updated"
-msgstr "已更新"
-
-#: AddCustomerContacts.php:70
-msgid "The contact record has been added"
-msgstr "聯繫人已新增"
-
-#: AddCustomerContacts.php:98
-msgid "The contact record has been deleted"
-msgstr "聯繫人記錄已刪除"
-
-#: AddCustomerContacts.php:112 CompanyPreferences.php:229
-#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
-#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:606
-#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:141
-#: SupplierCredit.php:437 SupplierInvoice.php:408 SuppTransGLAnalysis.php:96
-#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
-#: includes/PDFTaxPageHeader.inc:37
-msgid "Name"
-msgstr "名稱"
-
-#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:900
-#: Customers.php:906 Customers.php:972 SelectCustomer.php:607
-#: WWW_Access.php:111 WWW_Access.php:172
-msgid "Role"
-msgstr "職位"
-
-#: AddCustomerContacts.php:114 Customers.php:973
-msgid "Phone no"
-msgstr "電話"
-
-#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:902
-#: Customers.php:908 Customers.php:974 PcAssignCashToTab.php:216
-#: PcAssignCashToTab.php:341 PcAuthorizeExpenses.php:85
-#: PcClaimExpensesFromTab.php:195 PcClaimExpensesFromTab.php:348
-#: PcReportTab.php:348 SelectCustomer.php:609 SystemParameters.php:316
-#: WOSerialNos.php:277 WOSerialNos.php:279
-msgid "Notes"
-msgstr "備註"
-
-#: AddCustomerContacts.php:149
-msgid "Review all contacts for this Customer"
-msgstr "查看此顧客的所有聯絡人"
-
-#: AddCustomerContacts.php:179
-msgid "Contact Code"
-msgstr "聯繫人代碼"
-
-#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:218
-msgid "Contact Name"
-msgstr "聯繫人名稱"
-
-#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
-#: PO_Header.php:956 PO_Header.php:1026 SelectCreditItems.php:223
-#: SelectCustomer.php:464 SelectOrderItems.php:639
-#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
-#: includes/PDFTransPageHeaderPortrait.inc:105
-msgid "Phone"
-msgstr "電話"
-
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:641
-#: SelectCustomer.php:671
-msgid "Customer Notes"
-msgstr "客戶通知"
-
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
-msgid "Back to Select Customer"
-msgstr "返回選擇客戶"
-
-#: AddCustomerNotes.php:31
-msgid "The contact priority must be an integer."
-msgstr "聯繫優先順序必須是整數"
-
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
-msgid "The contact's notes must be two hundred characters or less long"
-msgstr "聯繫人備註必須不多於200個字元"
-
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
-msgid "The contact's notes may not be empty"
-msgstr "聯繫人備註不能留空"
-
-#: AddCustomerNotes.php:60
-msgid "The contact notes record has been added"
-msgstr "聯繫人備註記錄已新增"
-
-#: AddCustomerNotes.php:87
-msgid "The contact note record has been deleted"
-msgstr "聯繫人備註記錄已刪除"
-
-#: AddCustomerNotes.php:98
-msgid "Notes for Customer"
-msgstr "客戶通知："
-
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
-#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
-#: BankMatching.php:223 BankReconciliation.php:184 BankReconciliation.php:256
-#: ContractCosting.php:149 CustomerAllocations.php:332
-#: CustomerAllocations.php:358 CustomerInquiry.php:191
-#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154
-#: GLAccountReport.php:369 GLTransInquiry.php:45 MRPCalendar.php:217
-#: PaymentAllocations.php:77 PcAssignCashToTab.php:212
-#: PcAuthorizeExpenses.php:81 PDFRemittanceAdvice.php:308
-#: PrintCustTrans.php:616 PrintCustTransPortrait.php:790 ReverseGRN.php:378
-#: ShipmentCosting.php:503 ShipmentCosting.php:574 Shipments.php:467
-#: StockDispatch.php:188 StockDispatch.php:200 StockLocMovements.php:85
-#: StockMovements.php:98 StockSerialItemResearch.php:79
-#: SupplierAllocations.php:464 SupplierAllocations.php:576
-#: SupplierAllocations.php:646 SupplierInquiry.php:195
-#: SupplierTransInquiry.php:89 includes/PDFQuotationPageHeader.inc:91
-#: includes/PDFQuotationPortraitPageHeader.inc:90
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
-#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:58
-msgid "Date"
-msgstr "日期"
-
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:176
-#: Stocks.php:873 UpgradeDatabase.php:147 UpgradeDatabase.php:150
-#: UpgradeDatabase.php:153 UpgradeDatabase.php:156 UpgradeDatabase.php:159
-#: UpgradeDatabase.php:162 UpgradeDatabase.php:165 UpgradeDatabase.php:168
-#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
-#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
-#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
-#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
-#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
-msgid "Note"
-msgstr "備註"
-
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
-msgid "WWW"
-msgstr "WWW萬維網"
-
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
-#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
-msgid "Priority"
-msgstr "優先順序"
-
-#: AddCustomerNotes.php:143
-msgid "Review all notes for this Customer"
-msgstr "查看此顧客的所有通知"
-
-#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
-msgid "Note ID"
-msgstr "Note ID"
-
-#: AddCustomerNotes.php:177
-msgid "Contact Note"
-msgstr "聯絡人備註"
-
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:679
-msgid "Customer Type (Group) Notes"
-msgstr "顧客種類(組）備註"
-
-#: AddCustomerTypeNotes.php:31
-msgid "The Contact priority must be an integer."
-msgstr "聯絡人優先順序必須是整數"
-
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:709
-msgid "Customer Group Notes"
-msgstr "顧客組通知"
-
-#: AddCustomerTypeNotes.php:60
-msgid "The contact group notes record has been added"
-msgstr "聯繫人組通知記錄已增加"
-
-#: AddCustomerTypeNotes.php:84
-msgid "The contact group note record has been deleted"
-msgstr "聯繫人組通知記錄已經刪除"
-
-#: AddCustomerTypeNotes.php:95
-msgid "Notes for Customer Type"
-msgstr "顧客類型的通知："
-
-#: AddCustomerTypeNotes.php:106
-msgid "href"
-msgstr "href"
-
-#: AddCustomerTypeNotes.php:141
-msgid "Review all notes for this Customer Type"
-msgstr "查看此顧客類型的所有通知。"
-
-#: AddCustomerTypeNotes.php:182
-msgid "Contact Group Note"
-msgstr "聯繫人組通知"
-
-#: AddCustomerTypeNotes.php:184
-msgid "Web site"
-msgstr "網站"
-
-#: AgedDebtors.php:17
-msgid "Aged Customer Balance Listing"
-msgstr "應收賬款帳齡分析表"
-
-#: AgedDebtors.php:18
-msgid "Aged Customer Balances"
-msgstr "欠款餘額"
-
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-msgid "Aged Customer Account Analysis"
-msgstr "客戶欠款分析"
-
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
-#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
-#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:90
-#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:174
-#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
-#: InventoryPlanning.php:209 InventoryPlanning.php:257
-#: InventoryPlanning.php:295 InventoryPlanningPrefSupplier.php:208
-#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
-#: InventoryPlanningPrefSupplier.php:355 InventoryPlanningPrefSupplier.php:401
-#: InventoryQuantities.php:83 InventoryValuation.php:76
-#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:114
-#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:529
-#: MRPReschedules.php:46 MRPReschedules.php:58 MRPShortages.php:145
-#: MRPShortages.php:157 OutstandingGRNs.php:51 OutstandingGRNs.php:63
-#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
-#: PDFLowGP.php:23 PDFStockCheckComparison.php:35
-#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
-#: ReorderLevel.php:59 SelectAsset.php:36 SelectProduct.php:37
-#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:325
-#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
-msgid "Problem Report"
-msgstr "問題報告"
-
-#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
-#: DebtorsAtPeriodEnd.php:60
-msgid "The customer details could not be retrieved by the SQL because"
-msgstr "客戶明細資料無法從SQL取得, 因為"
-
-#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
-#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
-#: Credit_Invoice.php:185 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
-#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:93
-#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
-#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:177 GLTagProfit_Loss.php:189
-#: GLTrialBalance.php:154 GLTrialBalance.php:166 InventoryPlanning.php:102
-#: InventoryPlanning.php:177 InventoryPlanning.php:212
-#: InventoryPlanning.php:260 InventoryPlanning.php:298
-#: InventoryPlanning.php:361 InventoryPlanningPrefSupplier.php:211
-#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
-#: InventoryPlanningPrefSupplier.php:358 InventoryPlanningPrefSupplier.php:404
-#: InventoryPlanningPrefSupplier.php:460 InventoryQuantities.php:86
-#: InventoryQuantities.php:97 InventoryValuation.php:79
-#: InventoryValuation.php:90 MailInventoryValuation.php:118
-#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:117
-#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
-#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:318 MRPReport.php:41
-#: MRPReport.php:52 MRPReport.php:150 MRPReschedules.php:49
-#: MRPReschedules.php:61 MRPShortages.php:148 MRPShortages.php:160
-#: OutstandingGRNs.php:54 OutstandingGRNs.php:66 PcReportTab.php:236
-#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFGrn.php:124
-#: PDFLowGP.php:63 PDFLowGP.php:75 PDFPriceList.php:124 PDFQuotation.php:234
-#: PDFQuotationPortrait.php:235 PDFRemittanceAdvice.php:84
-#: PDFStockCheckComparison.php:39 PDFStockCheckComparison.php:65
-#: PDFStockCheckComparison.php:266 PDFTopItems.php:118 PO_PDFPurchOrder.php:30
-#: PO_PDFPurchOrder.php:144 PrintCustOrder_generic.php:180
-#: PrintCustOrder.php:198 ReorderLevel.php:62 ReorderLevel.php:151
-#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:23 StockCheck.php:47
-#: StockCheck.php:68 StockCheck.php:98 StockCheck.php:142 StockCheck.php:153
-#: StockCheck.php:195 StockDispatch.php:93 StockDispatch.php:105
-#: SupplierBalsAtPeriodEnd.php:57 SupplierBalsAtPeriodEnd.php:68
-#: SuppPaymentRun.php:109 SuppPaymentRun.php:120 SuppPaymentRun.php:184
-#: SuppPaymentRun.php:214 SuppPriceList.php:121 Tax.php:64 Tax.php:177
-#: Tax.php:286 Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
-#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
-#: Z_DataExport.php:420 Z_DataExport.php:472 Z_poRebuildDefault.php:38
-#: includes/PDFPaymentRun_PymtFooter.php:57
-#: includes/PDFPaymentRun_PymtFooter.php:87
-#: includes/PDFPaymentRun_PymtFooter.php:116
-#: includes/PDFPaymentRun_PymtFooter.php:152
-#: includes/PDFPaymentRun_PymtFooter.php:183
-#: includes/PDFPaymentRun_PymtFooter.php:215
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:340
-msgid "Back to the menu"
-msgstr "返回主菜單"
-
-#: AgedDebtors.php:367
-msgid "The details of outstanding transactions for customer"
-msgstr "該用戶未清算的交易明細"
-
-#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
-#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:471
-#: PO_Items.php:605 PO_Items.php:632 SalesAnalReptCols.php:356
-#: SpecialOrder.php:369 StockLocTransferReceive.php:373
-#: StockQuantityByDate.php:114 includes/SelectOrderItems_IntoCart.inc:53
-msgid "could not be retrieved because"
-msgstr "不能取得, 因為"
-
-#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
-#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:969
-#: ConfirmDispatch_Invoice.php:983 Contracts.php:581 CounterSales.php:1323
-#: CounterSales.php:1337 Credit_Invoice.php:706 Credit_Invoice.php:728
-#: CustomerReceipt.php:526 CustomerReceipt.php:658 CustomerReceipt.php:686
-#: CustomerTransInquiry.php:79 DeliveryDetails.php:395 GLProfit_Loss.php:578
-#: GLTagProfit_Loss.php:490 Payments.php:307 PDFRemittanceAdvice.php:86
-#: PurchData.php:89 PurchData.php:108 PurchData.php:244 ReverseGRN.php:191
-#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1381
-#: SelectSalesOrder.php:113 SelectSalesOrder.php:281 StockCheck.php:225
-#: StockCostUpdate.php:79 StockCostUpdate.php:89 StockLocStatus.php:142
-#: StockMovements.php:92 StockQuantityByDate.php:90 StockReorderLevel.php:39
-#: StockStatus.php:271 StockTransfers.php:159 StockUsageGraph.php:53
-#: StockUsage.php:132 SupplierInquiry.php:79 SupplierInquiry.php:101
-#: SupplierInquiry.php:131 SupplierInquiry.php:177 SupplierTransInquiry.php:81
-#: SuppPaymentRun.php:111 SuppPaymentRun.php:186 SuppPaymentRun.php:216
-#: WorkOrderCosting.php:393 WorkOrderReceive.php:272 WOSerialNos.php:44
-#: Z_ChangeBranchCode.php:108 Z_ChangeCustomerCode.php:92
-#: Z_DeleteCreditNote.php:57 Z_DeleteInvoice.php:83
-#: includes/PDFPaymentRun_PymtFooter.php:59
-#: includes/PDFPaymentRun_PymtFooter.php:89
-#: includes/PDFPaymentRun_PymtFooter.php:118
-#: includes/PDFPaymentRun_PymtFooter.php:154
-#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:79
-#: includes/ConnectDB_mysql.inc:68
-msgid "The SQL that failed was"
-msgstr "運行失敗的 SQL 是"
-
-#: AgedDebtors.php:438
-msgid "There are no customers meeting the criteria specified to list"
-msgstr "沒有符合條件的客戶"
-
-#: AgedDebtors.php:464
-msgid "Aged Debtor Analysis"
-msgstr "應收賬款賬齡分析表"
-
-#: AgedDebtors.php:477 DebtorsAtPeriodEnd.php:148
-msgid "From Customer Code"
-msgstr "由客戶編號"
-
-#: AgedDebtors.php:478 DebtorsAtPeriodEnd.php:149
-msgid "To Customer Code"
-msgstr "到客戶編號"
-
-#: AgedDebtors.php:480 AgedSuppliers.php:293
-msgid "All balances or overdues only"
-msgstr "全部餘額或只包含過期未付的"
-
-#: AgedDebtors.php:481
-msgid "All customers with balances"
-msgstr "所有有餘額的客戶"
-
-#: AgedDebtors.php:482 AgedSuppliers.php:296
-msgid "Overdue accounts only"
-msgstr "只顯示過期未付的"
-
-#: AgedDebtors.php:483
-msgid "Held accounts only"
-msgstr "只顯示被凍結的客戶"
-
-#: AgedDebtors.php:486
-msgid "Only Show Customers Of"
-msgstr "負責客戶的銷售員："
-
-#: AgedDebtors.php:498
-msgid "Only show customers trading in"
-msgstr "客戶的貨幣"
-
-#: AgedDebtors.php:514
-msgid "Summary or detailed report"
-msgstr "匯總或明細"
-
-#: AgedDebtors.php:516 AgedSuppliers.php:316 InventoryValuation.php:238
-msgid "Summary Report"
-msgstr "匯總報表"
-
-#: AgedDebtors.php:517 AgedSuppliers.php:317 InventoryValuation.php:239
-msgid "Detailed Report"
-msgstr "明細報表"
-
-#: AgedDebtors.php:520 AgedSuppliers.php:320 BOMExtendedQty.php:300
-#: BOMIndented.php:278 BOMIndentedReverse.php:266 BOMListing.php:142
-#: DebtorsAtPeriodEnd.php:166 InventoryPlanning.php:442
-#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:188
-#: InventoryValuation.php:242 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:344 MRPReschedules.php:166 MRPShortages.php:259
-#: OutstandingGRNs.php:185 PDFCustomerList.php:412 PDFLowGP.php:168
-#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
-#: PDFStockCheckComparison.php:379 PrintCustTrans.php:416
-#: PrintCustTransPortrait.php:560 ReorderLevel.php:229 StockDispatch.php:309
-#: SupplierBalsAtPeriodEnd.php:155 SuppPriceList.php:228 Tax.php:352
-msgid "Print PDF"
-msgstr "列印到PDF"
-
-#: AgedSuppliers.php:18
-msgid "Aged Supplier Listing"
-msgstr "應付賬款賬齡分析表"
-
-#: AgedSuppliers.php:19
-msgid "Aged Suppliers"
-msgstr "供應商"
-
-#: AgedSuppliers.php:105
-msgid "Aged Supplier Account Analysis"
-msgstr "應付賬款賬齡分析"
-
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
-msgid "The Supplier details could not be retrieved by the SQL because"
-msgstr "供應商明細資料未能由SQL取得, 因為"
-
-#: AgedSuppliers.php:187
-msgid "Aged Supplier Account Analysis - Problem Report"
-msgstr "應付賬款帳齡分析-問題報告"
-
-#: AgedSuppliers.php:189
-msgid "The details of outstanding transactions for Supplier"
-msgstr "該供應商未清算的交易明細"
-
-#: AgedSuppliers.php:273
-msgid "Aged Supplier Analysis"
-msgstr "應付賬款帳齡分析"
-
-#: AgedSuppliers.php:286 OutstandingGRNs.php:180 PDFRemittanceAdvice.php:138
-#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:259
-msgid "From Supplier Code"
-msgstr "從供應商編號"
-
-#: AgedSuppliers.php:289 OutstandingGRNs.php:182 PDFRemittanceAdvice.php:140
-#: SupplierBalsAtPeriodEnd.php:134 SuppPaymentRun.php:261
-msgid "To Supplier Code"
-msgstr "到供應商編號"
-
-#: AgedSuppliers.php:295
-msgid "All suppliers with balances"
-msgstr "全部有餘額的供應商"
-
-#: AgedSuppliers.php:299
-msgid "For suppliers trading in"
-msgstr "供應商貨幣"
-
-#: AgedSuppliers.php:314 InventoryValuation.php:237
-msgid "Summary or Detailed Report"
-msgstr "匯總或明細表"
-
-#: Areas.php:8
-msgid "Sales Area Maintenance"
-msgstr "銷售區域"
-
-#: Areas.php:41
-msgid "The area code must be three characters or less long"
-msgstr "區域編號長度必須是或少於3個字元"
-
-#: Areas.php:46
-msgid "The area code entered already exists"
-msgstr "輸入的區功能變數代碼已經存在"
-
-#: Areas.php:51
-msgid "The area description must be twenty five characters or less long"
-msgstr "區域說明長度必須是或少於25個字元"
-
-#: Areas.php:56
-msgid "The area code may not be empty"
-msgstr "區域編號不能為空"
-
-#: Areas.php:61
-msgid "The area description may not be empty"
-msgstr "區域說明不能為空"
-
-#: Areas.php:74
-msgid "Area code"
-msgstr "區域編號"
-
-#: Areas.php:88
-msgid "New area code"
-msgstr "新區域編號"
-
-#: Areas.php:88
-msgid "has been inserted"
-msgstr "已插入"
-
-#: Areas.php:95
-msgid "The area could not be added or updated because"
-msgstr "區域編號不能新增或更新, 因為"
-
-#: Areas.php:116
-msgid ""
-"Cannot delete this area because customer branches have been created using "
-"this area"
-msgstr "不能刪除此銷售區域因為已有客戶分公司在這區域"
-
-#: Areas.php:117
-msgid "branches using this area code"
-msgstr "家此區域編號的分公司"
-
-#: Areas.php:125
-msgid ""
-"Cannot delete this area because sales analysis records exist that use this "
-"area"
-msgstr "不能刪除這個區域因為此區域已用於現有的銷售分析記錄"
-
-#: Areas.php:126
-msgid "sales analysis records referring this area code"
-msgstr "條此區域的銷售分析記錄"
-
-#: Areas.php:133 Areas.php:149 Areas.php:202 Areas.php:213
-msgid "Area Code"
-msgstr "區域編號"
-
-#: Areas.php:133 CustomerTypes.php:166 Factors.php:142
-#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:328
-#: MRPDemands.php:248 PcAssignCashToTab.php:118 PcClaimExpensesFromTab.php:109
-#: PcExpenses.php:137 PcExpensesTypeTab.php:86 PcTabs.php:124
-#: PcTypeTabs.php:137 SalesAnalReptCols.php:215 SalesCategories.php:139
-#: SalesTypes.php:163 StockCategories.php:199 Suppliers.php:639
-#: SupplierTypes.php:153 Z_DeleteInvoice.php:142
-msgid "has been deleted"
-msgstr "已刪除"
-
-#: Areas.php:150 Areas.php:218
-msgid "Area Name"
-msgstr "區域名稱"
-
-#: Areas.php:167
-msgid "View Customers from this Area"
-msgstr "查看此區域的顧客"
-
-#: Areas.php:177
-msgid "Review Areas Defined"
-msgstr "查看銷售區域"
-
-#: AuditTrail.php:9
-msgid "Audit Trail"
-msgstr "審核追蹤"
-
-#: AuditTrail.php:23
-msgid "Incorrect date format used, please re-enter"
-msgstr "輸入的日期無效, 請輸入有效日期格式"
-
-#: AuditTrail.php:37 BOMIndented.php:317 BOMIndentedReverse.php:305
-#: MRPCalendar.php:260
-msgid "From Date"
-msgstr "從 日期"
-
-#: AuditTrail.php:39 BOMIndented.php:318 BOMIndentedReverse.php:306
-#: MRPCalendar.php:262
-msgid "To Date"
-msgstr "到 日期"
-
-#: AuditTrail.php:43 PO_AuthorisationLevels.php:123
-#: PO_AuthorisationLevels.php:160 PO_AuthorisationLevels.php:163
-#: UserSettings.php:109
-msgid "User ID"
-msgstr "用戶 ID"
-
-#: AuditTrail.php:56
-msgid "Table "
-msgstr "表 "
-
-#: AuditTrail.php:68 MRPReport.php:789 PO_SelectPurchOrder.php:363
-#: SelectContract.php:196 SelectProduct.php:727
-msgid "View"
-msgstr "查看"
-
-#: AuditTrail.php:144
-msgid "Date/Time"
-msgstr "日期/時間"
-
-#: AuditTrail.php:145 PcReportTab.php:283 includes/header.inc:52
-msgid "User"
-msgstr "用戶"
-
-#: AuditTrail.php:146 BankReconciliation.php:185 BankReconciliation.php:257
-#: CustomerAllocations.php:356 CustomerInquiry.php:189
-#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
-#: CustWhereAlloc.php:18 CustWhereAlloc.php:87 DailyBankTransactions.php:99
-#: GLAccountInquiry.php:152 GLAccountReport.php:367 GLJournal.php:256
-#: MRPReschedules.php:204 SelectCustomer.php:463 ShipmentCosting.php:501
-#: ShipmentCosting.php:572 StockCategories.php:219 StockLocMovements.php:83
-#: StockMovements.php:97 SupplierAllocations.php:462 SupplierInquiry.php:193
-#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
-#: Z_CheckAllocationsFrom.php:27 Z_CheckAllocationsFrom.php:50
-#: Z_CheckAllocs.php:59 Z_CheckGLTransBalance.php:12
-#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
-#: includes/PDFTaxPageHeader.inc:34
-msgid "Type"
-msgstr "憑證類型"
-
-#: AuditTrail.php:147
-msgid "Table"
-msgstr "表"
-
-#: AuditTrail.php:148 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1892
-msgid "Field Name"
-msgstr "欄位名"
-
-#: AuditTrail.php:149 SystemParameters.php:315
-#: includes/PDFInventoryValnPageHeader.inc:38
-#: includes/PDFOstdgGRNsPageHeader.inc:43
-msgid "Value"
-msgstr "價值"
-
-#: BankAccounts.php:9
-msgid "Bank Accounts Maintenance"
-msgstr "銀行帳戶維護"
-
-#: BankAccounts.php:13 TaxAuthorities.php:149
-msgid "Bank"
-msgstr "納稅專戶銀行"
-
-#: BankAccounts.php:14
-msgid ""
-"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
-"Codes. Set Default for Invoices to \"yes\" to print Account details on "
-"Invoices (only one account can be set to \"yes\")."
-msgstr ""
-"更新銀行帳戶細節。帳戶代碼是SWIFT或者BSB類型的銀行代碼。將發票默認項設置為"
-"\"是\"來在發票上列印帳戶的細節 （僅一個帳戶可以被設置為\"是\")"
-
-#: BankAccounts.php:46
-msgid "The bank account code already exists in the database"
-msgstr "輸入的銀行帳戶代碼已經存在於資料庫"
-
-#: BankAccounts.php:52
-msgid "The bank account name must be fifty characters or less long"
-msgstr "銀行帳戶名稱長度必須是或少於50個字"
-
-#: BankAccounts.php:58
-msgid "The bank account name may not be empty."
-msgstr "銀行帳戶名稱不能留空"
-
-#: BankAccounts.php:64
-msgid "The bank account number may not be empty."
-msgstr "銀行帳戶號碼不能留空"
-
-#: BankAccounts.php:70
-msgid "The bank account number must be fifty characters or less long"
-msgstr "銀行帳號長度必須是或少於50個字"
-
-#: BankAccounts.php:76
-msgid "The bank address must be fifty characters or less long"
-msgstr "銀行地址必須是或少於50個字"
-
-#: BankAccounts.php:95
-msgid ""
-"Note that it is not possible to change the currency of the account once "
-"there are transactions against it"
-msgstr "注意：一旦已經記錄了交易，就不能再改變帳戶的幣種。"
-
-#: BankAccounts.php:108
-msgid "The bank account details have been updated"
-msgstr "銀行帳號已更新"
-
-#: BankAccounts.php:129
-msgid "The new bank account has been entered"
-msgstr "新建銀行帳戶成功"
-
-#: BankAccounts.php:134
-msgid "The bank account could not be inserted or modified because"
-msgstr "新建或更新銀行帳戶失敗，原因是"
-
-#: BankAccounts.php:135
-msgid "The SQL used to insert/modify the bank account details was"
-msgstr "用於新建或更新銀行帳戶的SQL是"
-
-#: BankAccounts.php:162
-msgid ""
-"Cannot delete this bank account because transactions have been created using "
-"this account"
-msgstr "不能刪除此銀行帳戶，因為此帳戶已有交易"
-
-#: BankAccounts.php:163
-msgid "transactions with this bank account code"
-msgstr "筆此銀行帳戶的交易"
-
-#: BankAccounts.php:169
-msgid "Bank account deleted"
-msgstr "銀行帳戶已刪除"
-
-#: BankAccounts.php:190
-msgid "The bank accounts set up could not be retrieved because"
-msgstr "設置的銀行帳戶沒找到，原因是"
-
-#: BankAccounts.php:191
-msgid "The SQL used to retrieve the bank account details was"
-msgstr "用於查找銀行帳戶的SQL是"
-
-#: BankAccounts.php:196 GLJournal.php:280
-msgid "GL Account Code"
-msgstr "總帳帳戶代碼"
-
-#: BankAccounts.php:197 BankAccounts.php:326
-msgid "Bank Account Name"
-msgstr "銀行帳戶名稱"
-
-#: BankAccounts.php:198 BankAccounts.php:328
-msgid "Bank Account Code"
-msgstr "銀行帳戶代碼"
-
-#: BankAccounts.php:199 BankAccounts.php:330
-msgid "Bank Account Number"
-msgstr "銀行帳號"
-
-#: BankAccounts.php:200 BankAccounts.php:332
-msgid "Bank Address"
-msgstr "銀行地址"
-
-#: BankAccounts.php:201 CustomerReceipt.php:756 CustomerTransInquiry.php:95
-#: OffersReceived.php:98 PcReportTab.php:291 PcTabs.php:147 PcTabs.php:295
-#: PDFPrintLabel.php:94 PO_AuthorisationLevels.php:125
-#: PO_AuthorisationLevels.php:180 PO_AuthorisationLevels.php:183
-#: PO_AuthoriseMyOrders.php:107 PO_Header.php:534
-#: PO_SelectOSPurchOrder.php:444 PO_SelectPurchOrder.php:365
-#: PricesByCost.php:239 Prices.php:198 Prices.php:293 PurchData.php:172
-#: PurchData.php:340 PurchData.php:453 SelectSupplier.php:251
-#: SupplierCredit.php:268 SupplierInvoice.php:232 SupplierTransInquiry.php:95
-#: SuppPriceList.php:265 includes/PDFBankingSummaryPageHeader.inc:42
-#: includes/PDFDebtorBalsPageHeader.inc:33
-#: includes/PDFSupplierBalsPageHeader.inc:36
-msgid "Currency"
-msgstr "貨幣"
-
-#: BankAccounts.php:202 BankAccounts.php:351
-msgid "Default for Invoices"
-msgstr "發票預設值"
-
-#: BankAccounts.php:251
-msgid "Show All Bank Accounts Defined"
-msgstr "顯示全部銀行帳戶"
-
-#: BankAccounts.php:284 BankAccounts.php:287
-msgid "Bank Account GL Code"
-msgstr "會計科目"
-
-#: BankAccounts.php:334
-msgid "Currency Of Account"
-msgstr "帳戶的貨幣"
-
-#: BankMatching.php:8
-msgid "Bank Account Matching"
-msgstr "銀行帳戶對賬"
-
-#: BankMatching.php:15 PDFCustTransListing.php:44 Z_CheckDebtorsControl.php:80
-msgid "Receipts"
-msgstr "收款"
-
-#: BankMatching.php:16 BankMatching.php:23
-msgid "Bank Matching"
-msgstr "銀行對賬"
-
-#: BankMatching.php:16
-msgid "Bank Account Matching - Receipts"
-msgstr "銀行帳戶對賬-收款"
-
-#: BankMatching.php:22 PaymentAllocations.php:33 PaymentMethods.php:13
-#: PDFSuppTransListing.php:44
-msgid "Payments"
-msgstr "付款"
-
-#: BankMatching.php:23
-msgid "Bank Account Matching - Payments"
-msgstr "銀行帳戶對賬-付款"
-
-#: BankMatching.php:27
-msgid "This page must be called with a bank transaction type"
-msgstr "這個頁面必須指定銀行交易類別"
-
-#: BankMatching.php:27
-msgid "It should not be called directly"
-msgstr "不能直接調用"
-
-#: BankMatching.php:40
-msgid "Could not retrieve transaction information"
-msgstr "找不到此交易資訊"
-
-#: BankMatching.php:47
-msgid "Could not match off this payment because"
-msgstr "無法確認這筆付款, 因為"
-
-#: BankMatching.php:58
-msgid "Could not update the amount matched off this bank transaction because"
-msgstr "無法更新銀行對賬記錄, 因為"
-
-#: BankMatching.php:64
-msgid "Could not unclear this bank transaction because"
-msgstr "無法取消確認此銀行交易, 因為"
-
-#: BankMatching.php:72
-msgid ""
-"Use this screen to match webERP Receipts and Payments to your Bank "
-"Statement. Check your bank statement and click the check-box when you find "
-"the matching transaction."
-msgstr ""
-"使用此螢幕來核對webERP與您銀行收款和付款對帳單。核對您的銀行對帳單並且當您發"
-"現符合的交易時點擊核取框。"
-
-#: BankMatching.php:80 BankReconciliation.php:97 CustomerReceipt.php:729
-#: DailyBankTransactions.php:28 Payments.php:732 PDFChequeListing.php:46
-#: TaxAuthorities.php:150 TaxAuthorities.php:306
-msgid "Bank Account"
-msgstr "銀行帳戶"
-
-#: BankMatching.php:102
-msgid "Show"
-msgstr "顯示"
-
-#: BankMatching.php:102 CreditItemsControlled.php:78 FreightCosts.php:270
-#: GoodsReceivedControlled.php:65 GoodsReceived.php:67
-#: StockLocTransferReceive.php:426 SupplierAllocations.php:443
-#: SuppShiptChgs.php:126
-msgid "from"
-msgstr "來自"
-
-#: BankMatching.php:105 ConfirmDispatchControlled_Invoice.php:59
-#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:281
-#: GLAccountCSV.php:172 GLAccountReport.php:102 Payments.php:712
-#: PcReportTab.php:105 PDFChequeListing.php:108 PDFChequeListing.php:118
-#: PDFChequeListing.php:205 PDFDeliveryDifferences.php:166
-#: PDFDeliveryDifferences.php:179 PDFDeliveryDifferences.php:287
-#: PDFDIFOT.php:172 PDFDIFOT.php:185 PDFDIFOT.php:289 PDFOrdersInvoiced.php:74
-#: PDFOrdersInvoiced.php:271 PDFOrderStatus.php:75 PDFOrderStatus.php:250
-#: PO_PDFPurchOrder.php:302 PricesBasedOnMarkUp.php:216
-#: PricesBasedOnMarkUp.php:355 PrintCustStatements.php:50
-#: PrintCustTrans.php:37 PrintCustTrans.php:40 PrintCustTransPortrait.php:60
-#: PrintCustTransPortrait.php:63 SalesGraph.php:200 SalesGraph.php:229
-#: SalesGraph.php:233 StockLocTransferReceive.php:310
-#: StockLocTransferReceive.php:426 Stocks.php:229 Stocks.php:234
-#: StockStatus.php:309 StockStatus.php:350 StockTransfers.php:397
-#: includes/PDFAgedDebtorsPageHeader.inc:18
-#: includes/PDFAgedSuppliersPageHeader.inc:17
-#: includes/PDFChequeListingPageHeader.inc:17
-#: includes/PDFDeliveryDifferencesPageHeader.inc:19
-#: includes/PDFDeliveryDifferencesPageHeader.inc:21
-#: includes/PDFDIFOTPageHeader.inc:19 includes/PDFDIFOTPageHeader.inc:21
-#: includes/PDFOrdersInvoicedPageHeader.inc:19
-#: includes/PDFOrdersInvoicedPageHeader.inc:21
-#: includes/PDFOrderStatusPageHeader.inc:19
-#: includes/PDFOrderStatusPageHeader.inc:21
-#: includes/PDFStockLocTransferHeader.inc:31
-msgid "to"
-msgstr "到"
-
-#: BankMatching.php:107
-msgid "Choose outstanding"
-msgstr "選擇未清算"
-
-#: BankMatching.php:107
-msgid "only or all"
-msgstr "或全部"
-
-#: BankMatching.php:107 BankMatching.php:111 BankMatching.php:114
-#: BankMatching.php:122 BankMatching.php:125
-msgid "in the date range"
-msgstr "記錄"
-
-#: BankMatching.php:111 BankMatching.php:114 BankMatching.php:122
-#: BankMatching.php:125
-msgid "Show all"
-msgstr "顯示全部"
-
-#: BankMatching.php:112 BankMatching.php:115
-msgid "Show unmatched"
-msgstr "只顯示未清算的"
-
-#: BankMatching.php:112 BankMatching.php:115 ReverseGRN.php:103
-#: includes/PDFCustomerListPageHeader.inc:46
-#: includes/PDFDeliveryDifferencesPageHeader.inc:24
-#: includes/PDFDIFOTPageHeader.inc:24
-#: includes/PDFOrdersInvoicedPageHeader.inc:24
-#: includes/PDFOrderStatusPageHeader.inc:24
-msgid "only"
-msgstr "僅"
-
-#: BankMatching.php:119
-msgid "Choose to display only the first 20 matching"
-msgstr "只顯示前20條"
-
-#: BankMatching.php:120
-msgid "or all"
-msgstr "或全部"
-
-#: BankMatching.php:120
-msgid "meeting the criteria"
-msgstr "記錄"
-
-#: BankMatching.php:123 BankMatching.php:126
-msgid "Show only the first 20"
-msgstr "只顯示首 20"
-
-#: BankMatching.php:131
-msgid "Show selected"
-msgstr "顯示符合條件的"
-
-#: BankMatching.php:132
-msgid "Show reconciliation"
-msgstr "顯示銀行對帳單"
-
-#: BankMatching.php:138 BankMatching.php:144
-msgid "The date entered for the field to show"
-msgstr "輸入的日期"
-
-#: BankMatching.php:138
-msgid "before"
-msgstr "日期早於"
-
-#: BankMatching.php:139 BankMatching.php:145
-msgid "is not entered in a recognised date format"
-msgstr "格式不正確"
-
-#: BankMatching.php:139 BankMatching.php:145
-msgid "Entry is expected in the format"
-msgstr "按正確格式輸入日期"
-
-#: BankMatching.php:144
-msgid "after"
-msgstr "之後"
-
-#: BankMatching.php:218
-msgid "The payments with the selected criteria could not be retrieved because"
-msgstr "未能提取符合條件的付款, 因為"
-
-#: BankMatching.php:221 ShipmentCosting.php:502 ShipmentCosting.php:573
-#: SupplierAllocations.php:465
-msgid "Ref"
-msgstr "摘要"
-
-#: BankMatching.php:224 ConfirmDispatch_Invoice.php:279 Credit_Invoice.php:280
-#: CustomerAllocations.php:359 CustomerReceipt.php:845
-#: CustomerTransInquiry.php:94 CustWhereAlloc.php:91 PaymentAllocations.php:78
-#: Payments.php:925 Payments.php:927 Payments.php:936
-#: PcAssignCashToTab.php:214 PcAssignCashToTab.php:335
-#: PcAuthorizeExpenses.php:83 PcClaimExpensesFromTab.php:193
-#: PcClaimExpensesFromTab.php:342 PcReportTab.php:175 PcReportTab.php:347
-#: PrintCheque.php:70 PrintCheque.php:84 SelectCreditItems.php:659
-#: SuppContractChgs.php:73 SuppContractChgs.php:142 SuppFixedAssetChgs.php:71
-#: SuppFixedAssetChgs.php:137 SupplierAllocations.php:466
-#: SupplierCredit.php:345 SupplierCredit.php:373 SupplierCredit.php:403
-#: SupplierCredit.php:438 SupplierInvoice.php:313 SupplierInvoice.php:344
-#: SupplierInvoice.php:373 SupplierInvoice.php:409 SupplierTransInquiry.php:94
-#: SuppShiptChgs.php:77 SuppShiptChgs.php:134 SuppTransGLAnalysis.php:97
-#: SuppTransGLAnalysis.php:174 Z_CheckAllocs.php:63
-#: includes/PDFBankingSummaryPageHeader.inc:55
-#: includes/PDFChequeListingPageHeader.inc:37
-msgid "Amount"
-msgstr "金額"
-
-#: BankMatching.php:225 BankReconciliation.php:189 BankReconciliation.php:261
-#: PDFOrdersInvoiced.php:348 PDFOrderStatus.php:316
-#: PO_SelectOSPurchOrder.php:215 PO_SelectPurchOrder.php:180
-#: Shipt_Select.php:186 SuppCreditGRNs.php:225
-#: includes/PDFStatementPageHeader.inc:173
-#: includes/PDFStatementPageHeader.inc:180
-msgid "Outstanding"
-msgstr "未清算"
-
-#: BankMatching.php:226
-msgid "Clear"
-msgstr "清算"
-
-#: BankMatching.php:226 BankMatching.php:255
-msgid "Unclear"
-msgstr "未清算"
-
-#: BankMatching.php:299
-msgid "Update Matching"
-msgstr "保存"
-
-#: BankReconciliation.php:10
-msgid "Bank Reconciliation"
-msgstr "銀行對帳單"
-
-#: BankReconciliation.php:20
-msgid ""
-"The entry in the bank statement balance is not numeric. The balance on the "
-"bank statement should be entered. The exchange difference has not been "
-"calculated and no general ledger journal has been created"
-msgstr ""
-"輸入的銀行對賬表餘額不是數字。銀行對賬表的餘額需要輸入。匯兌差異沒有被計算並"
-"且沒有創建總帳日記帳。"
-
-#: BankReconciliation.php:29
-msgid "Could not retrieve the exchange rate for the selected bank account"
-msgstr "無法查詢所選銀行帳戶的匯率, 因為"
-
-#: BankReconciliation.php:59 BankReconciliation.php:77
-msgid "reconciliation on"
-msgstr "對賬於"
-
-#: BankReconciliation.php:62
-msgid "Cannot insert a GL entry for the exchange difference because"
-msgstr "未能插入匯兌差異的總賬憑證, 因為"
-
-#: BankReconciliation.php:63
-msgid "The SQL that failed to insert the exchange difference GL entry was"
-msgstr "插入匯率差異總賬憑證失敗的SQL是"
-
-#: BankReconciliation.php:83
-msgid "Exchange difference of"
-msgstr "匯兌差異"
-
-#: BankReconciliation.php:83
-msgid "has been posted"
-msgstr "已過賬"
-
-#: BankReconciliation.php:93 SuppPaymentRun.php:300
-msgid "The bank accounts could not be retrieved by the SQL because"
-msgstr "找不到銀行帳戶，因為"
-
-#: BankReconciliation.php:94 CustomerReceipt.php:720
-#: DailyBankTransactions.php:25 Payments.php:729 SuppPaymentRun.php:302
-msgid "The SQL used to retrieve the bank accounts was"
-msgstr "找不到銀行帳戶的SQL是"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-msgid "Bank Accounts have not yet been defined"
-msgstr "尚未定義銀行帳戶"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-msgid "You must first"
-msgstr "您必須首先"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
-msgid "define the bank accounts"
-msgstr "定義銀行帳戶"
-
-#: BankReconciliation.php:100 CustomerReceipt.php:734
-#: DailyBankTransactions.php:32 Payments.php:736 SuppPaymentRun.php:310
-msgid "and general ledger accounts to be affected"
-msgstr "和對應的會計科目"
-
-#: BankReconciliation.php:119
-msgid "Show bank reconciliation statement"
-msgstr "顯示銀行對帳單"
-
-#: BankReconciliation.php:134
-msgid "The bank account balance could not be returned by the SQL because"
-msgstr "無法返回銀行帳戶餘額，原因是"
-
-#: BankReconciliation.php:147
-msgid ""
-"Could not retrieve the currency and exchange rate for the selected bank "
-"account"
-msgstr "無法找到所選銀行帳戶的貨幣和匯率, 因為"
-
-#: BankReconciliation.php:155
-msgid "Balance as at"
-msgstr "餘額截止"
-
-#: BankReconciliation.php:178
-msgid "The unpresented cheques could not be retrieved by the SQL because"
-msgstr "未找到企業已付銀行未付記錄, 因為"
-
-#: BankReconciliation.php:181
-msgid "Add back unpresented cheques"
-msgstr "加：企業已付銀行未付"
-
-#: BankReconciliation.php:186 BankReconciliation.php:258
-#: CustomerAllocations.php:331 CustomerAllocations.php:357
-#: CustomerInquiry.php:190 CustomerTransInquiry.php:86 CustWhereAlloc.php:88
-#: EmailCustTrans.php:17 GLAccountInquiry.php:153 PrintCustTrans.php:378
-#: PrintCustTrans.php:542 PrintCustTrans.php:696 PrintCustTrans.php:735
-#: PrintCustTransPortrait.php:504 PrintCustTransPortrait.php:704
-#: PrintCustTransPortrait.php:894 PrintCustTransPortrait.php:939
-#: StockMovements.php:97 SupplierAllocations.php:463
-#: SupplierAllocations.php:575 SupplierAllocations.php:645
-#: SupplierTransInquiry.php:87 Z_CheckAllocs.php:60
-#: Z_CheckGLTransBalance.php:13 includes/PDFQuotationPageHeader.inc:87
-#: includes/PDFQuotationPortraitPageHeader.inc:86
-#: includes/PDFStatementPageHeader.inc:168
-#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:80
-#: includes/PDFTransPageHeaderPortrait.inc:52
-msgid "Number"
-msgstr "編號"
-
-#: BankReconciliation.php:187 BankReconciliation.php:259
-#: ContractCosting.php:148 CustomerInquiry.php:193 CustomerTransInquiry.php:90
-#: CustWhereAlloc.php:89 DailyBankTransactions.php:100 GLAccountReport.php:368
-#: PaymentAllocations.php:75 PaymentAllocations.php:76
-#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
-#: StockCounts.php:135 StockLocMovements.php:88 StockMovements.php:100
-#: Z_CheckAllocs.php:61 includes/PDFBankingSummaryPageHeader.inc:40
-#: includes/PDFCustTransListingPageHeader.inc:49
-#: includes/PDFStockComparisonPageHeader.inc:36
-#: includes/PDFStockTransListingPageHeader.inc:68
-#: includes/PDFStockTransListingPageHeader.inc:72
-#: includes/PDFSuppTransListingPageHeader.inc:49
-msgid "Reference"
-msgstr "摘要"
-
-#: BankReconciliation.php:188 BankReconciliation.php:260
-msgid "Orig Amount"
-msgstr "憑證金額"
-
-#: BankReconciliation.php:231
-msgid "Total of all unpresented cheques"
-msgstr "企業已付銀行未付合計："
-
-#: BankReconciliation.php:249
-msgid "The uncleared deposits could not be retrieved by the SQL because"
-msgstr "未找到企業已收銀行未收記錄, 因為"
-
-#: BankReconciliation.php:253
-msgid "Less deposits not cleared"
-msgstr "減：企業已收銀行未收"
-
-#: BankReconciliation.php:303
-msgid "Total of all unc...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-29 09:04:29
|
Revision: 4521
http://web-erp.svn.sourceforge.net/web-erp/?rev=4521&view=rev
Author: daintree
Date: 2011-03-29 09:04:20 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
SQL to ansi and other html to xhtml
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/Credit_Invoice.php
trunk/CustomerReceipt.php
trunk/Customers.php
trunk/MRP.php
trunk/api/api_branches.php
trunk/api/api_currencies.php
trunk/api/api_customers.php
trunk/api/api_customertypes.php
trunk/api/api_glaccounts.php
trunk/api/api_holdreasons.php
trunk/api/api_locations.php
trunk/api/api_salesareas.php
trunk/api/api_salesman.php
trunk/api/api_salesorders.php
trunk/api/api_salestypes.php
trunk/api/api_shippers.php
trunk/api/api_stock.php
trunk/api/api_stockcategories.php
trunk/api/api_suppliers.php
trunk/api/api_taxgroups.php
trunk/api/api_workorders.php
trunk/includes/ConnectDB_mysql.inc
Added Paths:
-----------
trunk/locale/zh_CN.utf8/Manual/ManualSalesAnalysis.html
trunk/locale/zh_CN.utf8/Manual/ManualSalesPeople.html
trunk/locale/zh_CN.utf8/Manual/ManualShipments.html
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMExtendedQty.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,8 +2,6 @@
/* $Id$*/
-/* $Revision: 1.8 $ */
-
// BOMExtendedQty.php - Quantiy Extended Bill of Materials
//$PageSecurity = 2;
include('includes/session.inc');
@@ -30,7 +28,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa double,
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -43,7 +41,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -56,8 +54,9 @@
(" . $_POST['Quantity'] . " * bom.quantity) as extendedqpa,
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -82,8 +81,9 @@
bom.effectiveto,
(" . $_POST['Quantity'] . " * bom.quantity) as extendedqpa
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "</br>sql is $sql</br>";
// This while routine finds the other levels as long as $componentctr - the
@@ -114,7 +114,8 @@
(bom.quantity * passbom.extendedqpa)
FROM bom,passbom
WHERE bom.parent = passbom.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$sql = 'DROP TABLE IF EXISTS passbom2';
@@ -129,7 +130,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa decimal(10,3),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
@@ -138,13 +139,15 @@
(bom.quantity * passbom2.extendedqpa),
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
- WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent = passbom2.part
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $sql = 'SELECT COUNT(*) FROM bom,passbom WHERE bom.parent = passbom.part
- GROUP BY passbom.part';
+ $sql = 'SELECT COUNT(*) FROM bom, passbom
+ WHERE bom.parent = passbom.part
+ GROUP BY passbom.part';
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -156,9 +159,9 @@
$title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Quantiy Extended BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
- echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$sql";
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -168,11 +171,11 @@
$Right_Margin);
$sql = "SELECT stockmaster.stockid,stockmaster.description
FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
- $assembly = $_POST['Part'];
- $assemblydesc = $myrow['description'];
+ $Assembly = $_POST['Part'];
+ $AssemblyDescription = $myrow['description'];
$FontSize=8;
$Tot_Val=0;
@@ -209,14 +212,12 @@
$ListCount = DB_num_rows($result); // UldisN
While ($myrow = DB_fetch_array($result,$db)){
-
-
// Parameters for addTextWrap are defined in /includes/class.pdf.php
// 1) X position 2) Y position 3) Width
// 4) Height 5) Text 6) Alignment 7) Border 8) Fill - True to use SetFillColor
// and False to set to transparent
- $difference = $myrow['quantity'] - ($myrow['qoh'] + $myrow['poqty'] + $myrow['woqty']);
- if (($_POST['Select'] == 'All') or ($difference > 0)) {
+ $Difference = $myrow['quantity'] - ($myrow['qoh'] + $myrow['poqty'] + $myrow['woqty']);
+ if (($_POST['Select'] == 'All') or ($Difference > 0)) {
$YPos -=$line_height;
$FontSize=8;
// Use to alternate between lines with transparent and painted background
@@ -234,7 +235,7 @@
$myrow['decimalplaces']),'right',0,$fill);
$pdf->addTextWrap(440,$YPos,40,$FontSize,number_format($myrow['woqty'],
$myrow['decimalplaces']),'right',0,$fill);
- $pdf->addTextWrap(480,$YPos,50,$FontSize,number_format($difference,
+ $pdf->addTextWrap(480,$YPos,50,$FontSize,number_format($Difference,
$myrow['decimalplaces']),'right',0,$fill);
}
if ($YPos < $Bottom_Margin + $line_height){
@@ -251,33 +252,18 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
}
-/* Uldisn:This actually would produce the output
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-*/
-// if ($len<=20){
- if ($ListCount == 0) { //UldisN
- $title = _('Print Indented BOM Listing Error');
- include('includes/header.inc');
- prnMsg(_('There were no items for the selected assembly'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
- include('includes/footer.inc');
- exit;
+ if ($ListCount == 0) {
+ $title = _('Print Indented BOM Listing Error');
+ include('includes/header.inc');
+ prnMsg(_('There were no items for the selected assembly'),'error');
+ echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
} else {
-/* UldisN
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=Customer_trans.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOM_Extended_Qty_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
+ }
- $pdf->Output('BOMExtendedQty', 'I');
-*/
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
- }
-
} else { /*The option to print PDF was not hit so display form */
$title=_('Quantity Extended BOM Listing');
@@ -297,7 +283,7 @@
echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines');
echo "<option value='no'>" . _('Plain Print');
echo '</select></td></tr>';
- echo "</table></br></br><div class='centre'><br><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
+ echo "</table></br></br><div class='centre'><br /><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
include('includes/footer.inc');
@@ -348,6 +334,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader function
-
-
?>
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMIndented.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,10 +2,8 @@
/* $Id$*/
-/* $Revision: 1.5 $ */
-
// BOMIndented.php - Indented Bill of Materials
-//$PageSecurity = 2;
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -25,7 +23,7 @@
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -38,7 +36,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -50,8 +48,9 @@
SELECT bom.component AS part,
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -77,7 +76,8 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "</br>sql is $sql</br>";
// This while routine finds the other levels as long as $componentctr - the
@@ -107,7 +107,7 @@
bom.effectiveafter,
bom.effectiveto,
bom.quantity
- FROM bom,passbom
+ FROM bom, passbom
WHERE bom.parent = passbom.part
AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -123,16 +123,17 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
- $sql = "INSERT INTO passbom (part, sortpart)
+ $sql = 'INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()';
$result = DB_query($sql,$db);
@@ -181,9 +182,9 @@
// $fill is used to alternate between lines with transparent and painted background
$fill = false;
- $pdf->SetFillColor(224,235,255);
+ $pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result); // UldisN
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -239,19 +240,8 @@
include('includes/footer.inc');
exit;
} else {
- /* UldisN
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=Customer_trans.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('BOMIndented.pdf', 'I');
- */
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
-
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
@@ -333,5 +323,4 @@
} // End of PrintHeader function
-
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMIndentedReverse.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,11 +2,9 @@
/* $Id$*/
-/* $Revision: 1.1 $ */
-
// BOMIndented.php - Reverse Indented Bill of Materials - From lowest level component to top level
// assembly
-//$PageSecurity = 2;
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -26,7 +24,8 @@
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
+
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -39,7 +38,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -51,8 +50,9 @@
SELECT bom.parent AS part,
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
- WHERE bom.component =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.component ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -78,7 +78,8 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
// This while routine finds the other levels as long as $componentctr - the
@@ -107,9 +108,10 @@
bom.effectiveafter,
bom.effectiveto,
bom.quantity
- FROM bom,passbom
- WHERE bom.component = passbom.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ FROM bom,passbom
+ WHERE bom.component = passbom.part
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$sql = 'DROP TABLE IF EXISTS passbom2';
@@ -123,7 +125,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
@@ -132,7 +134,8 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -160,7 +163,7 @@
$sql = "SELECT stockmaster.stockid,
stockmaster.description
FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$assembly = $_POST['Part'];
@@ -222,12 +225,6 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$assemblydesc);
}
-/* UldisN
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
-*/
if ($ListCount == 0) {
$title = _('Print Reverse Indented BOM Listing Error');
include('includes/header.inc');
@@ -236,16 +233,8 @@
include('includes/footer.inc');
exit;
} else {
-// header('Content-type: application/pdf');
-// header("Content-Length: " . $len);
-// header('Content-Disposition: inline; filename=Customer_trans.pdf');
-// header('Expires: 0');
-// header('Cache-Control: private, post-check=0, pre-check=0');
-// header('Pragma: public');
-//
-// $pdf->Output('BOMIndentedReverse.pdf', 'I');
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
@@ -255,7 +244,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . " method='post'><table class=selection>";
+ echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . ' method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><td>' . _('Part') . ":</td>";
echo "<td><input type ='text' name='Part' size='20'>";
@@ -319,5 +308,4 @@
} // End of PrintHeader function
-
-?>
+?>
\ No newline at end of file
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/COGSGLPostings.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -58,7 +58,7 @@
$result = DB_query($sql,$db);
prnMsg ($msg,'info');
- echo '<br>';
+ echo '<br />';
unset ($SelectedCOGSPostingID);
} elseif (isset($_GET['delete'])) {
@@ -67,7 +67,7 @@
$sql="DELETE FROM cogsglpostings WHERE id='".$SelectedCOGSPostingID."'";
$result = DB_query($sql,$db);
prnMsg( _('The cost of sales posting code record has been deleted'),'info');
- echo '<br>';
+ echo '<br />';
unset ($SelectedCOGSPostingID);
}
@@ -90,11 +90,11 @@
$ShowLivePostingRecords = false;
prnMsg (_('The following cost of sales posting records that do not have valid general ledger code specified - these records must be amended.'),'error');
echo '<table class=selection>';
- echo "<tr><th>" . _('Area') . "</th>
- <th>" . _('Stock Category') . "</th>
- <th>" . _('Sales Type') . "</th>
- <th>" . _('COGS Account') . "</th>
- </tr>";
+ echo '<tr><th>' . _('Area') . '</th>
+ <th>' . _('Stock Category') . '</th>
+ <th>' . _('Sales Type') . '</th>
+ <th>' . _('COGS Account') . '</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow = DB_fetch_row($result)) {
@@ -116,9 +116,9 @@
$myrow[2],
$myrow[3],
$myrow[4],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
- $_SERVER['PHP_SELF']. '?' . SID . '&',
+ $_SERVER['PHP_SELF']. '?',
$myrow[0]);
}//end while
echo '</table>';
@@ -146,13 +146,13 @@
sequenceintb
) VALUES (
'Sales',
- 1,
- 1,
- 10)";
+ '1',
+ '1',
+ '10')";
$result = DB_query($sql,$db);
}
- $sql = 'SELECT accountcode FROM chartmaster WHERE accountcode =1';
+ $sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1' ";
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
/* account number 1 is not used, so insert a new account */
@@ -162,7 +162,7 @@
group_
)
VALUES (
- 1,
+ '1',
'Default Sales/Discounts',
'Sales'
)";
@@ -177,7 +177,7 @@
VALUES ('AN',
'ANY',
'AN',
- 1)";
+ '1')";
$result = DB_query($sql,$db);
}
@@ -194,14 +194,11 @@
$result = DB_query($sql,$db);
echo '<table class=selection>';
- echo '<tr><th>' . _('Area') .
- '</th><th>' . _('Stock Category') .
- '</th><th>' . _('Sales Type') .
- '</th><th>' . _('GL Account') .
- '</th></tr>';
-
+ echo '<tr><th>' . _('Area') . '</th>
+ <th>' . _('Stock Category') . '</th>
+ <th>' . _('Sales Type') . '</th>
+ <th>' . _('GL Account') . '</th></tr>';
$k = 0;
-
while ($myrow = DB_fetch_row($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
@@ -222,9 +219,9 @@
$myrow[2],
$myrow[3],
$myrow[4],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0]);
}//END WHILE LIST LOOP
@@ -234,12 +231,12 @@
//end of ifs and buts!
if (isset($SelectedCOGSPostingID)) {
- echo "<div class='centre'><a href=" . $_SERVER['PHP_SELF'] .">" . _('Show all cost of sales posting records') . "</a></div>";
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Show all cost of sales posting records') . '</a></div>';
}
-echo "<p>";
+echo '<p />';
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . ">";
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCOGSPostingID)) {
@@ -265,20 +262,23 @@
} //end of if $SelectedCOGSPostingID only do the else when a new record is being entered
-$sql = "SELECT areacode,
+$sql = 'SELECT areacode,
areadescription
- FROM areas";
+ FROM areas';
$result = DB_query($sql,$db);
-echo "<table class=selection><tr><td>" . _('Area') . ":</td><td><select tabindex=1 name='Area'><option value='AN'>" . _('Any Other');
+echo '<table class=selection>
+ <tr><td>' . _('Area') . ':</td>
+ <td><select tabindex=1 name="Area">
+ <option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['Area']) and $myrow['areacode']==$_POST['Area']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['areacode'] . "'>" . $myrow['areadescription'];
+ echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} //end while loop
DB_free_result($result);
@@ -286,16 +286,18 @@
$sql = 'SELECT categoryid, categorydescription FROM stockcategory';
$result = DB_query($sql,$db);
-echo "</select></td></tr><tr><td>" . _('Stock Category') . ":</td><td><select tabindex=2 name='StkCat'>
- <option VALUE='ANY'>" . _('Any Other');
+echo '</select></td></tr>
+ <tr><td>' . _('Stock Category') . ':</td>
+ <td><select tabindex=2 name="StkCat">
+ <option VALUE="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['StkCat']) and $myrow["categoryid"]==$_POST['StkCat']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['categoryid'] . "'>" . $myrow['categorydescription'];
+ echo $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} //end while loop
@@ -304,23 +306,27 @@
$sql = 'SELECT typeabbrev, sales_type FROM salestypes';
$result = DB_query($sql,$db);
-echo "</select></td></tr><tr><td>" . _('Sales Type') . " / " . _('Price List') . ":</td>
- <td><select tabindex=3 name='SalesType'><option VALUE='AN'>" . _('Any Other');
+echo '</select></td></tr>
+ <tr><td>' . _('Sales Type') . ' / ' . _('Price List') . ':</td>
+ <td><select tabindex=3 name="SalesType">
+ <option VALUE="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow["typeabbrev"] . "'>" . $myrow['sales_type'];
+ echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
} //end while loop
-echo "</select></td></tr><tr><td>" . _('Post to GL account') . ":</td><td><select tabindex=4 name='GLCode'>";
+echo '</select></td></tr>
+ <tr><td>' . _('Post to GL account') . ':</td>
+ <td><select tabindex="4" name="GLCode">';
DB_free_result($result);
-$sql = "SELECT chartmaster.accountcode,
+$sql = 'SELECT chartmaster.accountcode,
chartmaster.accountname
FROM chartmaster,
accountgroups
@@ -328,23 +334,23 @@
AND accountgroups.pandl=1
ORDER BY accountgroups.sequenceintb,
chartmaster.accountcode,
- chartmaster.accountname";
+ chartmaster.accountname';
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['GLCode']) and $myrow['accountcode']==$_POST['GLCode']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['accountcode'] . "'>" . $myrow['accountcode'] . ' - ' . $myrow['accountname'];
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} //end while loop
DB_free_result($result);
-echo "</select></td></tr></table>";
-echo "<br><div class='centre'><input tabindex=5 type='Submit' name='submit' value=" . _('Enter Information') . "></form></div>";
+echo '</select></td></tr></table>';
+echo '<br /><div class="centre"><input tabindex="5" type="Submit" name="submit" value="' . _('Enter Information') . '"></form></div>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/CompanyPreferences.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,10 +1,7 @@
<?php
-/* $Revision: 1.18 $ */
/* $Id$*/
-//$PageSecurity =10;
-
include('includes/session.inc');
$title = _('Company Preferences');
@@ -133,13 +130,13 @@
/* Alter the exchange rates in the currencies table */
/* Get default currency rate */
- $sql='SELECT rate from currencies WHERE currabrev="'.$_POST['CurrencyDefault'].'"';
+ $sql="SELECT rate from currencies WHERE currabrev='" . $_POST['CurrencyDefault'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
$NewCurrencyRate=$myrow[0];
/* Set new rates */
- $sql='UPDATE currencies SET rate=rate/"'.$NewCurrencyRate.'"';
+ $sql="UPDATE currencies SET rate=rate/'".$NewCurrencyRate."'";
$ErrMsg = _('Could not update the currency rates');
$result = DB_query($sql,$db,$ErrMsg);
@@ -163,36 +160,34 @@
echo '<table class=selection>';
if ($InputError != 1) {
- $sql = "SELECT coyname,
- gstno,
- companynumber,
- regoffice1,
- regoffice2,
- regoffice3,
- regoffice4,
- regoffice5,
- regoffice6,
- telephone,
- fax,
- email,
- currencydefault,
- debtorsact,
- pytdiscountact,
- creditorsact,
- payrollact,
- grnact,
- exchangediffact,
- purchasesexchangediffact,
- retainedearnings,
- gllink_debtors,
- gllink_creditors,
- gllink_stock,
- freightact
- FROM companies
- WHERE coycode=1";
+ $sql = 'SELECT coyname,
+ gstno,
+ companynumber,
+ regoffice1,
+ regoffice2,
+ regoffice3,
+ regoffice4,
+ regoffice5,
+ regoffice6,
+ telephone,
+ fax,
+ email,
+ currencydefault,
+ debtorsact,
+ pytdiscountact,
+ creditorsact,
+ payrollact,
+ grnact,
+ exchangediffact,
+ purchasesexchangediffact,
+ retainedearnings,
+ gllink_debtors,
+ gllink_creditors,
+ gllink_stock,
+ freightact
+ FROM companies
+ WHERE coycode=1';
-
-
$ErrMsg = _('The company preferences could not be retrieved because');
$result = DB_query($sql, $db,$ErrMsg);
@@ -275,15 +270,15 @@
</tr>';
-$result=DB_query("SELECT currabrev, currency FROM currencies",$db);
+$result=DB_query('SELECT currabrev, currency FROM currencies',$db);
echo '<tr><td>' . _('Home Currency') . ':</td><td><select tabindex="13" Name=CurrencyDefault>';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrencyDefault']==$myrow['currabrev']){
- echo "<option selected VALUE='". $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option selected VALUE="'. $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
} else {
- echo "<option VALUE='". $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option VALUE="' . $myrow['currabrev'] . '">' . $myrow['currency']. '</option>';
}
} //end while loop
@@ -291,21 +286,21 @@
echo '</select></td></tr>';
-$result=DB_query("SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
- AND accountgroups.pandl=0
- ORDER BY chartmaster.accountcode",$db);
+$result=DB_query('SELECT accountcode,
+ accountname
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0
+ ORDER BY chartmaster.accountcode',$db);
-echo '<tr><td>' . _('Debtors Control GL Account') . ':</td><td><select tabindex="14" Name=DebtorsAct>';
+echo '<tr><td>' . _('Debtors Control GL Account') . ':</td>
+ <td><select tabindex="14" Name=DebtorsAct>';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['DebtorsAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -317,9 +312,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['CreditorsAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="' . $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -331,9 +326,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PayrollAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -345,22 +340,23 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['GRNAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
DB_data_seek($result,0);
echo '</select></td></tr>';
-echo '<tr><td>' . _('Retained Earning Clearing GL Account') . ':</td><td><select tabindex="18" Name=RetainedEarnings>';
+echo '<tr><td>' . _('Retained Earning Clearing GL Account') . ':</td>
+ <td><select tabindex="18" Name="RetainedEarnings">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['RetainedEarnings']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -368,21 +364,21 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Freight Re-charged GL Account') . ':</td><td><select tabindex="19" Name=FreightAct>';
+echo '<tr><td>' . _('Freight Re-charged GL Account') . ':</td>
+ <td><select tabindex="19" Name="FreightAct">';
$result=DB_query('SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
- AND accountgroups.pandl=1
- ORDER BY chartmaster.accountcode',$db);
+ accountname
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=1
+ ORDER BY chartmaster.accountcode',$db);
while ($myrow = DB_fetch_row($result)) {
if ($_POST['FreightAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -390,13 +386,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Sales Exchange Variances GL Account') . ':</td><td><select tabindex="20" Name=ExchangeDiffAct>';
+echo '<tr><td>' . _('Sales Exchange Variances GL Account') . ':</td>
+ <td><select tabindex="20" Name="ExchangeDiffAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['ExchangeDiffAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -404,13 +401,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Purchases Exchange Variances GL Account') . ':</td><td><select tabindex="21" Name=PurchasesExchangeDiffAct>';
+echo '<tr><td>' . _('Purchases Exchange Variances GL Account') . ':</td>
+ <td><select tabindex="21" Name="PurchasesExchangeDiffAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -418,13 +416,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Payment Discount GL Account') . ':</td><td><select tabindex="22" Name=PytDiscountAct>';
+echo '<tr><td>' . _('Payment Discount GL Account') . ':</td>
+ <td><select tabindex="22" Name="PytDiscountAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PytDiscountAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -432,44 +431,47 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for accounts receivable transactions') . ':</td><td><select tabindex="23" Name=GLLink_Debtors>';
+echo '<tr><td>' . _('Create GL entries for accounts receivable transactions') . ':</td>
+ <td><select tabindex="23" Name="GLLink_Debtors">';
if ($_POST['GLLink_Debtors']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes'). '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes'). '</option>';
+ echo '<option VALUE="0">' . _('No'). '</option>';
}
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for accounts payable transactions') . ':</td><td><select tabindex="24" Name=GLLink_Creditors>';
+echo '<tr><td>' . _('Create GL entries for accounts payable transactions') . ':</td>
+ <td><select tabindex="24" Name="GLLink_Creditors">';
if ($_POST['GLLink_Creditors']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes') . '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes') . '</option>';
+ echo '<option VALUE="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for stock transactions') . '):</td><td><select tabindex="25" Name=GLLink_Stock>';
+echo '<tr><td>' . _('Create GL entries for stock transactions') . '):</td>
+ <td><select tabindex="25" Name="GLLink_Stock">';
-if ($_POST['GLLink_Stock']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+if ($_POST['GLLink_Stock']=='0'){
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes') . '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes') . '</option>';
+ echo '<option VALUE="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br><div class="centre"><input tabindex="26" type="Submit" Name="submit" value="' . _('Update') . '"></div>';
+echo '</table><br /><div class="centre"><input tabindex="26" type="Submit" Name="submit" value="' . _('Update') . '"></div>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/Credit_Invoice.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -257,28 +257,28 @@
if (!isset($_POST['ProcessCredit'])) {
- echo "<form action='" . $_SERVER['PHP_SELF'] . "?" . SID . "' method=post>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] .'" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo "<table cellpadding=2 colspan=7 class=selection><tr>";
- echo "<tr><th colspan=13>";
+ echo '<table cellpadding="2" colspan="7" class="selection"><tr>';
+ echo '<tr><th colspan="13">';
echo '<div class="centre"><font color=blue size=4><b>' . _('Credit Invoice') . ' ' . $_SESSION['ProcessingCredit'] . '</b>
<b>'.' - ' . $_SESSION['CreditItems']->CustomerName . '</b></font>
- <font size=3 color=blue> - ' . _('Credit Note amounts stated in') . ' ' . $_SESSION['CreditItems']->DefaultCurrency . "</div></font>";
- echo "</th></tr>";
- echo "<th>" . _('Item Code') . "</th>
- <th>" . _('Item Description') . "</th>
- <th>" . _('Invoiced') . "</th>
- <th>" . _('Units') . "</th>
- <th>" . _('Credit') . '<br>' . _('Quantity') . "</th>
- <th>" . _('Price') . "</th>
- <th>" . _('Discount') . ' %' . "</th>
- <th>" . _('Total') . '<br>' . _('Excl Tax') . "</th>
- <th>" . _('Tax Authority') . "</th>
- <th>" . _('Tax') . ' %' . "</th>
- <th>" . _('Tax') . '<br>' . _('Amount') . "</th>
- <th>" . _('Total') . '<br>' . _('Incl Tax') . "</th></tr>";
+ <font size=3 color=blue> - ' . _('Credit Note amounts stated in') . ' ' . $_SESSION['CreditItems']->DefaultCurrency . '</div></font>';
+ echo '</th></tr>';
+ echo '<th>' . _('Item Code') . '</th>
+ <th>' . _('Item Description') . '</th>
+ <th>' . _('Invoiced') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Credit') . '<br />' . _('Quantity') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Discount') . ' %' . '</th>
+ <th>' . _('Total') . '<br />' . _('Excl Tax') . '</th>
+ <th>' . _('Tax Authority') . '</th>
+ <th>' . _('Tax') . ' %' . '</th>
+ <th>' . _('Tax') . '<br />' . _('Amount') . '</th>
+ <th>' . _('Total') . '<br />' . _('Incl Tax') . '</th></tr>';
$_SESSION['CreditItems']->total = 0;
$_SESSION['CreditItems']->totalVolume = 0;
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/CustomerReceipt.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,11 +1,8 @@
<?php
/* $Id$ */
-/* $Revision: 1.46 $ */
include('includes/DefineReceiptClass.php');
-
-//$PageSecurity = 3; now retrieved from the DB
include('includes/session.inc');
$title = _('Receipt Entry');
@@ -127,7 +124,7 @@
$SuggestedFunctionalExRate = $myrow[0];
/*Get the exchange rate between the functional currency and the receipt currency*/
- $result = DB_query("select rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->Currency . "'",$db);
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->Currency . "'",$db);
$myrow = DB_fetch_row($result);
$tableExRate = $myrow[0]; //this is the rate of exchange between the functional currency and the receipt currency
/*Calculate cross rate to suggest appropriate exchange rate between receipt currency and account currency */
@@ -212,7 +209,7 @@
}
/*Make an array of the defined bank accounts */
- $SQL = "SELECT accountcode FROM bankaccounts";
+ $SQL = 'SELECT accountcode FROM bankaccounts';
$result = DB_query($SQL,$db);
$BankAccounts = array();
$i=0;
@@ -267,13 +264,13 @@
if ($ReceiptItem->GLCode !=''){ //so its a GL receipt
if ($_SESSION['CompanyRecord']['gllink_debtors']==1){ /* then enter a GLTrans record */
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount,
- tag)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount,
+ tag)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -341,15 +338,15 @@
$PaymentTransNo = GetNextTransNo( 1, $db);
$SQL="INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode)
VALUES (
'" . $PaymentTransNo . "',
1,
@@ -374,18 +371,18 @@
/*Create a DebtorTrans entry for each customer deposit */
$SQL = "INSERT INTO debtortrans (transno,
- type,
- debtorno,
- branchcode,
- trandate,
- inputdate,
- prd,
- reference,
- tpe,
- rate,
- ovamount,
- ovdiscount,
- invtext)
+ type,
+ debtorno,
+ branchcode,
+ trandate,
+ inputdate,
+ prd,
+ reference,
+ tpe,
+ rate,
+ ovamount,
+ ovdiscount,
+ invtext)
VALUES (
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
12,
@@ -426,12 +423,12 @@
if ($BatchReceiptsTotal!=0){
/* Bank account entry first */
$SQL="INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -448,15 +445,15 @@
/*now enter the BankTrans entry */
$SQL="INSERT INTO banktrans (type,
- transno,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
+ transno,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -476,12 +473,12 @@
if ($BatchDebtorTotal!=0){
/* Now Credit Debtors account with receipts + discounts */
$SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -500,12 +497,12 @@
if ($BatchDiscount!=0){
/* Now Debit Discount account with discounts allowed*/
$SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -552,7 +549,7 @@
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name
FROM debtorsmaster
- WHERE debtorsmaster.name LIKE '". $SearchString."'
+ WHERE debtorsmaster.name " . LIKE . " '". $SearchString . "'
AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
} elseif (strlen($_POST['CustCode'])>0){
@@ -665,22 +662,22 @@
$NIL_BALANCE = True;
$SQL = "SELECT debtorsmaster.name,
- debtorsmaster.pymtdiscount,
- currencies.currency,
- currencies.rate,
- paymentterms.terms,
- debtorsmaster.creditlimit,
- debtorsmaster.currcode,
- holdreasons.dissallowinvoices,
- holdreasons.reasondescription
- FROM debtorsmaster,
- paymentterms,
- holdreasons,
- currencies
- WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
- AND debtorsmaster.currcode = currencies.currabrev
- AND debtorsmaster.holdreason = holdreasons.reasoncode
- AND debtorsmaster.debtorno = '" . $_POST['CustomerID'] . "'";
+ debtorsmaster.pymtdiscount,
+ currencies.currency,
+ currencies.rate,
+ paymentterms.terms,
+ debtorsmaster.creditlimit,
+ debtorsmaster.currcode,
+ holdreasons.dissallowinvoices,
+ holdreasons.reasondescription
+ FROM debtorsmaster,
+ paymentterms,
+ holdreasons,
+ currencies
+ WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
+ AND debtorsmaster.currcode = currencies.currabrev
+ AND debtorsmaster.holdreason = holdreasons.reasoncode
+ AND debtorsmaster.debtorno = '" . $_POST['CustomerID'] . "'";
$ErrMsg = _('The customer details could not be retrieved because');
$DbgMsg = _('The SQL that failed was');
@@ -813,7 +810,7 @@
<td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</i></td></tr>';
}
-echo '<tr><td>' . _('Receipt Type') . ":</td><td><select tabindex=6 name=ReceiptType>";
+echo '<tr><td>' . _('Receipt Type') . ':</td><td><select tabindex=6 name="ReceiptType">';
include('includes/GetPaymentMethods.php');
/* The array ReceiptTypes is defined from the setup tab of the main menu under payment methods - the array is populated from the include file GetPaymentMethods.php */
@@ -853,7 +850,7 @@
foreach ($_SESSION['ReceiptBatch']->Items as $ReceiptItem) {
- $SQL = "select accountname FROM chartmaster WHERE accountcode='" . $ReceiptItem->GLCode . "'";
+ $SQL = "SELECT accountname FROM chartmaster WHERE accountcode='" . $ReceiptItem->GLCode . "'";
$Result=DB_query($SQL,$db);
$myrow=DB_fetch_array($Result);
@@ -863,11 +860,9 @@
<td>' . stripslashes($ReceiptItem->CustomerName) . '</td>
<td>'.$ReceiptItem->GLCode.' - '.$myrow['accountname'].'</td>
<td>'.$ReceiptItem->Narrative . "</td>
- <td><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=' . $ReceiptItem->ID . "&Type=".$_GET['Type']."'>" . _('Delete') . '</a></td>
+ <td><a href='" . $_SERVER['PHP_SELF'] . '?Delete=' . $ReceiptItem->ID . "&Type=".$_GET['Type']."'>" . _('Delete') . '</a></td>
</tr>';
-
$BatchTotal= $BatchTotal + $ReceiptItem->Amount;
-
}
echo '<tr><td class=number><b>' . number_format($BatchTotal,2) . '</b></td></tr></table>';
@@ -939,7 +934,7 @@
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
$SQL = 'SELECT tagref,
- tagdescription
+ tagdescription
FROM tags
ORDER BY tagref';
@@ -947,9 +942,9 @@
echo '<option value=0></option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
- echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
echo '</select></td></tr>';
@@ -1075,7 +1070,7 @@
} //end if results to show
if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
- echo '<div class="centre"><br/><input tabindex=13 type=submit name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
+ echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
}
}
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/Customers.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,10 +1,7 @@
<?php
/* $Id$ */
-/* $Revision: 1.44 $ */
-//$PageSecurity = 3;
-
include('includes/session.inc');
$title = _('Customer Maintenance');
@@ -56,9 +53,6 @@
prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
-// } elseif (ContainsIllegalCharacters($_POST['Address1']) OR ContainsIllegalCharacters($_POST['Address2'])) {
-// $InputError = 1;
-// prnMsg( _('Lines of the address must not contain illegal characters'),'error');
} elseif (strlen($_POST['Address1']) >40) {
$InputError = 1;
prnMsg( _('The Line 1 of the address must be forty characters or less long'),'error');
@@ -225,7 +219,7 @@
$ErrMsg = _('The customer could not be updated because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg( _('Customer updated'),'success');
- echo '<br>';
+ echo '<br />';
} else { //it is a new customer
/* set the DebtorNo if $AutoDebtorNo in config.php has been set to
@@ -314,7 +308,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('This customer cannot be deleted because there are transactions that refer to it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions against this customer');
} else {
$sql= "SELECT COUNT(*) FROM salesorders WHERE debtorno='" . $_POST['DebtorNo'] . "'";
@@ -323,7 +317,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('Cannot delete the customer record because orders have been created against it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('orders against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('orders against this customer');
} else {
$sql= "SELECT COUNT(*) FROM salesanalysis WHERE cust='" . $_POST['DebtorNo'] . "'";
$result = DB_query($sql,$db);
@@ -331,7 +325,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('Cannot delete this customer record because sales analysis records exist for it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records against this customer');
} else {
$sql= "SELECT COUNT(*) FROM custbranch WHERE debtorno='" . $_POST['DebtorNo'] . "'";
$result = DB_query($sql,$db);
@@ -339,7 +333,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg(_('Cannot delete this customer because there are branch records set up against it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branch records relating to this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branch records relating to this customer');
}
}
}
@@ -418,7 +412,7 @@
}
// This link is already on menu bar
-//echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID . "'>" . _('Back to Customers') . '</a><br>';
+//echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID . "'>" . _('Back to Customers') . '</a><br />';
if (!isset($DebtorNo)) {
@@ -494,7 +488,7 @@
$result=DB_query('SELECT typeabbrev, sales_type FROM salestypes ',$db);
if (DB_num_rows($result)==0){
$DataError =1;
- echo '<a href="SalesTypes.php?" target="_parent">Setup Types</a>';
+ echo '<a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '</td></tr>';
} else {
echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
@@ -508,10 +502,10 @@
}
// Show Customer Type drop down list
- $result=DB_query('SELECT typeid, typename FROM debtortype ',$db);
+ $result=DB_query('SELECT typeid, typename FROM debtortype', $db);
if (DB_num_rows($result)==0){
$DataError =1;
- echo '<a href="SalesTypes.php?" target="_parent">Setup Types</a>';
+ echo '<a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
} else {
echo '<tr><td>' . _('Customer Type') . ':</td>
@@ -524,12 +518,9 @@
echo '</select></td></tr>';
}
-
-
-
-
$DateString = Date($_SESSION['DefaultDateFormat']);
- echo '<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td><td><input tabindex=10 type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" value="' . $DateString . '" size=12 maxlength=10></td></tr>';
+ echo '<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
+ <td><input tabindex=10 type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" value="' . $DateString . '" size=12 maxlength=10></td></tr>';
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td><input tabindex=11 type="textbox" class="number" name="Discount" value=0 size=5 maxlength=4></td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -594,20 +585,19 @@
echo '</select></td></tr>';
}
- /*added line 8/23/2007 by Morris Kelly to set po line parameter Y/N*/
- echo '<tr><td>' . _('Customer PO Line on SO') . ":</td><td><select tabindex=18 name='CustomerPOLine'>";
- echo '<option selected value=0>' . _('No');
- echo '<option value=1>' . _('Yes');
+ echo '<tr><td>' . _('Customer PO Line on SO') . ':</td><td><select tabindex="18" name="CustomerPOLine">';
+ echo '<option selected value=0>' . _('No') . '</option>';
+ echo '<option value=1>' . _('Yes') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Invoice Addressing') . ":</td><td><select tabindex=19 name='AddrInvBranch'>";
+ echo '<tr><td>' . _('Invoice Addressing') . ':</td><td><select tabindex="19" name="AddrInvBranch">';
echo '<option selected VALUE=0>' . _('Address to HO');
echo '<option VALUE=1>' . _('Address to Branch');
echo '</select></td></tr>';
echo'</table></td></tr></table>';
if ($DataError ==0){
- echo "<br><div class='centre'><input tabindex=20 type='Submit' name='submit' value='" . _('Add New Customer') . "'> <input tabindex=21 type=submit action=RESET VALUE='" . _('Reset') . "'></div>";
+ echo "<br /><div class='centre'><input tabindex=20 type='Submit' name='submit' value='" . _('Add New Customer') . "'> <input tabindex=21 type=submit action=RESET VALUE='" . _('Reset') . "'></div>";
}
echo '</form>';
@@ -990,7 +980,7 @@
Where debtorno='".$DebtorNo."'
and contid='".$Edit."'";
$resultupcc = DB_query($SQLupdatecc,$db);
- echo '<br>'.$SQLupdatecc;
+ echo '<br />'.$SQLupdatecc;
echo '<meta http-equiv="Refresh" content="0; url="' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'&ID='.$ID.'">';
}
if (isset($_GET['delete'])) {
@@ -999,7 +989,7 @@
$resultupcc = DB_query($SQl,$db);
echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'">';
- echo '<br>'.$SQl;
+ echo '<br />'.$SQl;
prnmsg('Contact Deleted','success');
}
@@ -1007,18 +997,18 @@
echo'</td></tr></table>';
if (isset($_POST['New']) and $_POST['New']) {
- echo "<div class='centre'><input type='Submit' name='submit' VALUE='" . _('Add New Customer') .
- "'> <input type=submit name='reset' VALUE='" . _('Reset') . "'></div></form>";
+ echo '<div class="centre"><input type="Submit" name="submit" VALUE="' . _('Add New Customer') .
+ '"> <input type=submit name="reset" VALUE="' . _('Reset') . '"></div></form>';
} else if (!isset($_GET['Modify'])){
- echo "<br><div class='centre'><input type='Submit' name='submit' VALUE='" . _('Update Customer') . "'>";
+ echo '<br /><div class="centre"><input type="Submit" name="submit" VALUE="' . _('Update Customer') . '">';
echo ' <input type="Submit" name="delete" VALUE="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
}
if(isset($_POST['addcontact']) AND (isset($_POST['addcontact'])!=''))
{
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?' . SID . '&DebtorNo=' .$DebtorNo.'">';
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?DebtorNo=' .$DebtorNo.'">';
}
echo '</div>';
} // end of main ifs
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/MRP.php
===========================================...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-29 09:04:29
|
Revision: 4521
http://web-erp.svn.sourceforge.net/web-erp/?rev=4521&view=rev
Author: daintree
Date: 2011-03-29 09:04:20 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
SQL to ansi and other html to xhtml
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/Credit_Invoice.php
trunk/CustomerReceipt.php
trunk/Customers.php
trunk/MRP.php
trunk/api/api_branches.php
trunk/api/api_currencies.php
trunk/api/api_customers.php
trunk/api/api_customertypes.php
trunk/api/api_glaccounts.php
trunk/api/api_holdreasons.php
trunk/api/api_locations.php
trunk/api/api_salesareas.php
trunk/api/api_salesman.php
trunk/api/api_salesorders.php
trunk/api/api_salestypes.php
trunk/api/api_shippers.php
trunk/api/api_stock.php
trunk/api/api_stockcategories.php
trunk/api/api_suppliers.php
trunk/api/api_taxgroups.php
trunk/api/api_workorders.php
trunk/includes/ConnectDB_mysql.inc
Added Paths:
-----------
trunk/locale/zh_CN.utf8/Manual/ManualSalesAnalysis.html
trunk/locale/zh_CN.utf8/Manual/ManualSalesPeople.html
trunk/locale/zh_CN.utf8/Manual/ManualShipments.html
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMExtendedQty.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,8 +2,6 @@
/* $Id$*/
-/* $Revision: 1.8 $ */
-
// BOMExtendedQty.php - Quantiy Extended Bill of Materials
//$PageSecurity = 2;
include('includes/session.inc');
@@ -30,7 +28,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa double,
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -43,7 +41,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -56,8 +54,9 @@
(" . $_POST['Quantity'] . " * bom.quantity) as extendedqpa,
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -82,8 +81,9 @@
bom.effectiveto,
(" . $_POST['Quantity'] . " * bom.quantity) as extendedqpa
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "</br>sql is $sql</br>";
// This while routine finds the other levels as long as $componentctr - the
@@ -114,7 +114,8 @@
(bom.quantity * passbom.extendedqpa)
FROM bom,passbom
WHERE bom.parent = passbom.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$sql = 'DROP TABLE IF EXISTS passbom2';
@@ -129,7 +130,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa decimal(10,3),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
@@ -138,13 +139,15 @@
(bom.quantity * passbom2.extendedqpa),
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
- WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent = passbom2.part
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $sql = 'SELECT COUNT(*) FROM bom,passbom WHERE bom.parent = passbom.part
- GROUP BY passbom.part';
+ $sql = 'SELECT COUNT(*) FROM bom, passbom
+ WHERE bom.parent = passbom.part
+ GROUP BY passbom.part';
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -156,9 +159,9 @@
$title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Quantiy Extended BOM Listing could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
- echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$sql";
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -168,11 +171,11 @@
$Right_Margin);
$sql = "SELECT stockmaster.stockid,stockmaster.description
FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
- $assembly = $_POST['Part'];
- $assemblydesc = $myrow['description'];
+ $Assembly = $_POST['Part'];
+ $AssemblyDescription = $myrow['description'];
$FontSize=8;
$Tot_Val=0;
@@ -209,14 +212,12 @@
$ListCount = DB_num_rows($result); // UldisN
While ($myrow = DB_fetch_array($result,$db)){
-
-
// Parameters for addTextWrap are defined in /includes/class.pdf.php
// 1) X position 2) Y position 3) Width
// 4) Height 5) Text 6) Alignment 7) Border 8) Fill - True to use SetFillColor
// and False to set to transparent
- $difference = $myrow['quantity'] - ($myrow['qoh'] + $myrow['poqty'] + $myrow['woqty']);
- if (($_POST['Select'] == 'All') or ($difference > 0)) {
+ $Difference = $myrow['quantity'] - ($myrow['qoh'] + $myrow['poqty'] + $myrow['woqty']);
+ if (($_POST['Select'] == 'All') or ($Difference > 0)) {
$YPos -=$line_height;
$FontSize=8;
// Use to alternate between lines with transparent and painted background
@@ -234,7 +235,7 @@
$myrow['decimalplaces']),'right',0,$fill);
$pdf->addTextWrap(440,$YPos,40,$FontSize,number_format($myrow['woqty'],
$myrow['decimalplaces']),'right',0,$fill);
- $pdf->addTextWrap(480,$YPos,50,$FontSize,number_format($difference,
+ $pdf->addTextWrap(480,$YPos,50,$FontSize,number_format($Difference,
$myrow['decimalplaces']),'right',0,$fill);
}
if ($YPos < $Bottom_Margin + $line_height){
@@ -251,33 +252,18 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
}
-/* Uldisn:This actually would produce the output
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-*/
-// if ($len<=20){
- if ($ListCount == 0) { //UldisN
- $title = _('Print Indented BOM Listing Error');
- include('includes/header.inc');
- prnMsg(_('There were no items for the selected assembly'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
- include('includes/footer.inc');
- exit;
+ if ($ListCount == 0) {
+ $title = _('Print Indented BOM Listing Error');
+ include('includes/header.inc');
+ prnMsg(_('There were no items for the selected assembly'),'error');
+ echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
} else {
-/* UldisN
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=Customer_trans.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOM_Extended_Qty_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
+ }
- $pdf->Output('BOMExtendedQty', 'I');
-*/
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
- }
-
} else { /*The option to print PDF was not hit so display form */
$title=_('Quantity Extended BOM Listing');
@@ -297,7 +283,7 @@
echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines');
echo "<option value='no'>" . _('Plain Print');
echo '</select></td></tr>';
- echo "</table></br></br><div class='centre'><br><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
+ echo "</table></br></br><div class='centre'><br /><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
include('includes/footer.inc');
@@ -348,6 +334,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader function
-
-
?>
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMIndented.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,10 +2,8 @@
/* $Id$*/
-/* $Revision: 1.5 $ */
-
// BOMIndented.php - Indented Bill of Materials
-//$PageSecurity = 2;
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -25,7 +23,7 @@
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -38,7 +36,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -50,8 +48,9 @@
SELECT bom.component AS part,
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
- WHERE bom.parent =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.parent ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -77,7 +76,8 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "</br>sql is $sql</br>";
// This while routine finds the other levels as long as $componentctr - the
@@ -107,7 +107,7 @@
bom.effectiveafter,
bom.effectiveto,
bom.quantity
- FROM bom,passbom
+ FROM bom, passbom
WHERE bom.parent = passbom.part
AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -123,16 +123,17 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
- $sql = "INSERT INTO passbom (part, sortpart)
+ $sql = 'INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()';
$result = DB_query($sql,$db);
@@ -181,9 +182,9 @@
// $fill is used to alternate between lines with transparent and painted background
$fill = false;
- $pdf->SetFillColor(224,235,255);
+ $pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result); // UldisN
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -239,19 +240,8 @@
include('includes/footer.inc');
exit;
} else {
- /* UldisN
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=Customer_trans.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('BOMIndented.pdf', 'I');
- */
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
-
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
@@ -333,5 +323,4 @@
} // End of PrintHeader function
-
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/BOMIndentedReverse.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -2,11 +2,9 @@
/* $Id$*/
-/* $Revision: 1.1 $ */
-
// BOMIndented.php - Reverse Indented Bill of Materials - From lowest level component to top level
// assembly
-//$PageSecurity = 2;
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -26,7 +24,8 @@
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
+
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
@@ -39,7 +38,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double)';
+ quantity double) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// First, find first level of components below requested assembly
// Put those first level parts in passbom, use COMPONENT in passbom
@@ -51,8 +50,9 @@
SELECT bom.parent AS part,
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
- WHERE bom.component =" . "'" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ WHERE bom.component ='" . $_POST['Part'] . "'
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$levelctr = 2;
@@ -78,7 +78,8 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
// This while routine finds the other levels as long as $componentctr - the
@@ -107,9 +108,10 @@
bom.effectiveafter,
bom.effectiveto,
bom.quantity
- FROM bom,passbom
- WHERE bom.component = passbom.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ FROM bom,passbom
+ WHERE bom.component = passbom.part
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$sql = 'DROP TABLE IF EXISTS passbom2';
@@ -123,7 +125,7 @@
$sql = 'CREATE TEMPORARY TABLE passbom (
part char(20),
- sortpart text)';
+ sortpart text) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db);
@@ -132,7 +134,8 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= NOW() AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= NOW()
+ AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -160,7 +163,7 @@
$sql = "SELECT stockmaster.stockid,
stockmaster.description
FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$assembly = $_POST['Part'];
@@ -222,12 +225,6 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$assemblydesc);
}
-/* UldisN
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
-*/
if ($ListCount == 0) {
$title = _('Print Reverse Indented BOM Listing Error');
include('includes/header.inc');
@@ -236,16 +233,8 @@
include('includes/footer.inc');
exit;
} else {
-// header('Content-type: application/pdf');
-// header("Content-Length: " . $len);
-// header('Content-Disposition: inline; filename=Customer_trans.pdf');
-// header('Expires: 0');
-// header('Cache-Control: private, post-check=0, pre-check=0');
-// header('Pragma: public');
-//
-// $pdf->Output('BOMIndentedReverse.pdf', 'I');
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
- $pdf-> __destruct();
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct();
}
} else { /*The option to print PDF was not hit so display form */
@@ -255,7 +244,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . " method='post'><table class=selection>";
+ echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . ' method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><td>' . _('Part') . ":</td>";
echo "<td><input type ='text' name='Part' size='20'>";
@@ -319,5 +308,4 @@
} // End of PrintHeader function
-
-?>
+?>
\ No newline at end of file
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/COGSGLPostings.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -58,7 +58,7 @@
$result = DB_query($sql,$db);
prnMsg ($msg,'info');
- echo '<br>';
+ echo '<br />';
unset ($SelectedCOGSPostingID);
} elseif (isset($_GET['delete'])) {
@@ -67,7 +67,7 @@
$sql="DELETE FROM cogsglpostings WHERE id='".$SelectedCOGSPostingID."'";
$result = DB_query($sql,$db);
prnMsg( _('The cost of sales posting code record has been deleted'),'info');
- echo '<br>';
+ echo '<br />';
unset ($SelectedCOGSPostingID);
}
@@ -90,11 +90,11 @@
$ShowLivePostingRecords = false;
prnMsg (_('The following cost of sales posting records that do not have valid general ledger code specified - these records must be amended.'),'error');
echo '<table class=selection>';
- echo "<tr><th>" . _('Area') . "</th>
- <th>" . _('Stock Category') . "</th>
- <th>" . _('Sales Type') . "</th>
- <th>" . _('COGS Account') . "</th>
- </tr>";
+ echo '<tr><th>' . _('Area') . '</th>
+ <th>' . _('Stock Category') . '</th>
+ <th>' . _('Sales Type') . '</th>
+ <th>' . _('COGS Account') . '</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow = DB_fetch_row($result)) {
@@ -116,9 +116,9 @@
$myrow[2],
$myrow[3],
$myrow[4],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
- $_SERVER['PHP_SELF']. '?' . SID . '&',
+ $_SERVER['PHP_SELF']. '?',
$myrow[0]);
}//end while
echo '</table>';
@@ -146,13 +146,13 @@
sequenceintb
) VALUES (
'Sales',
- 1,
- 1,
- 10)";
+ '1',
+ '1',
+ '10')";
$result = DB_query($sql,$db);
}
- $sql = 'SELECT accountcode FROM chartmaster WHERE accountcode =1';
+ $sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1' ";
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
/* account number 1 is not used, so insert a new account */
@@ -162,7 +162,7 @@
group_
)
VALUES (
- 1,
+ '1',
'Default Sales/Discounts',
'Sales'
)";
@@ -177,7 +177,7 @@
VALUES ('AN',
'ANY',
'AN',
- 1)";
+ '1')";
$result = DB_query($sql,$db);
}
@@ -194,14 +194,11 @@
$result = DB_query($sql,$db);
echo '<table class=selection>';
- echo '<tr><th>' . _('Area') .
- '</th><th>' . _('Stock Category') .
- '</th><th>' . _('Sales Type') .
- '</th><th>' . _('GL Account') .
- '</th></tr>';
-
+ echo '<tr><th>' . _('Area') . '</th>
+ <th>' . _('Stock Category') . '</th>
+ <th>' . _('Sales Type') . '</th>
+ <th>' . _('GL Account') . '</th></tr>';
$k = 0;
-
while ($myrow = DB_fetch_row($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
@@ -222,9 +219,9 @@
$myrow[2],
$myrow[3],
$myrow[4],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
- $_SERVER['PHP_SELF'] . '?' . SID . '&',
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0]);
}//END WHILE LIST LOOP
@@ -234,12 +231,12 @@
//end of ifs and buts!
if (isset($SelectedCOGSPostingID)) {
- echo "<div class='centre'><a href=" . $_SERVER['PHP_SELF'] .">" . _('Show all cost of sales posting records') . "</a></div>";
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Show all cost of sales posting records') . '</a></div>';
}
-echo "<p>";
+echo '<p />';
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . ">";
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedCOGSPostingID)) {
@@ -265,20 +262,23 @@
} //end of if $SelectedCOGSPostingID only do the else when a new record is being entered
-$sql = "SELECT areacode,
+$sql = 'SELECT areacode,
areadescription
- FROM areas";
+ FROM areas';
$result = DB_query($sql,$db);
-echo "<table class=selection><tr><td>" . _('Area') . ":</td><td><select tabindex=1 name='Area'><option value='AN'>" . _('Any Other');
+echo '<table class=selection>
+ <tr><td>' . _('Area') . ':</td>
+ <td><select tabindex=1 name="Area">
+ <option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['Area']) and $myrow['areacode']==$_POST['Area']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['areacode'] . "'>" . $myrow['areadescription'];
+ echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} //end while loop
DB_free_result($result);
@@ -286,16 +286,18 @@
$sql = 'SELECT categoryid, categorydescription FROM stockcategory';
$result = DB_query($sql,$db);
-echo "</select></td></tr><tr><td>" . _('Stock Category') . ":</td><td><select tabindex=2 name='StkCat'>
- <option VALUE='ANY'>" . _('Any Other');
+echo '</select></td></tr>
+ <tr><td>' . _('Stock Category') . ':</td>
+ <td><select tabindex=2 name="StkCat">
+ <option VALUE="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['StkCat']) and $myrow["categoryid"]==$_POST['StkCat']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['categoryid'] . "'>" . $myrow['categorydescription'];
+ echo $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} //end while loop
@@ -304,23 +306,27 @@
$sql = 'SELECT typeabbrev, sales_type FROM salestypes';
$result = DB_query($sql,$db);
-echo "</select></td></tr><tr><td>" . _('Sales Type') . " / " . _('Price List') . ":</td>
- <td><select tabindex=3 name='SalesType'><option VALUE='AN'>" . _('Any Other');
+echo '</select></td></tr>
+ <tr><td>' . _('Sales Type') . ' / ' . _('Price List') . ':</td>
+ <td><select tabindex=3 name="SalesType">
+ <option VALUE="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow["typeabbrev"] . "'>" . $myrow['sales_type'];
+ echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
} //end while loop
-echo "</select></td></tr><tr><td>" . _('Post to GL account') . ":</td><td><select tabindex=4 name='GLCode'>";
+echo '</select></td></tr>
+ <tr><td>' . _('Post to GL account') . ':</td>
+ <td><select tabindex="4" name="GLCode">';
DB_free_result($result);
-$sql = "SELECT chartmaster.accountcode,
+$sql = 'SELECT chartmaster.accountcode,
chartmaster.accountname
FROM chartmaster,
accountgroups
@@ -328,23 +334,23 @@
AND accountgroups.pandl=1
ORDER BY accountgroups.sequenceintb,
chartmaster.accountcode,
- chartmaster.accountname";
+ chartmaster.accountname';
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['GLCode']) and $myrow['accountcode']==$_POST['GLCode']) {
- echo "<option selected VALUE='";
+ echo '<option selected VALUE="';
} else {
- echo "<option VALUE='";
+ echo '<option VALUE="';
}
- echo $myrow['accountcode'] . "'>" . $myrow['accountcode'] . ' - ' . $myrow['accountname'];
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} //end while loop
DB_free_result($result);
-echo "</select></td></tr></table>";
-echo "<br><div class='centre'><input tabindex=5 type='Submit' name='submit' value=" . _('Enter Information') . "></form></div>";
+echo '</select></td></tr></table>';
+echo '<br /><div class="centre"><input tabindex="5" type="Submit" name="submit" value="' . _('Enter Information') . '"></form></div>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/CompanyPreferences.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,10 +1,7 @@
<?php
-/* $Revision: 1.18 $ */
/* $Id$*/
-//$PageSecurity =10;
-
include('includes/session.inc');
$title = _('Company Preferences');
@@ -133,13 +130,13 @@
/* Alter the exchange rates in the currencies table */
/* Get default currency rate */
- $sql='SELECT rate from currencies WHERE currabrev="'.$_POST['CurrencyDefault'].'"';
+ $sql="SELECT rate from currencies WHERE currabrev='" . $_POST['CurrencyDefault'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
$NewCurrencyRate=$myrow[0];
/* Set new rates */
- $sql='UPDATE currencies SET rate=rate/"'.$NewCurrencyRate.'"';
+ $sql="UPDATE currencies SET rate=rate/'".$NewCurrencyRate."'";
$ErrMsg = _('Could not update the currency rates');
$result = DB_query($sql,$db,$ErrMsg);
@@ -163,36 +160,34 @@
echo '<table class=selection>';
if ($InputError != 1) {
- $sql = "SELECT coyname,
- gstno,
- companynumber,
- regoffice1,
- regoffice2,
- regoffice3,
- regoffice4,
- regoffice5,
- regoffice6,
- telephone,
- fax,
- email,
- currencydefault,
- debtorsact,
- pytdiscountact,
- creditorsact,
- payrollact,
- grnact,
- exchangediffact,
- purchasesexchangediffact,
- retainedearnings,
- gllink_debtors,
- gllink_creditors,
- gllink_stock,
- freightact
- FROM companies
- WHERE coycode=1";
+ $sql = 'SELECT coyname,
+ gstno,
+ companynumber,
+ regoffice1,
+ regoffice2,
+ regoffice3,
+ regoffice4,
+ regoffice5,
+ regoffice6,
+ telephone,
+ fax,
+ email,
+ currencydefault,
+ debtorsact,
+ pytdiscountact,
+ creditorsact,
+ payrollact,
+ grnact,
+ exchangediffact,
+ purchasesexchangediffact,
+ retainedearnings,
+ gllink_debtors,
+ gllink_creditors,
+ gllink_stock,
+ freightact
+ FROM companies
+ WHERE coycode=1';
-
-
$ErrMsg = _('The company preferences could not be retrieved because');
$result = DB_query($sql, $db,$ErrMsg);
@@ -275,15 +270,15 @@
</tr>';
-$result=DB_query("SELECT currabrev, currency FROM currencies",$db);
+$result=DB_query('SELECT currabrev, currency FROM currencies',$db);
echo '<tr><td>' . _('Home Currency') . ':</td><td><select tabindex="13" Name=CurrencyDefault>';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrencyDefault']==$myrow['currabrev']){
- echo "<option selected VALUE='". $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option selected VALUE="'. $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
} else {
- echo "<option VALUE='". $myrow['currabrev'] . "'>" . $myrow['currency'];
+ echo '<option VALUE="' . $myrow['currabrev'] . '">' . $myrow['currency']. '</option>';
}
} //end while loop
@@ -291,21 +286,21 @@
echo '</select></td></tr>';
-$result=DB_query("SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
- AND accountgroups.pandl=0
- ORDER BY chartmaster.accountcode",$db);
+$result=DB_query('SELECT accountcode,
+ accountname
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0
+ ORDER BY chartmaster.accountcode',$db);
-echo '<tr><td>' . _('Debtors Control GL Account') . ':</td><td><select tabindex="14" Name=DebtorsAct>';
+echo '<tr><td>' . _('Debtors Control GL Account') . ':</td>
+ <td><select tabindex="14" Name=DebtorsAct>';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['DebtorsAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -317,9 +312,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['CreditorsAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="' . $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -331,9 +326,9 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PayrollAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -345,22 +340,23 @@
while ($myrow = DB_fetch_row($result)) {
if ($_POST['GRNAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
DB_data_seek($result,0);
echo '</select></td></tr>';
-echo '<tr><td>' . _('Retained Earning Clearing GL Account') . ':</td><td><select tabindex="18" Name=RetainedEarnings>';
+echo '<tr><td>' . _('Retained Earning Clearing GL Account') . ':</td>
+ <td><select tabindex="18" Name="RetainedEarnings">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['RetainedEarnings']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -368,21 +364,21 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Freight Re-charged GL Account') . ':</td><td><select tabindex="19" Name=FreightAct>';
+echo '<tr><td>' . _('Freight Re-charged GL Account') . ':</td>
+ <td><select tabindex="19" Name="FreightAct">';
$result=DB_query('SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
- AND accountgroups.pandl=1
- ORDER BY chartmaster.accountcode',$db);
+ accountname
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=1
+ ORDER BY chartmaster.accountcode',$db);
while ($myrow = DB_fetch_row($result)) {
if ($_POST['FreightAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -390,13 +386,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Sales Exchange Variances GL Account') . ':</td><td><select tabindex="20" Name=ExchangeDiffAct>';
+echo '<tr><td>' . _('Sales Exchange Variances GL Account') . ':</td>
+ <td><select tabindex="20" Name="ExchangeDiffAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['ExchangeDiffAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -404,13 +401,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Purchases Exchange Variances GL Account') . ':</td><td><select tabindex="21" Name=PurchasesExchangeDiffAct>';
+echo '<tr><td>' . _('Purchases Exchange Variances GL Account') . ':</td>
+ <td><select tabindex="21" Name="PurchasesExchangeDiffAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PurchasesExchangeDiffAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -418,13 +416,14 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Payment Discount GL Account') . ':</td><td><select tabindex="22" Name=PytDiscountAct>';
+echo '<tr><td>' . _('Payment Discount GL Account') . ':</td>
+ <td><select tabindex="22" Name="PytDiscountAct">';
while ($myrow = DB_fetch_row($result)) {
if ($_POST['PytDiscountAct']==$myrow[0]){
- echo "<option selected VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option selected VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
} else {
- echo "<option VALUE='". $myrow[0] . "'>" . $myrow[1] . ' ('.$myrow[0].')';
+ echo '<option VALUE="'. $myrow[0] . '">' . $myrow[1] . ' ('.$myrow[0].')</option>';
}
} //end while loop
@@ -432,44 +431,47 @@
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for accounts receivable transactions') . ':</td><td><select tabindex="23" Name=GLLink_Debtors>';
+echo '<tr><td>' . _('Create GL entries for accounts receivable transactions') . ':</td>
+ <td><select tabindex="23" Name="GLLink_Debtors">';
if ($_POST['GLLink_Debtors']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes'). '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes'). '</option>';
+ echo '<option VALUE="0">' . _('No'). '</option>';
}
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for accounts payable transactions') . ':</td><td><select tabindex="24" Name=GLLink_Creditors>';
+echo '<tr><td>' . _('Create GL entries for accounts payable transactions') . ':</td>
+ <td><select tabindex="24" Name="GLLink_Creditors">';
if ($_POST['GLLink_Creditors']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes') . '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes') . '</option>';
+ echo '<option VALUE="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
-echo '<tr><td>' . _('Create GL entries for stock transactions') . '):</td><td><select tabindex="25" Name=GLLink_Stock>';
+echo '<tr><td>' . _('Create GL entries for stock transactions') . '):</td>
+ <td><select tabindex="25" Name="GLLink_Stock">';
-if ($_POST['GLLink_Stock']==0){
- echo '<option selected VALUE=0>' . _('No');
- echo '<option VALUE=1>' . _('Yes');
+if ($_POST['GLLink_Stock']=='0'){
+ echo '<option selected VALUE="0">' . _('No') . '</option>';
+ echo '<option VALUE="1">' . _('Yes') . '</option>';
} else {
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
+ echo '<option selected VALUE="1">' . _('Yes') . '</option>';
+ echo '<option VALUE="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br><div class="centre"><input tabindex="26" type="Submit" Name="submit" value="' . _('Update') . '"></div>';
+echo '</table><br /><div class="centre"><input tabindex="26" type="Submit" Name="submit" value="' . _('Update') . '"></div>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/Credit_Invoice.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -257,28 +257,28 @@
if (!isset($_POST['ProcessCredit'])) {
- echo "<form action='" . $_SERVER['PHP_SELF'] . "?" . SID . "' method=post>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] .'" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo "<table cellpadding=2 colspan=7 class=selection><tr>";
- echo "<tr><th colspan=13>";
+ echo '<table cellpadding="2" colspan="7" class="selection"><tr>';
+ echo '<tr><th colspan="13">';
echo '<div class="centre"><font color=blue size=4><b>' . _('Credit Invoice') . ' ' . $_SESSION['ProcessingCredit'] . '</b>
<b>'.' - ' . $_SESSION['CreditItems']->CustomerName . '</b></font>
- <font size=3 color=blue> - ' . _('Credit Note amounts stated in') . ' ' . $_SESSION['CreditItems']->DefaultCurrency . "</div></font>";
- echo "</th></tr>";
- echo "<th>" . _('Item Code') . "</th>
- <th>" . _('Item Description') . "</th>
- <th>" . _('Invoiced') . "</th>
- <th>" . _('Units') . "</th>
- <th>" . _('Credit') . '<br>' . _('Quantity') . "</th>
- <th>" . _('Price') . "</th>
- <th>" . _('Discount') . ' %' . "</th>
- <th>" . _('Total') . '<br>' . _('Excl Tax') . "</th>
- <th>" . _('Tax Authority') . "</th>
- <th>" . _('Tax') . ' %' . "</th>
- <th>" . _('Tax') . '<br>' . _('Amount') . "</th>
- <th>" . _('Total') . '<br>' . _('Incl Tax') . "</th></tr>";
+ <font size=3 color=blue> - ' . _('Credit Note amounts stated in') . ' ' . $_SESSION['CreditItems']->DefaultCurrency . '</div></font>';
+ echo '</th></tr>';
+ echo '<th>' . _('Item Code') . '</th>
+ <th>' . _('Item Description') . '</th>
+ <th>' . _('Invoiced') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Credit') . '<br />' . _('Quantity') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Discount') . ' %' . '</th>
+ <th>' . _('Total') . '<br />' . _('Excl Tax') . '</th>
+ <th>' . _('Tax Authority') . '</th>
+ <th>' . _('Tax') . ' %' . '</th>
+ <th>' . _('Tax') . '<br />' . _('Amount') . '</th>
+ <th>' . _('Total') . '<br />' . _('Incl Tax') . '</th></tr>';
$_SESSION['CreditItems']->total = 0;
$_SESSION['CreditItems']->totalVolume = 0;
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/CustomerReceipt.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,11 +1,8 @@
<?php
/* $Id$ */
-/* $Revision: 1.46 $ */
include('includes/DefineReceiptClass.php');
-
-//$PageSecurity = 3; now retrieved from the DB
include('includes/session.inc');
$title = _('Receipt Entry');
@@ -127,7 +124,7 @@
$SuggestedFunctionalExRate = $myrow[0];
/*Get the exchange rate between the functional currency and the receipt currency*/
- $result = DB_query("select rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->Currency . "'",$db);
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->Currency . "'",$db);
$myrow = DB_fetch_row($result);
$tableExRate = $myrow[0]; //this is the rate of exchange between the functional currency and the receipt currency
/*Calculate cross rate to suggest appropriate exchange rate between receipt currency and account currency */
@@ -212,7 +209,7 @@
}
/*Make an array of the defined bank accounts */
- $SQL = "SELECT accountcode FROM bankaccounts";
+ $SQL = 'SELECT accountcode FROM bankaccounts';
$result = DB_query($SQL,$db);
$BankAccounts = array();
$i=0;
@@ -267,13 +264,13 @@
if ($ReceiptItem->GLCode !=''){ //so its a GL receipt
if ($_SESSION['CompanyRecord']['gllink_debtors']==1){ /* then enter a GLTrans record */
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount,
- tag)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount,
+ tag)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -341,15 +338,15 @@
$PaymentTransNo = GetNextTransNo( 1, $db);
$SQL="INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode)
VALUES (
'" . $PaymentTransNo . "',
1,
@@ -374,18 +371,18 @@
/*Create a DebtorTrans entry for each customer deposit */
$SQL = "INSERT INTO debtortrans (transno,
- type,
- debtorno,
- branchcode,
- trandate,
- inputdate,
- prd,
- reference,
- tpe,
- rate,
- ovamount,
- ovdiscount,
- invtext)
+ type,
+ debtorno,
+ branchcode,
+ trandate,
+ inputdate,
+ prd,
+ reference,
+ tpe,
+ rate,
+ ovamount,
+ ovdiscount,
+ invtext)
VALUES (
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
12,
@@ -426,12 +423,12 @@
if ($BatchReceiptsTotal!=0){
/* Bank account entry first */
$SQL="INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -448,15 +445,15 @@
/*now enter the BankTrans entry */
$SQL="INSERT INTO banktrans (type,
- transno,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
+ transno,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -476,12 +473,12 @@
if ($BatchDebtorTotal!=0){
/* Now Credit Debtors account with receipts + discounts */
$SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -500,12 +497,12 @@
if ($BatchDiscount!=0){
/* Now Debit Discount account with discounts allowed*/
$SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
@@ -552,7 +549,7 @@
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name
FROM debtorsmaster
- WHERE debtorsmaster.name LIKE '". $SearchString."'
+ WHERE debtorsmaster.name " . LIKE . " '". $SearchString . "'
AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
} elseif (strlen($_POST['CustCode'])>0){
@@ -665,22 +662,22 @@
$NIL_BALANCE = True;
$SQL = "SELECT debtorsmaster.name,
- debtorsmaster.pymtdiscount,
- currencies.currency,
- currencies.rate,
- paymentterms.terms,
- debtorsmaster.creditlimit,
- debtorsmaster.currcode,
- holdreasons.dissallowinvoices,
- holdreasons.reasondescription
- FROM debtorsmaster,
- paymentterms,
- holdreasons,
- currencies
- WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
- AND debtorsmaster.currcode = currencies.currabrev
- AND debtorsmaster.holdreason = holdreasons.reasoncode
- AND debtorsmaster.debtorno = '" . $_POST['CustomerID'] . "'";
+ debtorsmaster.pymtdiscount,
+ currencies.currency,
+ currencies.rate,
+ paymentterms.terms,
+ debtorsmaster.creditlimit,
+ debtorsmaster.currcode,
+ holdreasons.dissallowinvoices,
+ holdreasons.reasondescription
+ FROM debtorsmaster,
+ paymentterms,
+ holdreasons,
+ currencies
+ WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
+ AND debtorsmaster.currcode = currencies.currabrev
+ AND debtorsmaster.holdreason = holdreasons.reasoncode
+ AND debtorsmaster.debtorno = '" . $_POST['CustomerID'] . "'";
$ErrMsg = _('The customer details could not be retrieved because');
$DbgMsg = _('The SQL that failed was');
@@ -813,7 +810,7 @@
<td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</i></td></tr>';
}
-echo '<tr><td>' . _('Receipt Type') . ":</td><td><select tabindex=6 name=ReceiptType>";
+echo '<tr><td>' . _('Receipt Type') . ':</td><td><select tabindex=6 name="ReceiptType">';
include('includes/GetPaymentMethods.php');
/* The array ReceiptTypes is defined from the setup tab of the main menu under payment methods - the array is populated from the include file GetPaymentMethods.php */
@@ -853,7 +850,7 @@
foreach ($_SESSION['ReceiptBatch']->Items as $ReceiptItem) {
- $SQL = "select accountname FROM chartmaster WHERE accountcode='" . $ReceiptItem->GLCode . "'";
+ $SQL = "SELECT accountname FROM chartmaster WHERE accountcode='" . $ReceiptItem->GLCode . "'";
$Result=DB_query($SQL,$db);
$myrow=DB_fetch_array($Result);
@@ -863,11 +860,9 @@
<td>' . stripslashes($ReceiptItem->CustomerName) . '</td>
<td>'.$ReceiptItem->GLCode.' - '.$myrow['accountname'].'</td>
<td>'.$ReceiptItem->Narrative . "</td>
- <td><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=' . $ReceiptItem->ID . "&Type=".$_GET['Type']."'>" . _('Delete') . '</a></td>
+ <td><a href='" . $_SERVER['PHP_SELF'] . '?Delete=' . $ReceiptItem->ID . "&Type=".$_GET['Type']."'>" . _('Delete') . '</a></td>
</tr>';
-
$BatchTotal= $BatchTotal + $ReceiptItem->Amount;
-
}
echo '<tr><td class=number><b>' . number_format($BatchTotal,2) . '</b></td></tr></table>';
@@ -939,7 +934,7 @@
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
$SQL = 'SELECT tagref,
- tagdescription
+ tagdescription
FROM tags
ORDER BY tagref';
@@ -947,9 +942,9 @@
echo '<option value=0></option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
- echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
echo '</select></td></tr>';
@@ -1075,7 +1070,7 @@
} //end if results to show
if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
- echo '<div class="centre"><br/><input tabindex=13 type=submit name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
+ echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
}
}
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-03-28 09:49:25 UTC (rev 4520)
+++ trunk/Customers.php 2011-03-29 09:04:20 UTC (rev 4521)
@@ -1,10 +1,7 @@
<?php
/* $Id$ */
-/* $Revision: 1.44 $ */
-//$PageSecurity = 3;
-
include('includes/session.inc');
$title = _('Customer Maintenance');
@@ -56,9 +53,6 @@
prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
-// } elseif (ContainsIllegalCharacters($_POST['Address1']) OR ContainsIllegalCharacters($_POST['Address2'])) {
-// $InputError = 1;
-// prnMsg( _('Lines of the address must not contain illegal characters'),'error');
} elseif (strlen($_POST['Address1']) >40) {
$InputError = 1;
prnMsg( _('The Line 1 of the address must be forty characters or less long'),'error');
@@ -225,7 +219,7 @@
$ErrMsg = _('The customer could not be updated because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg( _('Customer updated'),'success');
- echo '<br>';
+ echo '<br />';
} else { //it is a new customer
/* set the DebtorNo if $AutoDebtorNo in config.php has been set to
@@ -314,7 +308,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('This customer cannot be deleted because there are transactions that refer to it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions against this customer');
} else {
$sql= "SELECT COUNT(*) FROM salesorders WHERE debtorno='" . $_POST['DebtorNo'] . "'";
@@ -323,7 +317,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('Cannot delete the customer record because orders have been created against it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('orders against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('orders against this customer');
} else {
$sql= "SELECT COUNT(*) FROM salesanalysis WHERE cust='" . $_POST['DebtorNo'] . "'";
$result = DB_query($sql,$db);
@@ -331,7 +325,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg( _('Cannot delete this customer record because sales analysis records exist for it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records against this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('sales analysis records against this customer');
} else {
$sql= "SELECT COUNT(*) FROM custbranch WHERE debtorno='" . $_POST['DebtorNo'] . "'";
$result = DB_query($sql,$db);
@@ -339,7 +333,7 @@
if ($myrow[0]>0) {
$CancelDelete = 1;
prnMsg(_('Cannot delete this customer because there are branch records set up against it'),'warn');
- echo '<br> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branch records relating to this customer');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branch records relating to this customer');
}
}
}
@@ -418,7 +412,7 @@
}
// This link is already on menu bar
-//echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID . "'>" . _('Back to Customers') . '</a><br>';
+//echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID . "'>" . _('Back to Customers') . '</a><br />';
if (!isset($DebtorNo)) {
@@ -494,7 +488,7 @@
$result=DB_query('SELECT typeabbrev, sales_type FROM salestypes ',$db);
if (DB_num_rows($result)==0){
$DataError =1;
- echo '<a href="SalesTypes.php?" target="_parent">Setup Types</a>';
+ echo '<a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '</td></tr>';
} else {
echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
@@ -508,10 +502,10 @@
}
// Show Customer Type drop down list
- $result=DB_query('SELECT typeid, typename FROM debtortype ',$db);
+ $result=DB_query('SELECT typeid, typename FROM debtortype', $db);
if (DB_num_rows($result)==0){
$DataError =1;
- echo '<a href="SalesTypes.php?" target="_parent">Setup Types</a>';
+ echo '<a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
} else {
echo '<tr><td>' . _('Customer Type') . ':</td>
@@ -524,12 +518,9 @@
echo '</select></td></tr>';
}
-
-
-
-
$DateString = Date($_SESSION['DefaultDateFormat']);
- echo '<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td><td><input tabindex=10 type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" value="' . $DateString . '" size=12 maxlength=10></td></tr>';
+ echo '<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
+ <td><input tabindex=10 type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" value="' . $DateString . '" size=12 maxlength=10></td></tr>';
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td><input tabindex=11 type="textbox" class="number" name="Discount" value=0 size=5 maxlength=4></td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -594,20 +585,19 @@
echo '</select></td></tr>';
}
- /*added line 8/23/2007 by Morris Kelly to set po line parameter Y/N*/
- echo '<tr><td>' . _('Customer PO Line on SO') . ":</td><td><select tabindex=18 name='CustomerPOLine'>";
- echo '<option selected value=0>' . _('No');
- echo '<option value=1>' . _('Yes');
+ echo '<tr><td>' . _('Customer PO Line on SO') . ':</td><td><select tabindex="18" name="CustomerPOLine">';
+ echo '<option selected value=0>' . _('No') . '</option>';
+ echo '<option value=1>' . _('Yes') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Invoice Addressing') . ":</td><td><select tabindex=19 name='AddrInvBranch'>";
+ echo '<tr><td>' . _('Invoice Addressing') . ':</td><td><select tabindex="19" name="AddrInvBranch">';
echo '<option selected VALUE=0>' . _('Address to HO');
echo '<option VALUE=1>' . _('Address to Branch');
echo '</select></td></tr>';
echo'</table></td></tr></table>';
if ($DataError ==0){
- echo "<br><div class='centre'><input tabindex=20 type='Submit' name='submit' value='" . _('Add New Customer') . "'> <input tabindex=21 type=submit action=RESET VALUE='" . _('Reset') . "'></div>";
+ echo "<br /><div class='centre'><input tabindex=20 type='Submit' name='submit' value='" . _('Add New Customer') . "'> <input tabindex=21 type=submit action=RESET VALUE='" . _('Reset') . "'></div>";
}
echo '</form>';
@@ -990,7 +980,7 @@
Where debtorno='".$DebtorNo."'
and contid='".$Edit."'";
$resultupcc = DB_query($SQLupdatecc,$db);
- echo '<br>'.$SQLupdatecc;
+ echo '<br />'.$SQLupdatecc;
echo '<meta http-equiv="Refresh" content="0; url="' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'&ID='.$ID.'">';
}
if (isset($_GET['delete'])) {
@@ -999,7 +989,7 @@
$resultupcc = DB_query($SQl,$db);
echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'">';
- echo '<br>'.$SQl;
+ echo '<br />'.$SQl;
prnmsg('Contact Deleted','success');
}
@@ -1007,18 +997,18 @@
echo'</td></tr></table>';
if (isset($_POST['New']) and $_POST['New']) {
- echo "<div class='centre'><input type='Submit' name='submit' VALUE='" . _('Add New Customer') .
- "'> <input type=submit name='reset' VALUE='" . _('Reset') . "'></div></form>";
+ echo '<div class="centre"><input type="Submit" name="submit" VALUE="' . _('Add New Customer') .
+ '"> <input type=submit name="reset" VALUE="' . _('Reset') . '"></div></form>';
} else if (!isset($_GET['Modify'])){
- echo "<br><div class='centre'><input type='Submit' name='submit' VALUE='" . _('Update Customer') . "'>";
+ echo '<br /><div class="centre"><input type="Submit" name="submit" VALUE="' . _('Update Customer') . '">';
echo ' <input type="Submit" name="delete" VALUE="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
}
if(isset($_POST['addcontact']) AND (isset($_POST['addcontact'])!=''))
{
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?' . SID . '&DebtorNo=' .$DebtorNo.'">';
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?DebtorNo=' .$DebtorNo.'">';
}
echo '</div>';
} // end of main ifs
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/MRP.php
===========================================...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-28 09:49:36
|
Revision: 4520
http://web-erp.svn.sourceforge.net/web-erp/?rev=4520&view=rev
Author: daintree
Date: 2011-03-28 09:49:25 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
zh_HK and zh_CN fix up
Modified Paths:
--------------
trunk/AddCustomerContacts.php
trunk/GoodsReceived.php
trunk/UnitsOfMeasure.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/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/AddCustomerContacts.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.6 $ */
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Contacts');
include('includes/header.inc');
@@ -18,7 +18,7 @@
$DebtorNo = $_GET['DebtorNo'];
}
echo "<a href='" . $rootpath . '/Customers.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Customers') . '</a><br>';
-$SQLname='SELECT * from debtorsmaster where debtorno="'.$DebtorNo.'"';
+$SQLname="SELECT * from debtorsmaster where debtorno='" .$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/GoodsReceived.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -28,7 +28,7 @@
if (isset($_GET['PONumber']) and $_GET['PONumber']<=0 and !isset($_SESSION['PO'.$identifier])) {
/* This page can only be called with a purchase order number for invoicing*/
- echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">'.
+ echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
_('Select a purchase order to receive').'</a></div>';
echo '<br />'. _('This page can only be opened if a purchase order has been selected. Please select a purchase order first');
include ('includes/footer.inc');
@@ -65,7 +65,7 @@
_('Receive') . '" alt="" />' . ' ' . _('Receive Purchase Order') . '';
echo ' : '. $_SESSION['PO'.$identifier]->OrderNo .' '. _('from'). ' ' . $_SESSION['PO'.$identifier]->SupplierName . '</p>';
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . 'identifier=' . $identifier . '" method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier=' . $identifier . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_POST['ProcessGoodsReceived'])) {
@@ -83,7 +83,7 @@
<tr><th colspan="2"></th>
<th align="centre" colspan="3"><b>' . _('Supplier Units') . '</b></th>
<th></th>
- <th align="centre" colspan="5"><b>' . _('Our Units') . '</b></th>
+ <th align="centre" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
</tr>
<tr><th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -209,9 +209,11 @@
}
if ($OrderLine->ReceiveQty < 0 AND $_SESSION['ProhibitNegativeStock']==1){
- $SQL = "SELECT locstock.quantity FROM
- locstock WHERE locstock.stockid='" . $OrderLine->StockID . "'
- AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
+ $SQL = "SELECT locstock.quantity
+ FROM locstock
+ WHERE locstock.stockid='" . $OrderLine->StockID . "'
+ AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
+
$CheckNegResult = DB_query($SQL,$db);
$CheckNegRow = DB_fetch_row($CheckNegResult);
if ($CheckNegRow[0]+$OrderLine->ReceiveQty<0){
@@ -256,16 +258,16 @@
/*Now need to check that the order details are the same as they were when they were read into the Items array. If they've changed then someone else must have altered them */
// Otherwise if you try to fullfill item quantities separately will give error.
$SQL = "SELECT itemcode,
- glcode,
- quantityord,
- quantityrecd,
- qtyinvoiced,
- shiptref,
- jobref
- FROM purchorderdetails
- WHERE orderno='" . (int) $_SESSION['PO'.$identifier]->OrderNo . "'
- AND completed=0
- ORDER BY podetailitem";
+ glcode,
+ quantityord,
+ quantityrecd,
+ qtyinvoiced,
+ shiptref,
+ jobref
+ FROM purchorderdetails
+ WHERE orderno='" . (int) $_SESSION['PO'.$identifier]->OrderNo . "'
+ AND completed=0
+ ORDER BY podetailitem";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not check that the details of the purchase order had not been changed by another user because'). ':';
$DbgMsg = _('The following SQL to retrieve the purchase order details was used');
@@ -404,21 +406,21 @@
/*Need to insert a GRN item */
$SQL = "INSERT INTO grns (grnbatch,
- podetailitem,
- itemcode,
- itemdescription,
- deliverydate,
- qtyrecd,
- supplierid,
- stdcostunit)
- VALUES ('" . $GRN . "',
- '" . $OrderLine->PODetailRec . "',
- '" . $OrderLine->StockID . "',
- '" . $OrderLine->ItemDescription . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . "',
- '" . $CurrentStandardCost . "')";
+ podetailitem,
+ itemcode,
+ itemdescription,
+ deliverydate,
+ qtyrecd,
+ supplierid,
+ stdcostunit)
+ VALUES ('" . $GRN . "',
+ '" . $OrderLine->PODetailRec . "',
+ '" . $OrderLine->StockID . "',
+ '" . $OrderLine->ItemDescription . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . "',
+ '" . $CurrentStandardCost . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('A GRN record could not be inserted') . '. ' . _('This receipt of goods has not been processed because');
$DbgMsg = _('The following SQL to insert the GRN record was used');
@@ -455,29 +457,29 @@
/* Insert stock movements - with unit cost */
$SQL = "INSERT INTO stockmoves (stockid,
- type,
- transno,
- loccode,
- trandate,
- price,
- prd,
- reference,
- qty,
- standardcost,
- newqoh)
- VALUES (
- '" . $OrderLine->StockID . "',
- 25,
- '" . $GRN . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $LocalCurrencyPrice . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . $_SESSION['PO'.$identifier]->SupplierName . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
- )";
+ type,
+ transno,
+ loccode,
+ trandate,
+ price,
+ prd,
+ reference,
+ qty,
+ standardcost,
+ newqoh)
+ VALUES (
+ '" . $OrderLine->StockID . "',
+ 25,
+ '" . $GRN . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $LocalCurrencyPrice . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . $_SESSION['PO'.$identifier]->SupplierName . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -684,7 +686,7 @@
echo '<br /><div class=centre>'. _('GRN number'). ' '. $GRN .' '. _('has been processed').'<br />';
echo '<br /><a href=PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'>'. _('Print this Goods Received Note (GRN)').'</a><br /><br />';
- echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' .
+ echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' .
_('Select a different purchase order for receiving goods against'). '</a></div>';
/*end of process goods received entry */
include('includes/footer.inc');
@@ -692,7 +694,7 @@
} else { /*Process Goods received not set so show a link to allow mod of line items on order and allow input of date goods received*/
- echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Items.php">' . _('Modify Order Items'). '</a></div>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Header.php?ModifyOrderNumber=' .$_SESSION['PO'.$identifier]->OrderNo . '">' . _('Modify Order Items'). '</a></div>';
echo '<br /><div class="centre"><input type=submit name=Update Value=' . _('Update') . '><p>';
echo '<input type=submit name="ProcessGoodsReceived" Value="' . _('Process Goods Received') . '"></div>';
Modified: trunk/UnitsOfMeasure.php
===================================================================
--- trunk/UnitsOfMeasure.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/UnitsOfMeasure.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -64,9 +64,6 @@
$sql[] = "UPDATE stockmaster
SET units='" . $_POST['MeasureName'] . "'
WHERE units ".LIKE." '" . $OldMeasureName . "'";
- $sql[] = "UPDATE contracts
- SET units='" . $_POST['MeasureName'] . "'
- WHERE units ".LIKE." '" . $OldMeasureName . "'";
} else {
$InputError = 1;
prnMsg( _('The unit of measure no longer exist.'),'error');
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-03-27 01:50:33 UTC (rev 4519)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-03-28 09:49:25 UTC (rev 4520)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 16:22+1200\n"
+"POT-Creation-Date: 2011-03-27 19:34+1200\n"
"PO-Revision-Date: 2010-07-25 17:04+0000\n"
"Last-Translator: Tim Schofield <ti...@we...>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -266,12 +266,12 @@
#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538 MRP.php:542
+#: MRPCalendar.php:222 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:264
#: PaymentMethods.php:270 PDFChequeListing.php:63
#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:758 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
+#: PO_Header.php:754 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
#: PurchData.php:192 PurchData.php:494 PurchData.php:497
#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
@@ -301,12 +301,12 @@
#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
-#: MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536 MRP.php:540
+#: MRPCalendar.php:224 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:265
#: PaymentMethods.php:271 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:757 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
+#: PO_Header.php:753 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
#: PurchData.php:195 PurchData.php:495 PurchData.php:498
#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
@@ -367,7 +367,7 @@
#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
#: PcClaimExpensesFromTab.php:230 PcExpenses.php:187 PcExpensesTypeTab.php:164
#: PcTabs.php:189 PcTypeTabs.php:175 PO_AuthorisationLevels.php:150
-#: PO_Items.php:764 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
+#: PO_Items.php:762 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
#: SalesTypes.php:207 SelectCreditItems.php:745 SelectCustomer.php:611
@@ -535,7 +535,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:236
#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:70
-#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:413 SalesAnalReptCols.php:129
+#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:411 SalesAnalReptCols.php:129
#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:353 Suppliers.php:514
#: SupplierTypes.php:69
msgid "has been updated"
@@ -591,7 +591,7 @@
msgstr "Jméno kontaktní osoby"
#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
-#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:223
+#: PO_Header.php:956 PO_Header.php:1026 SelectCreditItems.php:223
#: SelectCustomer.php:464 SelectOrderItems.php:639
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
#: includes/PDFTransPageHeaderPortrait.inc:105
@@ -824,8 +824,8 @@
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
-#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:473
-#: PO_Items.php:607 PO_Items.php:634 SalesAnalReptCols.php:356
+#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:471
+#: PO_Items.php:605 PO_Items.php:632 SalesAnalReptCols.php:356
#: SpecialOrder.php:369 StockLocTransferReceive.php:373
#: StockQuantityByDate.php:114 includes/SelectOrderItems_IntoCart.inc:53
msgid "could not be retrieved because"
@@ -854,7 +854,7 @@
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:118
#: includes/PDFPaymentRun_PymtFooter.php:154
-#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:86
+#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:79
#: includes/ConnectDB_mysql.inc:68
msgid "The SQL that failed was"
msgstr "SQL příkaz, který selhal, byl"
@@ -1824,7 +1824,7 @@
#: InventoryQuantities.php:210 MRPPlannedPurchaseOrders.php:305
#: MRPPlannedWorkOrders.php:367 MRPReport.php:826 MRPReschedules.php:190
#: MRPShortages.php:283 PDFOrderStatus.php:299 PDFPriceList.php:331
-#: PDFReceipt.php:32 PO_Header.php:792 PO_PDFPurchOrder.php:59
+#: PDFReceipt.php:32 PO_Header.php:789 PO_PDFPurchOrder.php:59
#: PO_SelectOSPurchOrder.php:476 ReorderLevel.php:251 StockDispatch.php:337
#: SuppPriceList.php:254 Tax.php:252 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
@@ -2006,7 +2006,7 @@
#: MRPShortages.php:299 PaymentTerms.php:180 PcExpenses.php:159
#: PcExpenses.php:248 PcExpensesTypeTab.php:148 PcReportTab.php:174
#: PcTypeTabs.php:158 PDFOrdersInvoiced.php:345 PDFOrderStatus.php:313
-#: PDFPrintLabel.php:239 PO_Items.php:715 PO_Items.php:1042
+#: PDFPrintLabel.php:239 PO_Items.php:713 PO_Items.php:1046
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:178
#: PricesByCost.php:119 ReorderLevelLocation.php:55 ReorderLevel.php:266
#: ReverseGRN.php:377 SalesCategories.php:427 SelectAsset.php:225
@@ -2112,7 +2112,7 @@
#: CustomerReceipt.php:1029 CustomerReceipt.php:1032
#: DiscountCategories.php:103 DiscountCategories.php:106
#: FixedAssetTransfer.php:61 MRPDemands.php:330 MRPDemands.php:333
-#: MRPReport.php:563 PO_Header.php:516 PO_Items.php:1021 PO_Items.php:1026
+#: MRPReport.php:563 PO_Header.php:516 PO_Items.php:1025 PO_Items.php:1030
#: PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:170 PurchData.php:264
#: SelectAsset.php:93 SelectCompletedOrder.php:518 SelectCreditItems.php:208
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
@@ -2145,7 +2145,7 @@
#: BOMInquiry.php:26 BOMs.php:803 ContractBOM.php:331 Contracts.php:766
#: CounterSales.php:2142 CustomerReceipt.php:1037 FixedAssetTransfer.php:72
-#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:521 PO_Items.php:1029
+#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:521 PO_Items.php:1033
#: SelectAsset.php:101 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:419 SelectGLAccount.php:98 SelectOrderItems.php:627
#: SelectOrderItems.php:1596 SelectProduct.php:508 SelectSupplier.php:212
@@ -2155,7 +2155,7 @@
msgstr "Vyhledat"
#: BOMInquiry.php:36 BOMs.php:738 ContractBOM.php:51 MRPDemands.php:57
-#: MRPReport.php:589 PO_Items.php:826 PO_SelectOSPurchOrder.php:64
+#: MRPReport.php:589 PO_Items.php:824 PO_SelectOSPurchOrder.php:64
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:95
#: SelectCreditItems.php:276 SelectProduct.php:521 SelectSalesOrder.php:348
#: SelectWorkOrder.php:35 Shipt_Select.php:62 SupplierTenders.php:378
@@ -2185,7 +2185,7 @@
#: CustomerReceipt.php:1043 GLCodesInquiry.php:28 MRPDemands.php:91
#: MRPPlannedWorkOrders.php:257 MRPReport.php:759 PDFOrdersInvoiced.php:344
#: PDFOrderStatus.php:312 PDFPrintLabel.php:239 PO_Header.php:531
-#: PO_Items.php:1041 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:177
+#: PO_Items.php:1045 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:177
#: PricesByCost.php:118 PurchData.php:338 ReorderLevelLocation.php:54
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:534 SelectCreditItems.php:220
@@ -2202,7 +2202,7 @@
#: BOMInquiry.php:95 BOMs.php:812 ConfirmDispatch_Invoice.php:271
#: ContractBOM.php:345 CounterSales.php:1989 CounterSales.php:2169
#: Credit_Invoice.php:273 GoodsReceived.php:91 GoodsReceived.php:95
-#: MRPReport.php:762 OffersReceived.php:95 PO_Items.php:1044
+#: MRPReport.php:762 OffersReceived.php:95 PO_Items.php:1049
#: PO_SelectOSPurchOrder.php:216 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:539 SelectCreditItems.php:957
#: SelectOrderItems.php:1437 SelectOrderItems.php:1621 SelectProduct.php:108
@@ -2528,7 +2528,7 @@
msgstr "Úroveň"
#: BOMs.php:519 BOMs.php:636 Contracts.php:868 FixedAssetRegister.php:83
-#: InventoryQuantities.php:223 Locations.php:328 MRP.php:549 MRP.php:563
+#: InventoryQuantities.php:223 Locations.php:328 MRP.php:548 MRP.php:562
#: PDFOrdersInvoiced.php:306 PDFOrderStatus.php:272
#: ReorderLevelLocation.php:173 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:49 StockSerialItemResearch.php:78
@@ -2871,8 +2871,8 @@
#: CompanyPreferences.php:472 ConfirmDispatch_Invoice.php:626
#: ConfirmDispatch_Invoice.php:1658 Credit_Invoice.php:1529
#: FixedAssetItems.php:123 FixedAssetItems.php:570 GLBudgets.php:219
-#: GLTags.php:44 GoodsReceived.php:228 GoodsReceived.php:234
-#: GoodsReceived.php:241 GoodsReceived.php:697 Labels.php:262
+#: GLTags.php:44 GoodsReceived.php:230 GoodsReceived.php:236
+#: GoodsReceived.php:243 GoodsReceived.php:699 Labels.php:262
#: MRPCalendar.php:309 Payments.php:852 PcAuthorizeExpenses.php:262
#: PO_AuthoriseMyOrders.php:125 PricesByCost.php:188 PurchData.php:502
#: ReorderLevelLocation.php:156 SelectCreditItems.php:898 SMTPServer.php:63
@@ -3050,7 +3050,7 @@
#: ConfirmDispatch_Invoice.php:268 ContractBOM.php:241 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
#: CounterSales.php:2301 Credit_Invoice.php:270 DeliveryDetails.php:783
-#: GoodsReceived.php:88 OrderDetails.php:153 PO_Items.php:714
+#: GoodsReceived.php:88 OrderDetails.php:153 PO_Items.php:712
#: PO_OrderDetails.php:142 PrintCustTrans.php:648 PrintCustTrans.php:711
#: PrintCustTrans.php:749 PrintCustTransPortrait.php:827
#: PrintCustTransPortrait.php:910 PrintCustTransPortrait.php:954
@@ -3075,7 +3075,7 @@
#: ConfirmDispatch_Invoice.php:269 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
#: Credit_Invoice.php:271 DeliveryDetails.php:784 DeliveryDetails.php:849
-#: OrderDetails.php:154 PO_Items.php:782 PO_OrderDetails.php:143
+#: OrderDetails.php:154 PO_Items.php:780 PO_OrderDetails.php:143
#: PrintCustTrans.php:649 PrintCustTrans.php:712 PrintCustTrans.php:750
#: PrintCustTransPortrait.php:828 PrintCustTransPortrait.php:911
#: PrintCustTransPortrait.php:955 RecurringSalesOrders.php:321
@@ -3321,12 +3321,12 @@
msgstr "Prosím nápravě tohoto"
#: ConfirmDispatch_Invoice.php:653 Credit_Invoice.php:484
-#: GoodsReceived.php:251
+#: GoodsReceived.php:253
msgid "The company information and preferences could not be retrieved"
msgstr "Informace o společnosti a preference se nepodařilo získat"
#: ConfirmDispatch_Invoice.php:653 Credit_Invoice.php:484
-#: GoodsReceived.php:251
+#: GoodsReceived.php:253
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
@@ -3346,7 +3346,7 @@
"Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena "
"bude potvrzeno"
-#: ConfirmDispatch_Invoice.php:681 GoodsReceived.php:288
+#: ConfirmDispatch_Invoice.php:681 GoodsReceived.php:290
msgid "Processing halted"
msgstr "Zpracování zastaveno"
@@ -3437,10 +3437,10 @@
#: Credit_Invoice.php:1070 Credit_Invoice.php:1093 Credit_Invoice.php:1264
#: Credit_Invoice.php:1304 Credit_Invoice.php:1331 Credit_Invoice.php:1352
#: Credit_Invoice.php:1381 Credit_Invoice.php:1407 Credit_Invoice.php:1433
-#: GoodsReceived.php:270 GoodsReceived.php:351 GoodsReceived.php:393
-#: GoodsReceived.php:423 GoodsReceived.php:451 GoodsReceived.php:482
-#: GoodsReceived.php:500 GoodsReceived.php:529 GoodsReceived.php:546
-#: GoodsReceived.php:634 GoodsReceived.php:659 PDFStockCheckComparison.php:122
+#: GoodsReceived.php:272 GoodsReceived.php:353 GoodsReceived.php:395
+#: GoodsReceived.php:425 GoodsReceived.php:453 GoodsReceived.php:484
+#: GoodsReceived.php:502 GoodsReceived.php:531 GoodsReceived.php:548
+#: GoodsReceived.php:636 GoodsReceived.php:661 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3546,11 +3546,11 @@
#: Credit_Invoice.php:990 Credit_Invoice.php:1029 Credit_Invoice.php:1070
#: Credit_Invoice.php:1093 Credit_Invoice.php:1264 Credit_Invoice.php:1304
#: Credit_Invoice.php:1331 Credit_Invoice.php:1352 Credit_Invoice.php:1381
-#: Credit_Invoice.php:1407 Credit_Invoice.php:1433 GoodsReceived.php:270
-#: GoodsReceived.php:351 GoodsReceived.php:393 GoodsReceived.php:423
-#: GoodsReceived.php:451 GoodsReceived.php:482 GoodsReceived.php:500
-#: GoodsReceived.php:529 GoodsReceived.php:546 GoodsReceived.php:634
-#: GoodsReceived.php:659 PDFStockCheckComparison.php:122
+#: Credit_Invoice.php:1407 Credit_Invoice.php:1433 GoodsReceived.php:272
+#: GoodsReceived.php:353 GoodsReceived.php:395 GoodsReceived.php:425
+#: GoodsReceived.php:453 GoodsReceived.php:484 GoodsReceived.php:502
+#: GoodsReceived.php:531 GoodsReceived.php:548 GoodsReceived.php:636
+#: GoodsReceived.php:661 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3701,7 +3701,7 @@
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:950 ContractCosting.php:306
-#: CounterSales.php:1304 Credit_Invoice.php:684 GoodsReceived.php:452
+#: CounterSales.php:1304 Credit_Invoice.php:684 GoodsReceived.php:454
#: ReverseGRN.php:220 SelectCreditItems.php:1360 StockTransfers.php:382
#: StockTransfers.php:392 WorkOrderIssue.php:163 WorkOrderReceive.php:320
#: WorkOrderReceive.php:426
@@ -3789,7 +3789,7 @@
#: ConfirmDispatch_Invoice.php:1119 ContractCosting.php:335
#: CounterSales.php:1474 Credit_Invoice.php:892 Credit_Invoice.php:991
-#: Credit_Invoice.php:1030 GoodsReceived.php:483
+#: Credit_Invoice.php:1030 GoodsReceived.php:485
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1254 WorkOrderIssue.php:194 WorkOrderReceive.php:349
#: WorkOrderReceive.php:456
@@ -3828,7 +3828,7 @@
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
#: ConfirmDispatch_Invoice.php:1172 Credit_Invoice.php:946
-#: GoodsReceived.php:546 SelectCreditItems.php:1338 StockAdjustments.php:226
+#: GoodsReceived.php:548 SelectCreditItems.php:1338 StockAdjustments.php:226
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:285
#: StockTransfers.php:260 StockTransfers.php:368 WorkOrderIssue.php:230
#: WorkOrderIssue.php:285 WorkOrderReceive.php:507 WorkOrderReceive.php:578
@@ -3836,7 +3836,7 @@
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1173 Credit_Invoice.php:947
-#: GoodsReceived.php:547 StockAdjustments.php:227
+#: GoodsReceived.php:549 StockAdjustments.php:227
#: StockLocTransferReceive.php:173 StockLocTransferReceive.php:286
#: StockTransfers.php:261 StockTransfers.php:369 WorkOrderIssue.php:231
#: WorkOrderIssue.php:286 WorkOrderReceive.php:508 WorkOrderReceive.php:579
@@ -3949,7 +3949,7 @@
msgid "The fixed asset transaction could not be inserted because"
msgstr "Dlouhodobého majetku transakce nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1509 GoodsReceived.php:584 ReverseGRN.php:176
+#: ConfirmDispatch_Invoice.php:1509 GoodsReceived.php:586 ReverseGRN.php:176
#: SupplierCredit.php:1195 SupplierCredit.php:1283 SupplierInvoice.php:1182
#: SupplierInvoice.php:1267
msgid "The following SQL to insert the fixed asset transaction record was used"
@@ -4096,18 +4096,18 @@
msgid "to continue"
msgstr "pro pokračování"
-#: ContractBOM.php:143 CounterSales.php:327 PO_Items.php:966
+#: ContractBOM.php:143 CounterSales.php:327 PO_Items.php:970
#: SelectCreditItems.php:368 SelectOrderItems.php:856 SupplierTenders.php:469
#: WorkOrderEntry.php:151 WorkOrderIssue.php:469
msgid "There is a problem selecting the part records to display because"
msgstr "To je problém výběru část záznamy k zobrazení, protože"
-#: ContractBOM.php:144 PO_Items.php:967 SupplierTenders.php:470
+#: ContractBOM.php:144 PO_Items.php:971 SupplierTenders.php:470
#: Z_ChangeStockCategory.php:63 Z_ChangeStockCode.php:95
msgid "The SQL statement that failed was"
msgstr "Příkazu SQL, který byl neúspěšný"
-#: ContractBOM.php:148 PO_Items.php:971 SupplierTenders.php:474
+#: ContractBOM.php:148 PO_Items.php:975 SupplierTenders.php:474
msgid "There are no products to display matching the criteria provided"
msgstr "Nejsou žádné výrobky k zobrazení odpovídající kritériím stanoveným"
@@ -4118,7 +4118,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:185 PO_Items.php:587
+#: ContractBOM.php:185 PO_Items.php:585
#: includes/SelectOrderItems_IntoCart.inc:26
#: includes/SelectOrderItems_IntoCart.inc:63
msgid "The item"
@@ -4138,11 +4138,11 @@
msgid "The item details could not be retrieved"
msgstr "Položku Podrobnosti se nepodařilo získat"
-#: ContractBOM.php:201 PO_Items.php:608 SelectCreditItems.php:600
+#: ContractBOM.php:201 PO_Items.php:606 SelectCreditItems.php:600
msgid "The SQL used to retrieve the item details but failed was"
msgstr "SQL používá k načtení položky detaily, ale nepodařilo se"
-#: ContractBOM.php:213 CounterSales.php:422 PO_Items.php:685
+#: ContractBOM.php:213 CounterSales.php:422 PO_Items.php:683
#: SelectOrderItems.php:950 includes/SelectOrderItems_IntoCart.inc:58
#: includes/SelectOrderItems_IntoCart.inc:162
msgid "The item code"
@@ -4180,24 +4180,24 @@
msgid "Back To Contract Header"
msgstr "Zpět na záhlaví smlouvy"
-#: ContractBOM.php:290 PO_Items.php:989
+#: ContractBOM.php:290 PO_Items.php:993
msgid "The supplier category details could not be retrieved because"
msgstr "Podrobnosti dodavatel kategorie se nepodařilo získat, protože"
-#: ContractBOM.php:291 PO_Items.php:990
+#: ContractBOM.php:291 PO_Items.php:994
msgid "The SQL used to retrieve the category details but failed was"
msgstr "SQL používá k načtení kategorii detaily, ale nepodařilo se"
-#: ContractBOM.php:294 PO_Items.php:993
+#: ContractBOM.php:294 PO_Items.php:997
msgid "Search For Stock Items"
msgstr "Hledat na sklade"
#: ContractBOM.php:299 CounterSales.php:2113 CounterSales.php:2116
#: DailySalesInquiry.php:44 DailySalesInquiry.php:46 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:155
-#: InventoryQuantities.php:176 InventoryQuantities.php:178 MRP.php:565
+#: InventoryQuantities.php:176 InventoryQuantities.php:178 MRP.php:564
#: MRPReport.php:544 MRPReport.php:546 MRPReschedules.php:161
-#: PDFPriceList.php:194 PDFPrintLabel.php:240 PO_Items.php:997
+#: PDFPriceList.php:194 PDFPrintLabel.php:240 PO_Items.php:1001
#: POReport.php:1486 ReorderLevel.php:187 ReorderLevel.php:189
#: ReorderLevel.php:217 ReorderLevel.php:219 SalesGraph.php:91
#: SalesGraph.php:93 SalesGraph.php:111 SalesGraph.php:113 SalesGraph.php:134
@@ -4214,18 +4214,18 @@
msgid "All"
msgstr "Všechny"
-#: ContractBOM.php:320 PO_Items.php:1018 SelectCompletedOrder.php:515
+#: ContractBOM.php:320 PO_Items.php:1022 SelectCompletedOrder.php:515
#: SelectCreditItems.php:939
msgid "Enter text extracts in the description"
msgstr "Zadejte text extrakty v popisu"
-#: ContractBOM.php:323 CounterSales.php:2138 PO_Items.php:1021
+#: ContractBOM.php:323 CounterSales.php:2138 PO_Items.php:1025
#: SelectCompletedOrder.php:518 SelectCreditItems.php:942
#: SelectOrderItems.php:1589 SelectSalesOrder.php:485 SelectWorkOrder.php:173
msgid "Enter extract of the Stock Code"
msgstr "Zadejte extrakt skladem zákoníku"
-#: ContractBOM.php:329 PO_Items.php:1027
+#: ContractBOM.php:329 PO_Items.php:1031
msgid "Create a New Stock Item"
msgstr "Vytvoření nové položky skladem"
@@ -4235,22 +4235,22 @@
msgstr "Obrázek"
#: ContractBOM.php:368 CounterSales.php:2001 FixedAssetItems.php:465
-#: FixedAssetItems.php:469 PO_Items.php:1068 SelectCreditItems.php:969
+#: FixedAssetItems.php:469 PO_Items.php:1073 SelectCreditItems.php:969
#: SelectOrderItems.php:1449 SelectOrderItems.php:1628 SelectProduct.php:408
#: Stocks.php:709 Stocks.php:713 SupplierTenders.php:517
#: WorkOrderEntry.php:616 WorkOrderIssue.php:676
msgid "No Image"
msgstr "Obrázek není k dispozici"
-#: ContractBOM.php:390 PO_Items.php:1094 SupplierTenders.php:561
+#: ContractBOM.php:390 PO_Items.php:1102 SupplierTenders.php:561
msgid "Only the first"
msgstr "Pouze první"
-#: ContractBOM.php:390 PO_Items.php:1094 SupplierTenders.php:561
+#: ContractBOM.php:390 PO_Items.php:1102 SupplierTenders.php:561
msgid "can be displayed"
msgstr "mohou být zobrazeny"
-#: ContractBOM.php:391 PO_Items.php:1095 SupplierTenders.php:562
+#: ContractBOM.php:391 PO_Items.php:1103 SupplierTenders.php:562
msgid "Please restrict your search to only the parts required"
msgstr "Prosím, omezit vyhledávání pouze na požadované části"
@@ -4305,7 +4305,7 @@
#: ContractCosting.php:75 ContractCosting.php:81 Contracts.php:933
#: CounterSales.php:703 DeliveryDetails.php:786 DeliveryDetails.php:851
-#: OrderDetails.php:156 PO_Items.php:814 PrintCustTrans.php:651
+#: OrderDetails.php:156 PO_Items.php:812 PrintCustTrans.php:651
#: PrintCustTrans.php:714 PrintCustTrans.php:752
#: PrintCustTransPortrait.php:830 PrintCustTransPortrait.php:913
#: PrintCustTransPortrait.php:957 RecurringSalesOrders.php:323
@@ -4399,7 +4399,7 @@
msgid "The SQL used to close the work order was:"
msgstr "SQL použitý k uzavření pracovního příkazu byl:"
-#: ContractCosting.php:305 GoodsReceived.php:451
+#: ContractCosting.php:305 GoodsReceived.php:453
#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:239
#: StockLocTransferReceive.php:297 StockLocTransferReceive.php:306
#: StockTransfers.php:381 StockTransfers.php:391 WorkOrderIssue.php:162
@@ -5068,7 +5068,7 @@
msgid "Quote"
msgstr "Citovat"
-#: Contracts.php:908 PO_Header.php:795 POReport.php:1487
+#: Contracts.php:908 PO_Header.php:793 POReport.php:1487
#: PO_SelectPurchOrder.php:140 PO_SelectPurchOrder.php:142
#: SalesInquiry.php:1104 SelectContract.php:52 SelectContract.php:58
#: SelectContract.php:64 SelectContract.php:70 SelectContract.php:76
@@ -5991,7 +5991,7 @@
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1447 GoodsReceived.php:685 SupplierCredit.php:1297
+#: Credit_Invoice.php:1447 GoodsReceived.php:687 SupplierCredit.php:1297
#: SupplierInvoice.php:1288 WorkOrderIssue.php:354 WorkOrderReceive.php:674
#: Z_BottomUpCosts.php:33
msgid "has been processed"
@@ -6419,7 +6419,7 @@
#: CustLoginSetup.php:16 index.php:17 InventoryQuantities.php:147
#: InventoryValuation.php:202 Locations.php:353 Locations.php:412
#: MRPCalendar.php:22 MRPCreateDemands.php:187 MRPDemands.php:28
-#: MRPDemandTypes.php:19 MRP.php:518 MRPPlannedPurchaseOrders.php:267
+#: MRPDemandTypes.php:19 MRP.php:517 MRPPlannedPurchaseOrders.php:267
#: MRPPlannedWorkOrders.php:249 MRPPlannedWorkOrders.php:330
#: PricesByCost.php:9 ReorderLevelLocation.php:13 ReorderLevel.php:173
#: SelectProduct.php:71 StockDispatch.php:220 StockMovements.php:26
@@ -7648,7 +7648,7 @@
msgid "Banked into the"
msgstr "Naklonila do"
-#: CustomerReceipt.php:841 Payments.php:719 PO_Items.php:258
+#: CustomerReceipt.php:841 Payments.php:719 PO_Items.php:256
#: SelectSalesOrder.php:135 SelectSalesOrder.php:300 SpecialOrder.php:400
msgid "on"
msgstr "na"
@@ -7870,14 +7870,14 @@
"S cílem vytvořit nový zákazník, musíte se nejprve nastavit alespoň jedno "
"prodejní typ / ceník"
-#: Customers.php:436 Customers.php:445 includes/ConnectDB_mysqli.inc:35
+#: Customers.php:436 Customers.php:445 includes/ConnectDB_mysqli.inc:29
#: includes/ConnectDB_mysql.inc:29
msgid "Click"
msgstr "Klepněte na tlačítko"
#: Customers.php:436 Customers.php:445 MRPPlannedPurchaseOrders.php:18
#: MRPPlannedWorkOrders.php:15 MRPReschedules.php:18 MRPShortages.php:17
-#: OffersReceived.php:229 PO_Header.php:437 includes/ConnectDB_mysqli.inc:35
+#: OffersReceived.php:229 PO_Header.php:437 includes/ConnectDB_mysqli.inc:29
#: includes/ConnectDB_mysql.inc:29
msgid "here"
msgstr "zde"
@@ -7976,7 +7976,7 @@
"kartu Nastavení v hlavním menu a nastavit alespoň jeden jako první"
#: Customers.php:550 Customers.php:799 Customers.php:802 index.php:1059
-#: PaymentTerms.php:13 PO_Header.php:1034 PrintCustTrans.php:324
+#: PaymentTerms.php:13 PO_Header.php:1032 PrintCustTrans.php:324
#: PrintCustTransPortrait.php:437 Suppliers.php:680 Suppliers.php:833
#: includes/PO_PDFOrderPageHeader.inc:62 includes/PO_PDFOrderPageHeader.inc:64
msgid "Payment Terms"
@@ -8147,7 +8147,7 @@
#: CustomerTypes.php:95 PcAssignCashToTab.php:97 PcClaimExpensesFromTab.php:88
#: PcExpenses.php:96 PcExpensesTypeTab.php:61 PcTabs.php:97 PcTypeTabs.php:87
-#: PO_Items.php:259 SalesTypes.php:88 SelectSalesOrder.php:135
+#: PO_Items.php:257 SalesTypes.php:88 SelectSalesOrder.php:135
#: SelectSalesOrder.php:300 SpecialOrder.php:400 SupplierTypes.php:93
msgid "has been created"
msgstr "byl vytvořen"
@@ -8839,7 +8839,7 @@
msgid "Discount Category Code"
msgstr "Kód slevové skupiny"
-#: DiscountCategories.php:90 DiscountCategories.php:231 PO_Header.php:848
+#: DiscountCategories.php:90 DiscountCategories.php:231 PO_Header.php:846
#: SalesCategories.php:262 SuppInvGRNs.php:276 SupplierTenders.php:57
#, php-format
msgid "Select"
@@ -10426,7 +10426,7 @@
msgstr "Hodnota k dispozici"
#: FixedAssetRegister.php:199 FixedAssetRegister.php:223
-#: PDFBankingSummary.php:169 PDFChequeListing.php:176 PO_Items.php:770
+#: PDFBankingSummary.php:169 PDFChequeListing.php:176 PO_Items.php:768
#: includes/PDFSalesAnalysis.inc:71 includes/PDFSalesAnalysis.inc:125
#: includes/PDFSalesAnalysis.inc:178 includes/PDFSalesAnalysis.inc:312
#: includes/PDFSalesAnalysis.inc:364 includes/PDFSalesAnalysis.inc:414
@@ -10790,7 +10790,7 @@
msgid "Req Del Date"
msgstr "Req Del Datum"
-#: FTP_RadioBeacon.php:57 PO_Header.php:824 PO_Header.php:1050
+#: FTP_RadioBeacon.php:57 PO_Header.php:822 PO_Header.php:1050
#: SelectCompletedOrder.php:590 SelectSalesOrder.php:752
#: SelectSalesOrder.php:768 includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:30
@@ -12108,17 +12108,17 @@
msgid "Supplier Units"
msgstr "Jednotka dodavatele"
-#: GoodsReceived.php:86 PO_Items.php:1043
+#: GoodsReceived.php:86
#, fuzzy
-msgid "Our Units"
+msgid "Our Receiving Units"
msgstr "Jednotky"
-#: GoodsReceived.php:93
+#: GoodsReceived.php:93 PO_Items.php:1048
#, fuzzy
msgid "Conversion"
msgstr "Konverzní faktor (na náš UOM)"
-#: GoodsReceived.php:93
+#: GoodsReceived.php:93 PO_Items.php:1048
#, fuzzy
msgid "Factor"
msgstr "Pro"
@@ -12143,7 +12143,7 @@
msgid "Total value of goods received"
msgstr "Celková hodnota zboží přijatého"
-#: GoodsReceived.php:219
+#: GoodsReceived.php:221
msgid ""
"Receiving a negative quantity that results in negative stock is prohibited "
"by the parameter settings. This delivery of stock cannot be processed until "
@@ -12153,15 +12153,15 @@
"nastavení parametrů. Tato dodávka zásob nelze zpracovat, dokud se zásoby "
"této položky je opravena."
-#: GoodsReceived.php:227
+#: GoodsReceived.php:229
msgid "There is nothing to process"
msgstr "Neexistuje nic, co proces"
-#: GoodsReceived.php:227
+#: GoodsReceived.php:229
msgid "Please enter valid quantities greater than zero"
msgstr "Zadejte prosím platný množství větší než nula"
-#: GoodsReceived.php:232
+#: GoodsReceived.php:234
msgid ""
"Negative stocks would result by processing a negative delivery - quantities "
"must be changed or the stock quantity of the item going negative corrected "
@@ -12171,7 +12171,7 @@
"změnit, nebo populaci množství položek bude opraven před tímto negativním "
"dodávky budou zpracovány."
-#: GoodsReceived.php:238
+#: GoodsReceived.php:240
msgid ""
"Entered quantities cannot be greater than the quantity entered on the "
"purchase invoice including the allowed over-receive percentage"
@@ -12179,14 +12179,14 @@
"Zadané množství nemůže být větší než množství uvedené na faktuře včetně "
"povolené přes-přijímat procento"
-#: GoodsReceived.php:240
+#: GoodsReceived.php:242
msgid ""
"Modify the ordered items on the purchase invoice if you wish to increase the "
"quantities"
msgstr ""
"Změnit objednaného zboží na nákupní faktuře, pokud chcete zvýšit množství"
-#: GoodsReceived.php:270
+#: GoodsReceived.php:272
msgid ""
"Could not check that the details of the purchase order had not been changed "
"by another user because"
@@ -12194,11 +12194,11 @@
"Nepodařilo se zkontrolovat, zda údaje v objednávce nebyl změněn jiným "
"uživatelem, protože"
-#: GoodsReceived.php:271
+#: GoodsReceived.php:273
msgid "The following SQL to retrieve the purchase order details was used"
msgstr "Následující SQL získat podrobnosti objednávky bylo použito"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be actioned"
@@ -12206,11 +12206,11 @@
"Tento příkaz byl změněn nebo fakturované protože to dodávka byla začaly být "
"actioned"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid "To enter a delivery against this purchase order"
msgstr "Chcete-li zadat dodání proti této objednávce"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid ""
"it must be re-selected and re-read again to update the changes made by the "
"other user"
@@ -12218,83 +12218,83 @@
"to musí být re-vybraný a re-číst a aktualizovat změny provedené ostatními "
"uživateli"
-#: GoodsReceived.php:292
+#: GoodsReceived.php:294
msgid "GL Code of the Line Item"
msgstr "GL Kód Line bod"
-#: GoodsReceived.php:295
+#: GoodsReceived.php:297
msgid "ShiptRef of the Line Item"
msgstr "ShiptRef linie bod"
-#: GoodsReceived.php:298
+#: GoodsReceived.php:300
msgid "Contract Reference of the Line Item"
msgstr "Smlouva Odkaz na řádkové položky"
-#: GoodsReceived.php:302
+#: GoodsReceived.php:304
msgid "Quantity Invoiced of the Line Item"
msgstr "Množství fakturovaná linie bod"
-#: GoodsReceived.php:305
+#: GoodsReceived.php:307
msgid "Stock Code of the Line Item"
msgstr "Skladem Kód Line bod"
-#: GoodsReceived.php:308
+#: GoodsReceived.php:310
msgid "Order Quantity of the Line Item"
msgstr "Aby Množství Line bod"
-#: GoodsReceived.php:311
+#: GoodsReceived.php:313
msgid "Quantity of the Line Item Already Received"
msgstr "Množství řádkové položky již obdržela"
-#: GoodsReceived.php:317 GoodsReceived.php:688
+#: GoodsReceived.php:319 GoodsReceived.php:690
msgid "Select a different purchase order for receiving goods against"
msgstr "Vyberte jinou objednávku pro příjem zboží proti"
-#: GoodsReceived.php:319
+#: GoodsReceived.php:321
msgid "Re-read the updated purchase order for receiving goods against"
msgstr "Re-read aktualizovaný objednávky pro příjem zboží proti"
-#: GoodsReceived.php:351
+#: GoodsReceived.php:353
msgid ""
"The standard cost of the item being received cannot be retrieved because"
msgstr "Standardní pořizovací cena položky je obdržela, nemůže získat, protože"
-#: GoodsReceived.php:352
+#: GoodsReceived.php:354
msgid "The following SQL to retrieve the standard cost was used"
msgstr "Následující SQL získat standardní náklady byly použity"
-#: GoodsReceived.php:393
+#: GoodsReceived.php:395
msgid ""
"The purchase order detail record could not be updated with the quantity "
"received because"
msgstr ""
"Objednávce detail záznamu nelze aktualizovat s množstvím přijaté protože"
-#: GoodsReceived.php:394 ReverseGRN.php:128
+#: GoodsReceived.php:396 ReverseGRN.php:128
msgid "The following SQL to update the purchase order detail record was used"
msgstr "Následující SQL aktualizovat objednávky detail záznamu byla použita"
-#: GoodsReceived.php:423
+#: GoodsReceived.php:425
msgid "A GRN record could not be inserted"
msgstr "ZEL záznam nemůže být vložen"
-#: GoodsReceived.php:423
+#: GoodsReceived.php:425
msgid "This receipt of goods has not been processed because"
msgstr "Toto přijetí zboží nebylo zpracováno, protože"
-#: GoodsReceived.php:424 ReverseGRN.php:156
+#: GoodsReceived.php:426 ReverseGRN.php:156
msgid "The following SQL to insert the GRN record was used"
msgstr "Následující SQL vložit záznam GRN byla použita"
-#: GoodsReceived.php:482
+#: GoodsReceived.php:484
msgid "stock movement records could not be inserted because"
msgstr "Záznamy zásob pohybu nemůže být vložen, protože"
-#: GoodsReceived.php:500
+#: GoodsReceived.php:502
msgid "Could not check if a batch or lot stock item already exists because"
msgstr "Nemohl zkontrolovat, zda šarže na skladě již existuje, protože"
-#: GoodsReceived.php:501
+#: GoodsReceived.php:503
msgid ""
"The following SQL to test for an already existing controlled but not "
"serialised stock item was used"
@@ -12302,17 +12302,17 @@
"Následující SQL k testu na již existující kontrolované, ale ne serializoval "
"na skladě byla použita"
-#: GoodsReceived.php:529 WorkOrderIssue.php:215 WorkOrderReceive.php:492
+#: GoodsReceived.php:531 WorkOrderIssue.php:215 WorkOrderReceive.php:492
#: WorkOrderReceive.php:563
msgid "The serial stock item record could not be inserted because"
msgstr "Pořadové skladová položka záznam nemůže být vložen, protože"
-#: GoodsReceived.php:530 WorkOrderIssue.php:216 WorkOrderReceive.php:493
+#: GoodsReceived.php:532 WorkOrderIssue.php:216 WorkOrderReceive.php:493
#: WorkOrderReceive.php:564
msgid "The following SQL to insert the serial stock item records was used"
msgstr "Následující SQL vložit sériové záznamy na skladě byla použita"
-#: GoodsReceived.php:583 ReverseGRN.php:175 SupplierCredit.php:1194
+#: GoodsReceived.php:585 ReverseGRN.php:175 SupplierCredit.php:1194
#: SupplierCredit.php:1282 SupplierInvoice.php:1181 SupplierInvoice.php:1266
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset "
@@ -12321,7 +12321,7 @@
"Critical Error! POZNÁMKA DOWN tuto chybu a požádat o pomoc hmotného majetku "
"transakce nemůže být vložen, protože"
-#: GoodsReceived.php:603 SupplierInvoice.php:1281
+#: GoodsReceived.php:605 SupplierInvoice.php:1281
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost and date purchased was not able to be updated because:"
@@ -12329,7 +12329,7 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady a datum koupě nemohl být aktualizován, protože:"
-#: GoodsReceived.php:604 SupplierInvoice.php:1282
+#: GoodsReceived.php:606 SupplierInvoice.php:1282
msgid ""
"The following SQL was used to attempt the update of the cost and the date "
"the asset was purchased"
@@ -12337,44 +12337,44 @@
"Následující SQL byl použit k pokusu aktualizace nákladů a datum majetku byl "
"zakoupen"
-#: GoodsReceived.php:634
+#: GoodsReceived.php:636
msgid "The purchase GL posting could not be inserted because"
msgstr "Nákup GL vysílání nemohly být zařazeny, protože"
-#: GoodsReceived.php:635 ReverseGRN.php:303
+#: GoodsReceived.php:637 ReverseGRN.php:303
msgid "The following SQL to insert the purchase GLTrans record was used"
msgstr "Následující SQL vložit na nákup GLTrans záznam byl použit"
-#: GoodsReceived.php:653 SelectSalesOrder.php:896
+#: GoodsReceived.php:655 SelectSalesOrder.php:896
msgid "PO"
msgstr "PO"
-#: GoodsReceived.php:659 ReverseGRN.php:324
+#: GoodsReceived.php:661 ReverseGRN.php:324
msgid "The GRN suspense side of the GL posting could not be inserted because"
msgstr "Napětí ZEL straně GL vyslání nemůže být vložen, protože"
-#: GoodsReceived.php:660 ReverseGRN.php:325
+#: GoodsReceived.php:662 ReverseGRN.php:325
msgid "The following SQL to insert the GRN Suspense GLTrans record was used"
msgstr "Následující SQL vložit GRN napětí GLTrans záznam byl použit"
-#: GoodsReceived.php:670
+#: GoodsReceived.php:672
#, fuzzy
msgid "Order Completed"
msgstr "Dokončeno"
-#: GoodsReceived.php:685 ReverseGRN.php:332
+#: GoodsReceived.php:687 ReverseGRN.php:332
msgid "GRN number"
msgstr "GRN číslo"
-#: GoodsReceived.php:686
+#: GoodsReceived.php:688
msgid "Print this Goods Received Note (GRN)"
msgstr "Vytisknout tuto Zboží Přijaté Poznámka (GRN)"
-#: GoodsReceived.php:695
+#: GoodsReceived.php:697
msgid "Modify Order Items"
msgstr "Změnit pořadí položek"
-#: GoodsReceived.php:698
+#: GoodsReceived.php:700
msgid "Process Goods Received"
msgstr "Proces přijetí zboží"
@@ -14146,103 +14146,103 @@
msgid "Loading requirements from sales orders"
msgstr "Načítání požadavků z prodejních objednávek"
-#: MRP.php:255
+#: MRP.php:254
msgid "Loading requirements from work orders"
msgstr "Načítání požadavků z pracovních příkazů"
-#: MRP.php:297
+#: MRP.php:296
msgid "Loading requirements based on mrpdemands"
msgstr "Načítání požadavky založené na mrpdemands"
-#: MRP.php:317
+#: MRP.php:316
msgid "Loading requirements based on reorder level"
msgstr "Načítání požadavky založené na pořadí úrovni"
-#: MRP.php:324
+#: MRP.php:323
msgid "Creating supplies table"
msgstr "Vytváření zásob tabulka"
-#: MRP.php:338
+#: MRP.php:337
msgid "Create of mrpsupplies failed because"
msgstr "Vytvořit z mrpsupplies se nezdařila, protože"
-#: MRP.php:340
+#: MRP.php:339
msgid "Loading supplies from purchase orders"
msgstr "Načítání dodávky z objednávek"
-#: MRP.php:366
+#: MRP.php:365
msgid "Loading supplies from inventory on hand"
msgstr "Načítání dodávky z inventáře na ruce"
-#: MRP.php:407
+#: MRP.php:406
msgid "Loading supplies from work orders"
msgstr "Načítání dodávky z pracovních příkazů"
-#: MRP.php:436
+#: MRP.php:435
msgid "Creating planned orders table"
msgstr "Vytvoření tabulky plánované zakázky"
-#: MRP.php:448
+#: MRP.php:447
msgid "Create of mrpplannedorders failed because"
msgstr "Vytvořit z mrpplannedorders se nezdařila, protože"
-#: MRP.php:467
+#: MRP.php:466
msgid "Processing level"
msgstr "Úrovně zpracování"
-#: MRP.php:474
+#: MRP.php:473
msgid "End time"
msgstr "Čas konce"
-#: MRP.php:546
+#: MRP.php:545
msgid "Last Run Details"
msgstr "Poslední Spustit Podrobnosti"
-#: MRP.php:548
+#: MRP.php:547
msgid "Last Run Time"
msgstr "Čas posledního spuštění"
-#: MRP.php:550 MRP.php:579
+#: MRP.php:549 MRP.php:578
msgid "Days Leeway"
msgstr "Dny volnost"
-#: MRP.php:551
+#: MRP.php:550
msgid "Use MRP Demands"
msgstr "Použití MRP požaduje"
-#: MRP.php:552
+#: MRP.php:551
msgid "Use EOQ"
msgstr "Použijte EOQ"
-#: MRP.php:553
+#: MRP.php:552
msgid "Use Pan Size"
msgstr "Použijte Pan Velikost"
-#: MRP.php:554
+#: MRP.php:553
msgid "Use Shrinkage"
msgstr "Použijte smrštění"
-#: MRP.php:561
+#: MRP.php:560
msgid "This Run Details"
msgstr "Tento běh Podrobnosti"
-#: MRP.php:580
+#: MRP.php:579
msgid "Use MRP Demands?"
msgstr "Použijte MRP požaduje?"
-#: MRP.php:582
+#: MRP.php:581
msgid "Use EOQ?"
msgstr "Použijte EOQ?"
-#: MRP.php:584
+#: MRP.php:583
msgid "Use Pan Size?"
msgstr "Použijte Pan velikost?"
-#: MRP.php:586
+#: MRP.php:585
msgid "Use Shrinkage?"
msgstr "Smrštění použití?"
-#: MRP.php:588
+#: MRP.php:587
msgid "Run MRP"
msgstr "Běhu MRP"
@@ -14718,8 +14718,8 @@
msgid "An official order will be sent to you in due course"
msgstr "Oficiální objednávka bude zaslána v pravý čas"
-#: OffersReceived.php:180 PO_AuthoriseMyOrders.php:89 PO_Header.php:782
-#: PO_Header.php:787 PO_Header.php:791 PO_Header.php:799 PO_Header.php:805
+#: OffersReceived.php:180 PO_AuthoriseMyOrders.php:89 PO_Header.php:778
+#: PO_Header.php:783 PO_Header.php:788 PO_Header.php:797 PO_Header.php:803
#: PO_SelectOSPurchOrder.php:161 PO_SelectOSPurchOrder.php:163
#: PO_SelectPurchOrder.php:130 PO_SelectPurchOrder.php:132
msgid "Pending"
@@ -15445,8 +15445,8 @@
msgid "Expense Code"
msgstr "Náklady kód"
-#: PcAssignCashToTab.php:215 PO_AuthoriseMyOrders.php:90 PO_Header.php:783
-#: PO_Header.php:788 PO_Header.php:800 PO_Header.php:804
+#: PcAssignCashToTab.php:215 PO_AuthoriseMyOrders.php:90 PO_Header.php:779
+#: PO_Header.php:784 PO_Header.php:798 PO_Header.php:802
#: PO_SelectOSPurchOrder.php:166 PO_SelectOSPurchOrder.php:168
#: PO_SelectPurchOrder.php:135 PO_SelectPurchOrder.php:137
msgid "Authorised"
@@ -15713,7 +15713,7 @@
#: PcReportTab.php:97 PcReportTab.php:99 PcReportTab.php:107
#: PDFOrdersInvoiced.php:263 PDFOrdersInvoiced.php:265
-#: PDFOrdersInvoiced.php:273 includes/ConnectDB_mysqli.inc:93
+#: PDFOrdersInvoiced.php:273 includes/ConnectDB_mysqli.inc:86
#: includes/ConnectDB_mysql.inc:75
msgid "Database Error"
msgstr "Chyba databáze"
@@ -16471,7 +16471,7 @@
msgid "Order Status Report - No Data"
msgstr "Aby Status Report - žádná data"
-#: PDFOrderStatus.php:273 PO_AuthoriseMyOrders.php:60 PO_Header.php:778
+#: PDFOrderStatus.php:273 PO_AuthoriseMyOrders.php:60 PO_Header.php:774
#: PO_OrderDetails.php:123 PO_SelectOSPurchOrder.php:449
#: PO_SelectPurchOrder.php:370 SelectWorkOrder.php:298 SelectWorkOrder.php:333
#: WorkOrderCosting.php:88 WorkOrderCosting.php:100
@@ -16480,7 +16480,7 @@
msgid "Status"
msgstr "Stav"
-#: PDFOrderStatus.php:301 PO_Header.php:746 PO_OrderDetails.php:115
+#: PDFOrderStatus.php:301 PO_Header.php:742 PO_OrderDetails.php:115
msgid "Not yet printed"
msgstr "Ještě netisknuto"
@@ -17262,18 +17262,19 @@
msgid "Initiator"
msgstr "Iniciátor"
-#: PO_AuthoriseMyOrders.php:59 PO_Header.php:722 PO_Items.php:816
+#: PO_AuthoriseMyOrders.php:59 PO_Header.php:722 PO_Items.php:814
#: POReport.php:1429 includes/PDFPickingListHeader.inc:46
msgid "Delivery Date"
msgstr "Datum dodání"
-#: PO_AuthoriseMyOrders.php:91 PO_Header.php:784 PO_Header.php:798
+#: PO_AuthoriseMyOrders.php:91 PO_Header.php:780 PO_Header.php:796
#: PO_SelectOSPurchOrder.php:176 PO_SelectOSPurchOrder.php:178
#: PO_SelectPurchOrder.php:150 PO_SelectPurchOrder.php:152
msgid "Rejected"
msgstr "Odmítnuto"
-#: PO_AuthoriseMyOrders.php:92 PO_Header.php:803 PO_SelectOSPurchOrder.php:171
+#: PO_AuthoriseMyOrders.php:92 PO_Header.php:785 PO_Header.php:790
+#: PO_Header.php:801 PO_SelectOSPurchOrder.php:171
#: PO_SelectOSPurchOrder.php:173 PO_SelectPurchOrder.php:145
#: PO_SelectPurchOrder.php:147
msgid "Cancelled"
@@ -17334,22 +17335,22 @@
"This is a new order. It must be created before you can change the status"
msgstr ""
-#: PO_Header.php:93 PO_Items.php:109 SelectSalesOrder.php:126
+#: PO_Header.php:93 PO_Items.php:107 SelectSalesOrder.php:126
#: SelectSalesOrder.php:294
msgid "You do not have permission to authorise this purchase order"
msgstr "Nemáte oprávnění k autorizaci této objednávce"
-#: PO_Header.php:93 PO_Header.php:117 PO_Header.php:138 PO_Items.php:109
+#: PO_Header.php:93 PO_Header.php:117 PO_Header.php:138 PO_Items.php:107
#: SelectSalesOrder.php:126 SelectSalesOrder.php:294
msgid "This order is for"
msgstr "Tato zakázka je pro"
-#: PO_Header.php:95 PO_Items.php:106 SelectSalesOrder.php:123
+#: PO_Header.php:95 PO_Items.php:104 SelectSalesOrder.php:123
#: SelectSalesOrder.php:291
msgid "You can only authorise up to"
msgstr "Můžete povolit pouze až"
-#: PO_Header.php:96 PO_Header.php:120 PO_Header.php:138 PO_Items.php:112
+#: PO_Header.php:96 PO_Header.php:120 PO_Header.php:138 PO_Items.php:110
#: SelectSalesOrder.php:128 SelectSalesOrder.php:294
msgid "If you think this is a mistake please contact the systems administrator"
msgstr ""
@@ -17482,8 +17483,8 @@
msgid "You can setup authorisations"
msgstr "Můžete nastavit oprávnění"
-#: PO_Header.php:508 PO_Header.php:579 PO_Items.php:258 PO_Items.php:413
-#: PO_Items.php:706 PO_Items.php:709 PO_OrderDetails.php:86
+#: PO_Header.php:508 PO_Header.php:579 PO_Items.php:256 PO_Items.php:411
+#: PO_Items.php:704 PO_Items.php:707 PO_OrderDetails.php:86
#: PO_PDFPurchOrder.php:185 PO_PDFPurchOrder.php:299 SelectSalesOrder.php:135
#: SelectSalesOrder.php:300 SpecialOrder.php:400
msgid "Purchase Order"
@@ -17510,9 +17511,9 @@
msgid "Supplier Name"
msgstr "Název dodavatele"
-#: PO_Header.php:533 PO_Header.php:940 PO_Header.php:943 PO_Header.php:946
-#: PO_Header.php:949 PO_Header.php:952 PO_Header.php:955 PO_Header.php:1013
-#: PO_Header.php:1016 PO_Header.php:1019 PO_Header.php:1022 PO_Header.php:1025
+#: PO_Header.php:533 PO_Header.php:938 PO_Header.php:941 PO_Header.php:944
+#: PO_Header.php:947 PO_Header.php:950 PO_Header.php:953 PO_Header.php:1011
+#: PO_Header.php:1014 PO_Header.php:1017 PO_Header.php:1020 PO_Header.php:1023
msgid "Address"
msgstr "Adresa"
@@ -17552,48 +17553,48 @@
msgid "Requisition Ref"
msgstr "Žádanka Ref"
-#: PO_Header.php:740
+#: PO_Header.php:736
msgid "Date Printed"
msgstr "Vytištěno"
-#: PO_Header.php:755
+#: PO_Header.php:751
msgid "Allow Reprint"
msgstr "Povolit Dotisk"
-#: PO_Header.php:762
+#: PO_Header.php:758
msgid "Reprint Now"
msgstr "Dotisk teď"
-#: PO_Header.php:772
+#: PO_Header.php:768
msgid "Receive this order"
msgstr "Přijmout tuto objednávku"
-#: PO_Header.php:776
+#: PO_Header.php:772
#, fuzzy
msgid "New Purchase Order"
msgstr "Nákupní objednávka"
-#: PO_Header.php:811
+#: PO_Header.php:809
msgid "Status Comment"
msgstr "Stav komentář"
-#: PO_Header.php:816
+#: PO_Header.php:814
msgid "Status Update"
msgstr "Status Update"
-#: PO_Header.php:823
+#: PO_Header.php:821
msgid "Warehouse Info"
msgstr "Sklad Info"
-#: PO_Header.php:825
+#: PO_Header.php:823
msgid "Supplier Info"
msgstr "Dodavatel Info"
-#: PO_Header.php:830 includes/PDFPickingListHeader.inc:13
+#: PO_Header.php:828 includes/PDFPickingListHeader.inc:13
msgid "Warehouse"
msgstr "Sklad"
-#: PO_Header.php:894
+#: PO_Header.php:892
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location"
@@ -17601,27 +17602,27 @@
"Výchozí umístění skladu nastavit pro tohoto uživatele není v současnosti "
"definován Umístění skladu"
-#: PO_Header.php:895
+#: PO_Header.php:893
msgid "Your system administrator needs to amend your user record"
msgstr "Správce systému musí změnit své uživatelské záznam"
-#: PO_Header.php:937
+#: PO_Header.php:935
msgid "Delivery Contact"
msgstr "Dodací Kontakt"
-#: PO_Header.php:962
+#: PO_Header.php:960
msgid "De...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-28 09:49:35
|
Revision: 4520
http://web-erp.svn.sourceforge.net/web-erp/?rev=4520&view=rev
Author: daintree
Date: 2011-03-28 09:49:25 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
zh_HK and zh_CN fix up
Modified Paths:
--------------
trunk/AddCustomerContacts.php
trunk/GoodsReceived.php
trunk/UnitsOfMeasure.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/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/AddCustomerContacts.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.6 $ */
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Contacts');
include('includes/header.inc');
@@ -18,7 +18,7 @@
$DebtorNo = $_GET['DebtorNo'];
}
echo "<a href='" . $rootpath . '/Customers.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Customers') . '</a><br>';
-$SQLname='SELECT * from debtorsmaster where debtorno="'.$DebtorNo.'"';
+$SQLname="SELECT * from debtorsmaster where debtorno='" .$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/GoodsReceived.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -28,7 +28,7 @@
if (isset($_GET['PONumber']) and $_GET['PONumber']<=0 and !isset($_SESSION['PO'.$identifier])) {
/* This page can only be called with a purchase order number for invoicing*/
- echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">'.
+ echo '<div class="centre"><a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
_('Select a purchase order to receive').'</a></div>';
echo '<br />'. _('This page can only be opened if a purchase order has been selected. Please select a purchase order first');
include ('includes/footer.inc');
@@ -65,7 +65,7 @@
_('Receive') . '" alt="" />' . ' ' . _('Receive Purchase Order') . '';
echo ' : '. $_SESSION['PO'.$identifier]->OrderNo .' '. _('from'). ' ' . $_SESSION['PO'.$identifier]->SupplierName . '</p>';
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . 'identifier=' . $identifier . '" method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier=' . $identifier . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_POST['ProcessGoodsReceived'])) {
@@ -83,7 +83,7 @@
<tr><th colspan="2"></th>
<th align="centre" colspan="3"><b>' . _('Supplier Units') . '</b></th>
<th></th>
- <th align="centre" colspan="5"><b>' . _('Our Units') . '</b></th>
+ <th align="centre" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
</tr>
<tr><th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -209,9 +209,11 @@
}
if ($OrderLine->ReceiveQty < 0 AND $_SESSION['ProhibitNegativeStock']==1){
- $SQL = "SELECT locstock.quantity FROM
- locstock WHERE locstock.stockid='" . $OrderLine->StockID . "'
- AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
+ $SQL = "SELECT locstock.quantity
+ FROM locstock
+ WHERE locstock.stockid='" . $OrderLine->StockID . "'
+ AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
+
$CheckNegResult = DB_query($SQL,$db);
$CheckNegRow = DB_fetch_row($CheckNegResult);
if ($CheckNegRow[0]+$OrderLine->ReceiveQty<0){
@@ -256,16 +258,16 @@
/*Now need to check that the order details are the same as they were when they were read into the Items array. If they've changed then someone else must have altered them */
// Otherwise if you try to fullfill item quantities separately will give error.
$SQL = "SELECT itemcode,
- glcode,
- quantityord,
- quantityrecd,
- qtyinvoiced,
- shiptref,
- jobref
- FROM purchorderdetails
- WHERE orderno='" . (int) $_SESSION['PO'.$identifier]->OrderNo . "'
- AND completed=0
- ORDER BY podetailitem";
+ glcode,
+ quantityord,
+ quantityrecd,
+ qtyinvoiced,
+ shiptref,
+ jobref
+ FROM purchorderdetails
+ WHERE orderno='" . (int) $_SESSION['PO'.$identifier]->OrderNo . "'
+ AND completed=0
+ ORDER BY podetailitem";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not check that the details of the purchase order had not been changed by another user because'). ':';
$DbgMsg = _('The following SQL to retrieve the purchase order details was used');
@@ -404,21 +406,21 @@
/*Need to insert a GRN item */
$SQL = "INSERT INTO grns (grnbatch,
- podetailitem,
- itemcode,
- itemdescription,
- deliverydate,
- qtyrecd,
- supplierid,
- stdcostunit)
- VALUES ('" . $GRN . "',
- '" . $OrderLine->PODetailRec . "',
- '" . $OrderLine->StockID . "',
- '" . $OrderLine->ItemDescription . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . "',
- '" . $CurrentStandardCost . "')";
+ podetailitem,
+ itemcode,
+ itemdescription,
+ deliverydate,
+ qtyrecd,
+ supplierid,
+ stdcostunit)
+ VALUES ('" . $GRN . "',
+ '" . $OrderLine->PODetailRec . "',
+ '" . $OrderLine->StockID . "',
+ '" . $OrderLine->ItemDescription . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . "',
+ '" . $CurrentStandardCost . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('A GRN record could not be inserted') . '. ' . _('This receipt of goods has not been processed because');
$DbgMsg = _('The following SQL to insert the GRN record was used');
@@ -455,29 +457,29 @@
/* Insert stock movements - with unit cost */
$SQL = "INSERT INTO stockmoves (stockid,
- type,
- transno,
- loccode,
- trandate,
- price,
- prd,
- reference,
- qty,
- standardcost,
- newqoh)
- VALUES (
- '" . $OrderLine->StockID . "',
- 25,
- '" . $GRN . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $LocalCurrencyPrice . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . $_SESSION['PO'.$identifier]->SupplierName . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
- )";
+ type,
+ transno,
+ loccode,
+ trandate,
+ price,
+ prd,
+ reference,
+ qty,
+ standardcost,
+ newqoh)
+ VALUES (
+ '" . $OrderLine->StockID . "',
+ 25,
+ '" . $GRN . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $LocalCurrencyPrice . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . $_SESSION['PO'.$identifier]->SupplierName . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -684,7 +686,7 @@
echo '<br /><div class=centre>'. _('GRN number'). ' '. $GRN .' '. _('has been processed').'<br />';
echo '<br /><a href=PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'>'. _('Print this Goods Received Note (GRN)').'</a><br /><br />';
- echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' .
+ echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' .
_('Select a different purchase order for receiving goods against'). '</a></div>';
/*end of process goods received entry */
include('includes/footer.inc');
@@ -692,7 +694,7 @@
} else { /*Process Goods received not set so show a link to allow mod of line items on order and allow input of date goods received*/
- echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Items.php">' . _('Modify Order Items'). '</a></div>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/PO_Header.php?ModifyOrderNumber=' .$_SESSION['PO'.$identifier]->OrderNo . '">' . _('Modify Order Items'). '</a></div>';
echo '<br /><div class="centre"><input type=submit name=Update Value=' . _('Update') . '><p>';
echo '<input type=submit name="ProcessGoodsReceived" Value="' . _('Process Goods Received') . '"></div>';
Modified: trunk/UnitsOfMeasure.php
===================================================================
--- trunk/UnitsOfMeasure.php 2011-03-27 01:50:33 UTC (rev 4519)
+++ trunk/UnitsOfMeasure.php 2011-03-28 09:49:25 UTC (rev 4520)
@@ -64,9 +64,6 @@
$sql[] = "UPDATE stockmaster
SET units='" . $_POST['MeasureName'] . "'
WHERE units ".LIKE." '" . $OldMeasureName . "'";
- $sql[] = "UPDATE contracts
- SET units='" . $_POST['MeasureName'] . "'
- WHERE units ".LIKE." '" . $OldMeasureName . "'";
} else {
$InputError = 1;
prnMsg( _('The unit of measure no longer exist.'),'error');
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-03-27 01:50:33 UTC (rev 4519)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-03-28 09:49:25 UTC (rev 4520)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 16:22+1200\n"
+"POT-Creation-Date: 2011-03-27 19:34+1200\n"
"PO-Revision-Date: 2010-07-25 17:04+0000\n"
"Last-Translator: Tim Schofield <ti...@we...>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -266,12 +266,12 @@
#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538 MRP.php:542
+#: MRPCalendar.php:222 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:264
#: PaymentMethods.php:270 PDFChequeListing.php:63
#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:758 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
+#: PO_Header.php:754 PO_PDFPurchOrder.php:344 PO_PDFPurchOrder.php:347
#: PurchData.php:192 PurchData.php:494 PurchData.php:497
#: RecurringSalesOrders.php:483 RecurringSalesOrders.php:486
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
@@ -301,12 +301,12 @@
#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
-#: MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536 MRP.php:540
+#: MRPCalendar.php:224 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
#: PaymentMethods.php:203 PaymentMethods.php:204 PaymentMethods.php:265
#: PaymentMethods.php:271 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:757 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
+#: PO_Header.php:753 PO_PDFPurchOrder.php:345 PO_PDFPurchOrder.php:348
#: PurchData.php:195 PurchData.php:495 PurchData.php:498
#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
@@ -367,7 +367,7 @@
#: Payments.php:958 PaymentTerms.php:204 PcAssignCashToTab.php:255
#: PcClaimExpensesFromTab.php:230 PcExpenses.php:187 PcExpensesTypeTab.php:164
#: PcTabs.php:189 PcTypeTabs.php:175 PO_AuthorisationLevels.php:150
-#: PO_Items.php:764 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
+#: PO_Items.php:762 Prices_Customer.php:284 Prices.php:228 PurchData.php:208
#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
#: SalesTypes.php:207 SelectCreditItems.php:745 SelectCustomer.php:611
@@ -535,7 +535,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:236
#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:70
-#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:413 SalesAnalReptCols.php:129
+#: PcTabs.php:60 PcTypeTabs.php:62 PO_Items.php:411 SalesAnalReptCols.php:129
#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:353 Suppliers.php:514
#: SupplierTypes.php:69
msgid "has been updated"
@@ -591,7 +591,7 @@
msgstr "Jméno kontaktní osoby"
#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
-#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:223
+#: PO_Header.php:956 PO_Header.php:1026 SelectCreditItems.php:223
#: SelectCustomer.php:464 SelectOrderItems.php:639
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:117
#: includes/PDFTransPageHeaderPortrait.inc:105
@@ -824,8 +824,8 @@
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
-#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:473
-#: PO_Items.php:607 PO_Items.php:634 SalesAnalReptCols.php:356
+#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:471
+#: PO_Items.php:605 PO_Items.php:632 SalesAnalReptCols.php:356
#: SpecialOrder.php:369 StockLocTransferReceive.php:373
#: StockQuantityByDate.php:114 includes/SelectOrderItems_IntoCart.inc:53
msgid "could not be retrieved because"
@@ -854,7 +854,7 @@
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:118
#: includes/PDFPaymentRun_PymtFooter.php:154
-#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:86
+#: includes/PDFPaymentRun_PymtFooter.php:185 includes/ConnectDB_mysqli.inc:79
#: includes/ConnectDB_mysql.inc:68
msgid "The SQL that failed was"
msgstr "SQL příkaz, který selhal, byl"
@@ -1824,7 +1824,7 @@
#: InventoryQuantities.php:210 MRPPlannedPurchaseOrders.php:305
#: MRPPlannedWorkOrders.php:367 MRPReport.php:826 MRPReschedules.php:190
#: MRPShortages.php:283 PDFOrderStatus.php:299 PDFPriceList.php:331
-#: PDFReceipt.php:32 PO_Header.php:792 PO_PDFPurchOrder.php:59
+#: PDFReceipt.php:32 PO_Header.php:789 PO_PDFPurchOrder.php:59
#: PO_SelectOSPurchOrder.php:476 ReorderLevel.php:251 StockDispatch.php:337
#: SuppPriceList.php:254 Tax.php:252 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
@@ -2006,7 +2006,7 @@
#: MRPShortages.php:299 PaymentTerms.php:180 PcExpenses.php:159
#: PcExpenses.php:248 PcExpensesTypeTab.php:148 PcReportTab.php:174
#: PcTypeTabs.php:158 PDFOrdersInvoiced.php:345 PDFOrderStatus.php:313
-#: PDFPrintLabel.php:239 PO_Items.php:715 PO_Items.php:1042
+#: PDFPrintLabel.php:239 PO_Items.php:713 PO_Items.php:1046
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:178
#: PricesByCost.php:119 ReorderLevelLocation.php:55 ReorderLevel.php:266
#: ReverseGRN.php:377 SalesCategories.php:427 SelectAsset.php:225
@@ -2112,7 +2112,7 @@
#: CustomerReceipt.php:1029 CustomerReceipt.php:1032
#: DiscountCategories.php:103 DiscountCategories.php:106
#: FixedAssetTransfer.php:61 MRPDemands.php:330 MRPDemands.php:333
-#: MRPReport.php:563 PO_Header.php:516 PO_Items.php:1021 PO_Items.php:1026
+#: MRPReport.php:563 PO_Header.php:516 PO_Items.php:1025 PO_Items.php:1030
#: PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:170 PurchData.php:264
#: SelectAsset.php:93 SelectCompletedOrder.php:518 SelectCreditItems.php:208
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
@@ -2145,7 +2145,7 @@
#: BOMInquiry.php:26 BOMs.php:803 ContractBOM.php:331 Contracts.php:766
#: CounterSales.php:2142 CustomerReceipt.php:1037 FixedAssetTransfer.php:72
-#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:521 PO_Items.php:1029
+#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:521 PO_Items.php:1033
#: SelectAsset.php:101 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:419 SelectGLAccount.php:98 SelectOrderItems.php:627
#: SelectOrderItems.php:1596 SelectProduct.php:508 SelectSupplier.php:212
@@ -2155,7 +2155,7 @@
msgstr "Vyhledat"
#: BOMInquiry.php:36 BOMs.php:738 ContractBOM.php:51 MRPDemands.php:57
-#: MRPReport.php:589 PO_Items.php:826 PO_SelectOSPurchOrder.php:64
+#: MRPReport.php:589 PO_Items.php:824 PO_SelectOSPurchOrder.php:64
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:95
#: SelectCreditItems.php:276 SelectProduct.php:521 SelectSalesOrder.php:348
#: SelectWorkOrder.php:35 Shipt_Select.php:62 SupplierTenders.php:378
@@ -2185,7 +2185,7 @@
#: CustomerReceipt.php:1043 GLCodesInquiry.php:28 MRPDemands.php:91
#: MRPPlannedWorkOrders.php:257 MRPReport.php:759 PDFOrdersInvoiced.php:344
#: PDFOrderStatus.php:312 PDFPrintLabel.php:239 PO_Header.php:531
-#: PO_Items.php:1041 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:177
+#: PO_Items.php:1045 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:177
#: PricesByCost.php:118 PurchData.php:338 ReorderLevelLocation.php:54
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:534 SelectCreditItems.php:220
@@ -2202,7 +2202,7 @@
#: BOMInquiry.php:95 BOMs.php:812 ConfirmDispatch_Invoice.php:271
#: ContractBOM.php:345 CounterSales.php:1989 CounterSales.php:2169
#: Credit_Invoice.php:273 GoodsReceived.php:91 GoodsReceived.php:95
-#: MRPReport.php:762 OffersReceived.php:95 PO_Items.php:1044
+#: MRPReport.php:762 OffersReceived.php:95 PO_Items.php:1049
#: PO_SelectOSPurchOrder.php:216 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:539 SelectCreditItems.php:957
#: SelectOrderItems.php:1437 SelectOrderItems.php:1621 SelectProduct.php:108
@@ -2528,7 +2528,7 @@
msgstr "Úroveň"
#: BOMs.php:519 BOMs.php:636 Contracts.php:868 FixedAssetRegister.php:83
-#: InventoryQuantities.php:223 Locations.php:328 MRP.php:549 MRP.php:563
+#: InventoryQuantities.php:223 Locations.php:328 MRP.php:548 MRP.php:562
#: PDFOrdersInvoiced.php:306 PDFOrderStatus.php:272
#: ReorderLevelLocation.php:173 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:49 StockSerialItemResearch.php:78
@@ -2871,8 +2871,8 @@
#: CompanyPreferences.php:472 ConfirmDispatch_Invoice.php:626
#: ConfirmDispatch_Invoice.php:1658 Credit_Invoice.php:1529
#: FixedAssetItems.php:123 FixedAssetItems.php:570 GLBudgets.php:219
-#: GLTags.php:44 GoodsReceived.php:228 GoodsReceived.php:234
-#: GoodsReceived.php:241 GoodsReceived.php:697 Labels.php:262
+#: GLTags.php:44 GoodsReceived.php:230 GoodsReceived.php:236
+#: GoodsReceived.php:243 GoodsReceived.php:699 Labels.php:262
#: MRPCalendar.php:309 Payments.php:852 PcAuthorizeExpenses.php:262
#: PO_AuthoriseMyOrders.php:125 PricesByCost.php:188 PurchData.php:502
#: ReorderLevelLocation.php:156 SelectCreditItems.php:898 SMTPServer.php:63
@@ -3050,7 +3050,7 @@
#: ConfirmDispatch_Invoice.php:268 ContractBOM.php:241 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
#: CounterSales.php:2301 Credit_Invoice.php:270 DeliveryDetails.php:783
-#: GoodsReceived.php:88 OrderDetails.php:153 PO_Items.php:714
+#: GoodsReceived.php:88 OrderDetails.php:153 PO_Items.php:712
#: PO_OrderDetails.php:142 PrintCustTrans.php:648 PrintCustTrans.php:711
#: PrintCustTrans.php:749 PrintCustTransPortrait.php:827
#: PrintCustTransPortrait.php:910 PrintCustTransPortrait.php:954
@@ -3075,7 +3075,7 @@
#: ConfirmDispatch_Invoice.php:269 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
#: Credit_Invoice.php:271 DeliveryDetails.php:784 DeliveryDetails.php:849
-#: OrderDetails.php:154 PO_Items.php:782 PO_OrderDetails.php:143
+#: OrderDetails.php:154 PO_Items.php:780 PO_OrderDetails.php:143
#: PrintCustTrans.php:649 PrintCustTrans.php:712 PrintCustTrans.php:750
#: PrintCustTransPortrait.php:828 PrintCustTransPortrait.php:911
#: PrintCustTransPortrait.php:955 RecurringSalesOrders.php:321
@@ -3321,12 +3321,12 @@
msgstr "Prosím nápravě tohoto"
#: ConfirmDispatch_Invoice.php:653 Credit_Invoice.php:484
-#: GoodsReceived.php:251
+#: GoodsReceived.php:253
msgid "The company information and preferences could not be retrieved"
msgstr "Informace o společnosti a preference se nepodařilo získat"
#: ConfirmDispatch_Invoice.php:653 Credit_Invoice.php:484
-#: GoodsReceived.php:251
+#: GoodsReceived.php:253
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
@@ -3346,7 +3346,7 @@
"Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena "
"bude potvrzeno"
-#: ConfirmDispatch_Invoice.php:681 GoodsReceived.php:288
+#: ConfirmDispatch_Invoice.php:681 GoodsReceived.php:290
msgid "Processing halted"
msgstr "Zpracování zastaveno"
@@ -3437,10 +3437,10 @@
#: Credit_Invoice.php:1070 Credit_Invoice.php:1093 Credit_Invoice.php:1264
#: Credit_Invoice.php:1304 Credit_Invoice.php:1331 Credit_Invoice.php:1352
#: Credit_Invoice.php:1381 Credit_Invoice.php:1407 Credit_Invoice.php:1433
-#: GoodsReceived.php:270 GoodsReceived.php:351 GoodsReceived.php:393
-#: GoodsReceived.php:423 GoodsReceived.php:451 GoodsReceived.php:482
-#: GoodsReceived.php:500 GoodsReceived.php:529 GoodsReceived.php:546
-#: GoodsReceived.php:634 GoodsReceived.php:659 PDFStockCheckComparison.php:122
+#: GoodsReceived.php:272 GoodsReceived.php:353 GoodsReceived.php:395
+#: GoodsReceived.php:425 GoodsReceived.php:453 GoodsReceived.php:484
+#: GoodsReceived.php:502 GoodsReceived.php:531 GoodsReceived.php:548
+#: GoodsReceived.php:636 GoodsReceived.php:661 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3546,11 +3546,11 @@
#: Credit_Invoice.php:990 Credit_Invoice.php:1029 Credit_Invoice.php:1070
#: Credit_Invoice.php:1093 Credit_Invoice.php:1264 Credit_Invoice.php:1304
#: Credit_Invoice.php:1331 Credit_Invoice.php:1352 Credit_Invoice.php:1381
-#: Credit_Invoice.php:1407 Credit_Invoice.php:1433 GoodsReceived.php:270
-#: GoodsReceived.php:351 GoodsReceived.php:393 GoodsReceived.php:423
-#: GoodsReceived.php:451 GoodsReceived.php:482 GoodsReceived.php:500
-#: GoodsReceived.php:529 GoodsReceived.php:546 GoodsReceived.php:634
-#: GoodsReceived.php:659 PDFStockCheckComparison.php:122
+#: Credit_Invoice.php:1407 Credit_Invoice.php:1433 GoodsReceived.php:272
+#: GoodsReceived.php:353 GoodsReceived.php:395 GoodsReceived.php:425
+#: GoodsReceived.php:453 GoodsReceived.php:484 GoodsReceived.php:502
+#: GoodsReceived.php:531 GoodsReceived.php:548 GoodsReceived.php:636
+#: GoodsReceived.php:661 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3701,7 +3701,7 @@
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:950 ContractCosting.php:306
-#: CounterSales.php:1304 Credit_Invoice.php:684 GoodsReceived.php:452
+#: CounterSales.php:1304 Credit_Invoice.php:684 GoodsReceived.php:454
#: ReverseGRN.php:220 SelectCreditItems.php:1360 StockTransfers.php:382
#: StockTransfers.php:392 WorkOrderIssue.php:163 WorkOrderReceive.php:320
#: WorkOrderReceive.php:426
@@ -3789,7 +3789,7 @@
#: ConfirmDispatch_Invoice.php:1119 ContractCosting.php:335
#: CounterSales.php:1474 Credit_Invoice.php:892 Credit_Invoice.php:991
-#: Credit_Invoice.php:1030 GoodsReceived.php:483
+#: Credit_Invoice.php:1030 GoodsReceived.php:485
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1254 WorkOrderIssue.php:194 WorkOrderReceive.php:349
#: WorkOrderReceive.php:456
@@ -3828,7 +3828,7 @@
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
#: ConfirmDispatch_Invoice.php:1172 Credit_Invoice.php:946
-#: GoodsReceived.php:546 SelectCreditItems.php:1338 StockAdjustments.php:226
+#: GoodsReceived.php:548 SelectCreditItems.php:1338 StockAdjustments.php:226
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:285
#: StockTransfers.php:260 StockTransfers.php:368 WorkOrderIssue.php:230
#: WorkOrderIssue.php:285 WorkOrderReceive.php:507 WorkOrderReceive.php:578
@@ -3836,7 +3836,7 @@
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1173 Credit_Invoice.php:947
-#: GoodsReceived.php:547 StockAdjustments.php:227
+#: GoodsReceived.php:549 StockAdjustments.php:227
#: StockLocTransferReceive.php:173 StockLocTransferReceive.php:286
#: StockTransfers.php:261 StockTransfers.php:369 WorkOrderIssue.php:231
#: WorkOrderIssue.php:286 WorkOrderReceive.php:508 WorkOrderReceive.php:579
@@ -3949,7 +3949,7 @@
msgid "The fixed asset transaction could not be inserted because"
msgstr "Dlouhodobého majetku transakce nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1509 GoodsReceived.php:584 ReverseGRN.php:176
+#: ConfirmDispatch_Invoice.php:1509 GoodsReceived.php:586 ReverseGRN.php:176
#: SupplierCredit.php:1195 SupplierCredit.php:1283 SupplierInvoice.php:1182
#: SupplierInvoice.php:1267
msgid "The following SQL to insert the fixed asset transaction record was used"
@@ -4096,18 +4096,18 @@
msgid "to continue"
msgstr "pro pokračování"
-#: ContractBOM.php:143 CounterSales.php:327 PO_Items.php:966
+#: ContractBOM.php:143 CounterSales.php:327 PO_Items.php:970
#: SelectCreditItems.php:368 SelectOrderItems.php:856 SupplierTenders.php:469
#: WorkOrderEntry.php:151 WorkOrderIssue.php:469
msgid "There is a problem selecting the part records to display because"
msgstr "To je problém výběru část záznamy k zobrazení, protože"
-#: ContractBOM.php:144 PO_Items.php:967 SupplierTenders.php:470
+#: ContractBOM.php:144 PO_Items.php:971 SupplierTenders.php:470
#: Z_ChangeStockCategory.php:63 Z_ChangeStockCode.php:95
msgid "The SQL statement that failed was"
msgstr "Příkazu SQL, který byl neúspěšný"
-#: ContractBOM.php:148 PO_Items.php:971 SupplierTenders.php:474
+#: ContractBOM.php:148 PO_Items.php:975 SupplierTenders.php:474
msgid "There are no products to display matching the criteria provided"
msgstr "Nejsou žádné výrobky k zobrazení odpovídající kritériím stanoveným"
@@ -4118,7 +4118,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:185 PO_Items.php:587
+#: ContractBOM.php:185 PO_Items.php:585
#: includes/SelectOrderItems_IntoCart.inc:26
#: includes/SelectOrderItems_IntoCart.inc:63
msgid "The item"
@@ -4138,11 +4138,11 @@
msgid "The item details could not be retrieved"
msgstr "Položku Podrobnosti se nepodařilo získat"
-#: ContractBOM.php:201 PO_Items.php:608 SelectCreditItems.php:600
+#: ContractBOM.php:201 PO_Items.php:606 SelectCreditItems.php:600
msgid "The SQL used to retrieve the item details but failed was"
msgstr "SQL používá k načtení položky detaily, ale nepodařilo se"
-#: ContractBOM.php:213 CounterSales.php:422 PO_Items.php:685
+#: ContractBOM.php:213 CounterSales.php:422 PO_Items.php:683
#: SelectOrderItems.php:950 includes/SelectOrderItems_IntoCart.inc:58
#: includes/SelectOrderItems_IntoCart.inc:162
msgid "The item code"
@@ -4180,24 +4180,24 @@
msgid "Back To Contract Header"
msgstr "Zpět na záhlaví smlouvy"
-#: ContractBOM.php:290 PO_Items.php:989
+#: ContractBOM.php:290 PO_Items.php:993
msgid "The supplier category details could not be retrieved because"
msgstr "Podrobnosti dodavatel kategorie se nepodařilo získat, protože"
-#: ContractBOM.php:291 PO_Items.php:990
+#: ContractBOM.php:291 PO_Items.php:994
msgid "The SQL used to retrieve the category details but failed was"
msgstr "SQL používá k načtení kategorii detaily, ale nepodařilo se"
-#: ContractBOM.php:294 PO_Items.php:993
+#: ContractBOM.php:294 PO_Items.php:997
msgid "Search For Stock Items"
msgstr "Hledat na sklade"
#: ContractBOM.php:299 CounterSales.php:2113 CounterSales.php:2116
#: DailySalesInquiry.php:44 DailySalesInquiry.php:46 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:155
-#: InventoryQuantities.php:176 InventoryQuantities.php:178 MRP.php:565
+#: InventoryQuantities.php:176 InventoryQuantities.php:178 MRP.php:564
#: MRPReport.php:544 MRPReport.php:546 MRPReschedules.php:161
-#: PDFPriceList.php:194 PDFPrintLabel.php:240 PO_Items.php:997
+#: PDFPriceList.php:194 PDFPrintLabel.php:240 PO_Items.php:1001
#: POReport.php:1486 ReorderLevel.php:187 ReorderLevel.php:189
#: ReorderLevel.php:217 ReorderLevel.php:219 SalesGraph.php:91
#: SalesGraph.php:93 SalesGraph.php:111 SalesGraph.php:113 SalesGraph.php:134
@@ -4214,18 +4214,18 @@
msgid "All"
msgstr "Všechny"
-#: ContractBOM.php:320 PO_Items.php:1018 SelectCompletedOrder.php:515
+#: ContractBOM.php:320 PO_Items.php:1022 SelectCompletedOrder.php:515
#: SelectCreditItems.php:939
msgid "Enter text extracts in the description"
msgstr "Zadejte text extrakty v popisu"
-#: ContractBOM.php:323 CounterSales.php:2138 PO_Items.php:1021
+#: ContractBOM.php:323 CounterSales.php:2138 PO_Items.php:1025
#: SelectCompletedOrder.php:518 SelectCreditItems.php:942
#: SelectOrderItems.php:1589 SelectSalesOrder.php:485 SelectWorkOrder.php:173
msgid "Enter extract of the Stock Code"
msgstr "Zadejte extrakt skladem zákoníku"
-#: ContractBOM.php:329 PO_Items.php:1027
+#: ContractBOM.php:329 PO_Items.php:1031
msgid "Create a New Stock Item"
msgstr "Vytvoření nové položky skladem"
@@ -4235,22 +4235,22 @@
msgstr "Obrázek"
#: ContractBOM.php:368 CounterSales.php:2001 FixedAssetItems.php:465
-#: FixedAssetItems.php:469 PO_Items.php:1068 SelectCreditItems.php:969
+#: FixedAssetItems.php:469 PO_Items.php:1073 SelectCreditItems.php:969
#: SelectOrderItems.php:1449 SelectOrderItems.php:1628 SelectProduct.php:408
#: Stocks.php:709 Stocks.php:713 SupplierTenders.php:517
#: WorkOrderEntry.php:616 WorkOrderIssue.php:676
msgid "No Image"
msgstr "Obrázek není k dispozici"
-#: ContractBOM.php:390 PO_Items.php:1094 SupplierTenders.php:561
+#: ContractBOM.php:390 PO_Items.php:1102 SupplierTenders.php:561
msgid "Only the first"
msgstr "Pouze první"
-#: ContractBOM.php:390 PO_Items.php:1094 SupplierTenders.php:561
+#: ContractBOM.php:390 PO_Items.php:1102 SupplierTenders.php:561
msgid "can be displayed"
msgstr "mohou být zobrazeny"
-#: ContractBOM.php:391 PO_Items.php:1095 SupplierTenders.php:562
+#: ContractBOM.php:391 PO_Items.php:1103 SupplierTenders.php:562
msgid "Please restrict your search to only the parts required"
msgstr "Prosím, omezit vyhledávání pouze na požadované části"
@@ -4305,7 +4305,7 @@
#: ContractCosting.php:75 ContractCosting.php:81 Contracts.php:933
#: CounterSales.php:703 DeliveryDetails.php:786 DeliveryDetails.php:851
-#: OrderDetails.php:156 PO_Items.php:814 PrintCustTrans.php:651
+#: OrderDetails.php:156 PO_Items.php:812 PrintCustTrans.php:651
#: PrintCustTrans.php:714 PrintCustTrans.php:752
#: PrintCustTransPortrait.php:830 PrintCustTransPortrait.php:913
#: PrintCustTransPortrait.php:957 RecurringSalesOrders.php:323
@@ -4399,7 +4399,7 @@
msgid "The SQL used to close the work order was:"
msgstr "SQL použitý k uzavření pracovního příkazu byl:"
-#: ContractCosting.php:305 GoodsReceived.php:451
+#: ContractCosting.php:305 GoodsReceived.php:453
#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:239
#: StockLocTransferReceive.php:297 StockLocTransferReceive.php:306
#: StockTransfers.php:381 StockTransfers.php:391 WorkOrderIssue.php:162
@@ -5068,7 +5068,7 @@
msgid "Quote"
msgstr "Citovat"
-#: Contracts.php:908 PO_Header.php:795 POReport.php:1487
+#: Contracts.php:908 PO_Header.php:793 POReport.php:1487
#: PO_SelectPurchOrder.php:140 PO_SelectPurchOrder.php:142
#: SalesInquiry.php:1104 SelectContract.php:52 SelectContract.php:58
#: SelectContract.php:64 SelectContract.php:70 SelectContract.php:76
@@ -5991,7 +5991,7 @@
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1447 GoodsReceived.php:685 SupplierCredit.php:1297
+#: Credit_Invoice.php:1447 GoodsReceived.php:687 SupplierCredit.php:1297
#: SupplierInvoice.php:1288 WorkOrderIssue.php:354 WorkOrderReceive.php:674
#: Z_BottomUpCosts.php:33
msgid "has been processed"
@@ -6419,7 +6419,7 @@
#: CustLoginSetup.php:16 index.php:17 InventoryQuantities.php:147
#: InventoryValuation.php:202 Locations.php:353 Locations.php:412
#: MRPCalendar.php:22 MRPCreateDemands.php:187 MRPDemands.php:28
-#: MRPDemandTypes.php:19 MRP.php:518 MRPPlannedPurchaseOrders.php:267
+#: MRPDemandTypes.php:19 MRP.php:517 MRPPlannedPurchaseOrders.php:267
#: MRPPlannedWorkOrders.php:249 MRPPlannedWorkOrders.php:330
#: PricesByCost.php:9 ReorderLevelLocation.php:13 ReorderLevel.php:173
#: SelectProduct.php:71 StockDispatch.php:220 StockMovements.php:26
@@ -7648,7 +7648,7 @@
msgid "Banked into the"
msgstr "Naklonila do"
-#: CustomerReceipt.php:841 Payments.php:719 PO_Items.php:258
+#: CustomerReceipt.php:841 Payments.php:719 PO_Items.php:256
#: SelectSalesOrder.php:135 SelectSalesOrder.php:300 SpecialOrder.php:400
msgid "on"
msgstr "na"
@@ -7870,14 +7870,14 @@
"S cílem vytvořit nový zákazník, musíte se nejprve nastavit alespoň jedno "
"prodejní typ / ceník"
-#: Customers.php:436 Customers.php:445 includes/ConnectDB_mysqli.inc:35
+#: Customers.php:436 Customers.php:445 includes/ConnectDB_mysqli.inc:29
#: includes/ConnectDB_mysql.inc:29
msgid "Click"
msgstr "Klepněte na tlačítko"
#: Customers.php:436 Customers.php:445 MRPPlannedPurchaseOrders.php:18
#: MRPPlannedWorkOrders.php:15 MRPReschedules.php:18 MRPShortages.php:17
-#: OffersReceived.php:229 PO_Header.php:437 includes/ConnectDB_mysqli.inc:35
+#: OffersReceived.php:229 PO_Header.php:437 includes/ConnectDB_mysqli.inc:29
#: includes/ConnectDB_mysql.inc:29
msgid "here"
msgstr "zde"
@@ -7976,7 +7976,7 @@
"kartu Nastavení v hlavním menu a nastavit alespoň jeden jako první"
#: Customers.php:550 Customers.php:799 Customers.php:802 index.php:1059
-#: PaymentTerms.php:13 PO_Header.php:1034 PrintCustTrans.php:324
+#: PaymentTerms.php:13 PO_Header.php:1032 PrintCustTrans.php:324
#: PrintCustTransPortrait.php:437 Suppliers.php:680 Suppliers.php:833
#: includes/PO_PDFOrderPageHeader.inc:62 includes/PO_PDFOrderPageHeader.inc:64
msgid "Payment Terms"
@@ -8147,7 +8147,7 @@
#: CustomerTypes.php:95 PcAssignCashToTab.php:97 PcClaimExpensesFromTab.php:88
#: PcExpenses.php:96 PcExpensesTypeTab.php:61 PcTabs.php:97 PcTypeTabs.php:87
-#: PO_Items.php:259 SalesTypes.php:88 SelectSalesOrder.php:135
+#: PO_Items.php:257 SalesTypes.php:88 SelectSalesOrder.php:135
#: SelectSalesOrder.php:300 SpecialOrder.php:400 SupplierTypes.php:93
msgid "has been created"
msgstr "byl vytvořen"
@@ -8839,7 +8839,7 @@
msgid "Discount Category Code"
msgstr "Kód slevové skupiny"
-#: DiscountCategories.php:90 DiscountCategories.php:231 PO_Header.php:848
+#: DiscountCategories.php:90 DiscountCategories.php:231 PO_Header.php:846
#: SalesCategories.php:262 SuppInvGRNs.php:276 SupplierTenders.php:57
#, php-format
msgid "Select"
@@ -10426,7 +10426,7 @@
msgstr "Hodnota k dispozici"
#: FixedAssetRegister.php:199 FixedAssetRegister.php:223
-#: PDFBankingSummary.php:169 PDFChequeListing.php:176 PO_Items.php:770
+#: PDFBankingSummary.php:169 PDFChequeListing.php:176 PO_Items.php:768
#: includes/PDFSalesAnalysis.inc:71 includes/PDFSalesAnalysis.inc:125
#: includes/PDFSalesAnalysis.inc:178 includes/PDFSalesAnalysis.inc:312
#: includes/PDFSalesAnalysis.inc:364 includes/PDFSalesAnalysis.inc:414
@@ -10790,7 +10790,7 @@
msgid "Req Del Date"
msgstr "Req Del Datum"
-#: FTP_RadioBeacon.php:57 PO_Header.php:824 PO_Header.php:1050
+#: FTP_RadioBeacon.php:57 PO_Header.php:822 PO_Header.php:1050
#: SelectCompletedOrder.php:590 SelectSalesOrder.php:752
#: SelectSalesOrder.php:768 includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:30
@@ -12108,17 +12108,17 @@
msgid "Supplier Units"
msgstr "Jednotka dodavatele"
-#: GoodsReceived.php:86 PO_Items.php:1043
+#: GoodsReceived.php:86
#, fuzzy
-msgid "Our Units"
+msgid "Our Receiving Units"
msgstr "Jednotky"
-#: GoodsReceived.php:93
+#: GoodsReceived.php:93 PO_Items.php:1048
#, fuzzy
msgid "Conversion"
msgstr "Konverzní faktor (na náš UOM)"
-#: GoodsReceived.php:93
+#: GoodsReceived.php:93 PO_Items.php:1048
#, fuzzy
msgid "Factor"
msgstr "Pro"
@@ -12143,7 +12143,7 @@
msgid "Total value of goods received"
msgstr "Celková hodnota zboží přijatého"
-#: GoodsReceived.php:219
+#: GoodsReceived.php:221
msgid ""
"Receiving a negative quantity that results in negative stock is prohibited "
"by the parameter settings. This delivery of stock cannot be processed until "
@@ -12153,15 +12153,15 @@
"nastavení parametrů. Tato dodávka zásob nelze zpracovat, dokud se zásoby "
"této položky je opravena."
-#: GoodsReceived.php:227
+#: GoodsReceived.php:229
msgid "There is nothing to process"
msgstr "Neexistuje nic, co proces"
-#: GoodsReceived.php:227
+#: GoodsReceived.php:229
msgid "Please enter valid quantities greater than zero"
msgstr "Zadejte prosím platný množství větší než nula"
-#: GoodsReceived.php:232
+#: GoodsReceived.php:234
msgid ""
"Negative stocks would result by processing a negative delivery - quantities "
"must be changed or the stock quantity of the item going negative corrected "
@@ -12171,7 +12171,7 @@
"změnit, nebo populaci množství položek bude opraven před tímto negativním "
"dodávky budou zpracovány."
-#: GoodsReceived.php:238
+#: GoodsReceived.php:240
msgid ""
"Entered quantities cannot be greater than the quantity entered on the "
"purchase invoice including the allowed over-receive percentage"
@@ -12179,14 +12179,14 @@
"Zadané množství nemůže být větší než množství uvedené na faktuře včetně "
"povolené přes-přijímat procento"
-#: GoodsReceived.php:240
+#: GoodsReceived.php:242
msgid ""
"Modify the ordered items on the purchase invoice if you wish to increase the "
"quantities"
msgstr ""
"Změnit objednaného zboží na nákupní faktuře, pokud chcete zvýšit množství"
-#: GoodsReceived.php:270
+#: GoodsReceived.php:272
msgid ""
"Could not check that the details of the purchase order had not been changed "
"by another user because"
@@ -12194,11 +12194,11 @@
"Nepodařilo se zkontrolovat, zda údaje v objednávce nebyl změněn jiným "
"uživatelem, protože"
-#: GoodsReceived.php:271
+#: GoodsReceived.php:273
msgid "The following SQL to retrieve the purchase order details was used"
msgstr "Následující SQL získat podrobnosti objednávky bylo použito"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be actioned"
@@ -12206,11 +12206,11 @@
"Tento příkaz byl změněn nebo fakturované protože to dodávka byla začaly být "
"actioned"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid "To enter a delivery against this purchase order"
msgstr "Chcete-li zadat dodání proti této objednávce"
-#: GoodsReceived.php:288
+#: GoodsReceived.php:290
msgid ""
"it must be re-selected and re-read again to update the changes made by the "
"other user"
@@ -12218,83 +12218,83 @@
"to musí být re-vybraný a re-číst a aktualizovat změny provedené ostatními "
"uživateli"
-#: GoodsReceived.php:292
+#: GoodsReceived.php:294
msgid "GL Code of the Line Item"
msgstr "GL Kód Line bod"
-#: GoodsReceived.php:295
+#: GoodsReceived.php:297
msgid "ShiptRef of the Line Item"
msgstr "ShiptRef linie bod"
-#: GoodsReceived.php:298
+#: GoodsReceived.php:300
msgid "Contract Reference of the Line Item"
msgstr "Smlouva Odkaz na řádkové položky"
-#: GoodsReceived.php:302
+#: GoodsReceived.php:304
msgid "Quantity Invoiced of the Line Item"
msgstr "Množství fakturovaná linie bod"
-#: GoodsReceived.php:305
+#: GoodsReceived.php:307
msgid "Stock Code of the Line Item"
msgstr "Skladem Kód Line bod"
-#: GoodsReceived.php:308
+#: GoodsReceived.php:310
msgid "Order Quantity of the Line Item"
msgstr "Aby Množství Line bod"
-#: GoodsReceived.php:311
+#: GoodsReceived.php:313
msgid "Quantity of the Line Item Already Received"
msgstr "Množství řádkové položky již obdržela"
-#: GoodsReceived.php:317 GoodsReceived.php:688
+#: GoodsReceived.php:319 GoodsReceived.php:690
msgid "Select a different purchase order for receiving goods against"
msgstr "Vyberte jinou objednávku pro příjem zboží proti"
-#: GoodsReceived.php:319
+#: GoodsReceived.php:321
msgid "Re-read the updated purchase order for receiving goods against"
msgstr "Re-read aktualizovaný objednávky pro příjem zboží proti"
-#: GoodsReceived.php:351
+#: GoodsReceived.php:353
msgid ""
"The standard cost of the item being received cannot be retrieved because"
msgstr "Standardní pořizovací cena položky je obdržela, nemůže získat, protože"
-#: GoodsReceived.php:352
+#: GoodsReceived.php:354
msgid "The following SQL to retrieve the standard cost was used"
msgstr "Následující SQL získat standardní náklady byly použity"
-#: GoodsReceived.php:393
+#: GoodsReceived.php:395
msgid ""
"The purchase order detail record could not be updated with the quantity "
"received because"
msgstr ""
"Objednávce detail záznamu nelze aktualizovat s množstvím přijaté protože"
-#: GoodsReceived.php:394 ReverseGRN.php:128
+#: GoodsReceived.php:396 ReverseGRN.php:128
msgid "The following SQL to update the purchase order detail record was used"
msgstr "Následující SQL aktualizovat objednávky detail záznamu byla použita"
-#: GoodsReceived.php:423
+#: GoodsReceived.php:425
msgid "A GRN record could not be inserted"
msgstr "ZEL záznam nemůže být vložen"
-#: GoodsReceived.php:423
+#: GoodsReceived.php:425
msgid "This receipt of goods has not been processed because"
msgstr "Toto přijetí zboží nebylo zpracováno, protože"
-#: GoodsReceived.php:424 ReverseGRN.php:156
+#: GoodsReceived.php:426 ReverseGRN.php:156
msgid "The following SQL to insert the GRN record was used"
msgstr "Následující SQL vložit záznam GRN byla použita"
-#: GoodsReceived.php:482
+#: GoodsReceived.php:484
msgid "stock movement records could not be inserted because"
msgstr "Záznamy zásob pohybu nemůže být vložen, protože"
-#: GoodsReceived.php:500
+#: GoodsReceived.php:502
msgid "Could not check if a batch or lot stock item already exists because"
msgstr "Nemohl zkontrolovat, zda šarže na skladě již existuje, protože"
-#: GoodsReceived.php:501
+#: GoodsReceived.php:503
msgid ""
"The following SQL to test for an already existing controlled but not "
"serialised stock item was used"
@@ -12302,17 +12302,17 @@
"Následující SQL k testu na již existující kontrolované, ale ne serializoval "
"na skladě byla použita"
-#: GoodsReceived.php:529 WorkOrderIssue.php:215 WorkOrderReceive.php:492
+#: GoodsReceived.php:531 WorkOrderIssue.php:215 WorkOrderReceive.php:492
#: WorkOrderReceive.php:563
msgid "The serial stock item record could not be inserted because"
msgstr "Pořadové skladová položka záznam nemůže být vložen, protože"
-#: GoodsReceived.php:530 WorkOrderIssue.php:216 WorkOrderReceive.php:493
+#: GoodsReceived.php:532 WorkOrderIssue.php:216 WorkOrderReceive.php:493
#: WorkOrderReceive.php:564
msgid "The following SQL to insert the serial stock item records was used"
msgstr "Následující SQL vložit sériové záznamy na skladě byla použita"
-#: GoodsReceived.php:583 ReverseGRN.php:175 SupplierCredit.php:1194
+#: GoodsReceived.php:585 ReverseGRN.php:175 SupplierCredit.php:1194
#: SupplierCredit.php:1282 SupplierInvoice.php:1181 SupplierInvoice.php:1266
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset "
@@ -12321,7 +12321,7 @@
"Critical Error! POZNÁMKA DOWN tuto chybu a požádat o pomoc hmotného majetku "
"transakce nemůže být vložen, protože"
-#: GoodsReceived.php:603 SupplierInvoice.php:1281
+#: GoodsReceived.php:605 SupplierInvoice.php:1281
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost and date purchased was not able to be updated because:"
@@ -12329,7 +12329,7 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady a datum koupě nemohl být aktualizován, protože:"
-#: GoodsReceived.php:604 SupplierInvoice.php:1282
+#: GoodsReceived.php:606 SupplierInvoice.php:1282
msgid ""
"The following SQL was used to attempt the update of the cost and the date "
"the asset was purchased"
@@ -12337,44 +12337,44 @@
"Následující SQL byl použit k pokusu aktualizace nákladů a datum majetku byl "
"zakoupen"
-#: GoodsReceived.php:634
+#: GoodsReceived.php:636
msgid "The purchase GL posting could not be inserted because"
msgstr "Nákup GL vysílání nemohly být zařazeny, protože"
-#: GoodsReceived.php:635 ReverseGRN.php:303
+#: GoodsReceived.php:637 ReverseGRN.php:303
msgid "The following SQL to insert the purchase GLTrans record was used"
msgstr "Následující SQL vložit na nákup GLTrans záznam byl použit"
-#: GoodsReceived.php:653 SelectSalesOrder.php:896
+#: GoodsReceived.php:655 SelectSalesOrder.php:896
msgid "PO"
msgstr "PO"
-#: GoodsReceived.php:659 ReverseGRN.php:324
+#: GoodsReceived.php:661 ReverseGRN.php:324
msgid "The GRN suspense side of the GL posting could not be inserted because"
msgstr "Napětí ZEL straně GL vyslání nemůže být vložen, protože"
-#: GoodsReceived.php:660 ReverseGRN.php:325
+#: GoodsReceived.php:662 ReverseGRN.php:325
msgid "The following SQL to insert the GRN Suspense GLTrans record was used"
msgstr "Následující SQL vložit GRN napětí GLTrans záznam byl použit"
-#: GoodsReceived.php:670
+#: GoodsReceived.php:672
#, fuzzy
msgid "Order Completed"
msgstr "Dokončeno"
-#: GoodsReceived.php:685 ReverseGRN.php:332
+#: GoodsReceived.php:687 ReverseGRN.php:332
msgid "GRN number"
msgstr "GRN číslo"
-#: GoodsReceived.php:686
+#: GoodsReceived.php:688
msgid "Print this Goods Received Note (GRN)"
msgstr "Vytisknout tuto Zboží Přijaté Poznámka (GRN)"
-#: GoodsReceived.php:695
+#: GoodsReceived.php:697
msgid "Modify Order Items"
msgstr "Změnit pořadí položek"
-#: GoodsReceived.php:698
+#: GoodsReceived.php:700
msgid "Process Goods Received"
msgstr "Proces přijetí zboží"
@@ -14146,103 +14146,103 @@
msgid "Loading requirements from sales orders"
msgstr "Načítání požadavků z prodejních objednávek"
-#: MRP.php:255
+#: MRP.php:254
msgid "Loading requirements from work orders"
msgstr "Načítání požadavků z pracovních příkazů"
-#: MRP.php:297
+#: MRP.php:296
msgid "Loading requirements based on mrpdemands"
msgstr "Načítání požadavky založené na mrpdemands"
-#: MRP.php:317
+#: MRP.php:316
msgid "Loading requirements based on reorder level"
msgstr "Načítání požadavky založené na pořadí úrovni"
-#: MRP.php:324
+#: MRP.php:323
msgid "Creating supplies table"
msgstr "Vytváření zásob tabulka"
-#: MRP.php:338
+#: MRP.php:337
msgid "Create of mrpsupplies failed because"
msgstr "Vytvořit z mrpsupplies se nezdařila, protože"
-#: MRP.php:340
+#: MRP.php:339
msgid "Loading supplies from purchase orders"
msgstr "Načítání dodávky z objednávek"
-#: MRP.php:366
+#: MRP.php:365
msgid "Loading supplies from inventory on hand"
msgstr "Načítání dodávky z inventáře na ruce"
-#: MRP.php:407
+#: MRP.php:406
msgid "Loading supplies from work orders"
msgstr "Načítání dodávky z pracovních příkazů"
-#: MRP.php:436
+#: MRP.php:435
msgid "Creating planned orders table"
msgstr "Vytvoření tabulky plánované zakázky"
-#: MRP.php:448
+#: MRP.php:447
msgid "Create of mrpplannedorders failed because"
msgstr "Vytvořit z mrpplannedorders se nezdařila, protože"
-#: MRP.php:467
+#: MRP.php:466
msgid "Processing level"
msgstr "Úrovně zpracování"
-#: MRP.php:474
+#: MRP.php:473
msgid "End time"
msgstr "Čas konce"
-#: MRP.php:546
+#: MRP.php:545
msgid "Last Run Details"
msgstr "Poslední Spustit Podrobnosti"
-#: MRP.php:548
+#: MRP.php:547
msgid "Last Run Time"
msgstr "Čas posledního spuštění"
-#: MRP.php:550 MRP.php:579
+#: MRP.php:549 MRP.php:578
msgid "Days Leeway"
msgstr "Dny volnost"
-#: MRP.php:551
+#: MRP.php:550
msgid "Use MRP Demands"
msgstr "Použití MRP požaduje"
-#: MRP.php:552
+#: MRP.php:551
msgid "Use EOQ"
msgstr "Použijte EOQ"
-#: MRP.php:553
+#: MRP.php:552
msgid "Use Pan Size"
msgstr "Použijte Pan Velikost"
-#: MRP.php:554
+#: MRP.php:553
msgid "Use Shrinkage"
msgstr "Použijte smrštění"
-#: MRP.php:561
+#: MRP.php:560
msgid "This Run Details"
msgstr "Tento běh Podrobnosti"
-#: MRP.php:580
+#: MRP.php:579
msgid "Use MRP Demands?"
msgstr "Použijte MRP požaduje?"
-#: MRP.php:582
+#: MRP.php:581
msgid "Use EOQ?"
msgstr "Použijte EOQ?"
-#: MRP.php:584
+#: MRP.php:583
msgid "Use Pan Size?"
msgstr "Použijte Pan velikost?"
-#: MRP.php:586
+#: MRP.php:585
msgid "Use Shrinkage?"
msgstr "Smrštění použití?"
-#: MRP.php:588
+#: MRP.php:587
msgid "Run MRP"
msgstr "Běhu MRP"
@@ -14718,8 +14718,8 @@
msgid "An official order will be sent to you in due course"
msgstr "Oficiální objednávka bude zaslána v pravý čas"
-#: OffersReceived.php:180 PO_AuthoriseMyOrders.php:89 PO_Header.php:782
-#: PO_Header.php:787 PO_Header.php:791 PO_Header.php:799 PO_Header.php:805
+#: OffersReceived.php:180 PO_AuthoriseMyOrders.php:89 PO_Header.php:778
+#: PO_Header.php:783 PO_Header.php:788 PO_Header.php:797 PO_Header.php:803
#: PO_SelectOSPurchOrder.php:161 PO_SelectOSPurchOrder.php:163
#: PO_SelectPurchOrder.php:130 PO_SelectPurchOrder.php:132
msgid "Pending"
@@ -15445,8 +15445,8 @@
msgid "Expense Code"
msgstr "Náklady kód"
-#: PcAssignCashToTab.php:215 PO_AuthoriseMyOrders.php:90 PO_Header.php:783
-#: PO_Header.php:788 PO_Header.php:800 PO_Header.php:804
+#: PcAssignCashToTab.php:215 PO_AuthoriseMyOrders.php:90 PO_Header.php:779
+#: PO_Header.php:784 PO_Header.php:798 PO_Header.php:802
#: PO_SelectOSPurchOrder.php:166 PO_SelectOSPurchOrder.php:168
#: PO_SelectPurchOrder.php:135 PO_SelectPurchOrder.php:137
msgid "Authorised"
@@ -15713,7 +15713,7 @@
#: PcReportTab.php:97 PcReportTab.php:99 PcReportTab.php:107
#: PDFOrdersInvoiced.php:263 PDFOrdersInvoiced.php:265
-#: PDFOrdersInvoiced.php:273 includes/ConnectDB_mysqli.inc:93
+#: PDFOrdersInvoiced.php:273 includes/ConnectDB_mysqli.inc:86
#: includes/ConnectDB_mysql.inc:75
msgid "Database Error"
msgstr "Chyba databáze"
@@ -16471,7 +16471,7 @@
msgid "Order Status Report - No Data"
msgstr "Aby Status Report - žádná data"
-#: PDFOrderStatus.php:273 PO_AuthoriseMyOrders.php:60 PO_Header.php:778
+#: PDFOrderStatus.php:273 PO_AuthoriseMyOrders.php:60 PO_Header.php:774
#: PO_OrderDetails.php:123 PO_SelectOSPurchOrder.php:449
#: PO_SelectPurchOrder.php:370 SelectWorkOrder.php:298 SelectWorkOrder.php:333
#: WorkOrderCosting.php:88 WorkOrderCosting.php:100
@@ -16480,7 +16480,7 @@
msgid "Status"
msgstr "Stav"
-#: PDFOrderStatus.php:301 PO_Header.php:746 PO_OrderDetails.php:115
+#: PDFOrderStatus.php:301 PO_Header.php:742 PO_OrderDetails.php:115
msgid "Not yet printed"
msgstr "Ještě netisknuto"
@@ -17262,18 +17262,19 @@
msgid "Initiator"
msgstr "Iniciátor"
-#: PO_AuthoriseMyOrders.php:59 PO_Header.php:722 PO_Items.php:816
+#: PO_AuthoriseMyOrders.php:59 PO_Header.php:722 PO_Items.php:814
#: POReport.php:1429 includes/PDFPickingListHeader.inc:46
msgid "Delivery Date"
msgstr "Datum dodání"
-#: PO_AuthoriseMyOrders.php:91 PO_Header.php:784 PO_Header.php:798
+#: PO_AuthoriseMyOrders.php:91 PO_Header.php:780 PO_Header.php:796
#: PO_SelectOSPurchOrder.php:176 PO_SelectOSPurchOrder.php:178
#: PO_SelectPurchOrder.php:150 PO_SelectPurchOrder.php:152
msgid "Rejected"
msgstr "Odmítnuto"
-#: PO_AuthoriseMyOrders.php:92 PO_Header.php:803 PO_SelectOSPurchOrder.php:171
+#: PO_AuthoriseMyOrders.php:92 PO_Header.php:785 PO_Header.php:790
+#: PO_Header.php:801 PO_SelectOSPurchOrder.php:171
#: PO_SelectOSPurchOrder.php:173 PO_SelectPurchOrder.php:145
#: PO_SelectPurchOrder.php:147
msgid "Cancelled"
@@ -17334,22 +17335,22 @@
"This is a new order. It must be created before you can change the status"
msgstr ""
-#: PO_Header.php:93 PO_Items.php:109 SelectSalesOrder.php:126
+#: PO_Header.php:93 PO_Items.php:107 SelectSalesOrder.php:126
#: SelectSalesOrder.php:294
msgid "You do not have permission to authorise this purchase order"
msgstr "Nemáte oprávnění k autorizaci této objednávce"
-#: PO_Header.php:93 PO_Header.php:117 PO_Header.php:138 PO_Items.php:109
+#: PO_Header.php:93 PO_Header.php:117 PO_Header.php:138 PO_Items.php:107
#: SelectSalesOrder.php:126 SelectSalesOrder.php:294
msgid "This order is for"
msgstr "Tato zakázka je pro"
-#: PO_Header.php:95 PO_Items.php:106 SelectSalesOrder.php:123
+#: PO_Header.php:95 PO_Items.php:104 SelectSalesOrder.php:123
#: SelectSalesOrder.php:291
msgid "You can only authorise up to"
msgstr "Můžete povolit pouze až"
-#: PO_Header.php:96 PO_Header.php:120 PO_Header.php:138 PO_Items.php:112
+#: PO_Header.php:96 PO_Header.php:120 PO_Header.php:138 PO_Items.php:110
#: SelectSalesOrder.php:128 SelectSalesOrder.php:294
msgid "If you think this is a mistake please contact the systems administrator"
msgstr ""
@@ -17482,8 +17483,8 @@
msgid "You can setup authorisations"
msgstr "Můžete nastavit oprávnění"
-#: PO_Header.php:508 PO_Header.php:579 PO_Items.php:258 PO_Items.php:413
-#: PO_Items.php:706 PO_Items.php:709 PO_OrderDetails.php:86
+#: PO_Header.php:508 PO_Header.php:579 PO_Items.php:256 PO_Items.php:411
+#: PO_Items.php:704 PO_Items.php:707 PO_OrderDetails.php:86
#: PO_PDFPurchOrder.php:185 PO_PDFPurchOrder.php:299 SelectSalesOrder.php:135
#: SelectSalesOrder.php:300 SpecialOrder.php:400
msgid "Purchase Order"
@@ -17510,9 +17511,9 @@
msgid "Supplier Name"
msgstr "Název dodavatele"
-#: PO_Header.php:533 PO_Header.php:940 PO_Header.php:943 PO_Header.php:946
-#: PO_Header.php:949 PO_Header.php:952 PO_Header.php:955 PO_Header.php:1013
-#: PO_Header.php:1016 PO_Header.php:1019 PO_Header.php:1022 PO_Header.php:1025
+#: PO_Header.php:533 PO_Header.php:938 PO_Header.php:941 PO_Header.php:944
+#: PO_Header.php:947 PO_Header.php:950 PO_Header.php:953 PO_Header.php:1011
+#: PO_Header.php:1014 PO_Header.php:1017 PO_Header.php:1020 PO_Header.php:1023
msgid "Address"
msgstr "Adresa"
@@ -17552,48 +17553,48 @@
msgid "Requisition Ref"
msgstr "Žádanka Ref"
-#: PO_Header.php:740
+#: PO_Header.php:736
msgid "Date Printed"
msgstr "Vytištěno"
-#: PO_Header.php:755
+#: PO_Header.php:751
msgid "Allow Reprint"
msgstr "Povolit Dotisk"
-#: PO_Header.php:762
+#: PO_Header.php:758
msgid "Reprint Now"
msgstr "Dotisk teď"
-#: PO_Header.php:772
+#: PO_Header.php:768
msgid "Receive this order"
msgstr "Přijmout tuto objednávku"
-#: PO_Header.php:776
+#: PO_Header.php:772
#, fuzzy
msgid "New Purchase Order"
msgstr "Nákupní objednávka"
-#: PO_Header.php:811
+#: PO_Header.php:809
msgid "Status Comment"
msgstr "Stav komentář"
-#: PO_Header.php:816
+#: PO_Header.php:814
msgid "Status Update"
msgstr "Status Update"
-#: PO_Header.php:823
+#: PO_Header.php:821
msgid "Warehouse Info"
msgstr "Sklad Info"
-#: PO_Header.php:825
+#: PO_Header.php:823
msgid "Supplier Info"
msgstr "Dodavatel Info"
-#: PO_Header.php:830 includes/PDFPickingListHeader.inc:13
+#: PO_Header.php:828 includes/PDFPickingListHeader.inc:13
msgid "Warehouse"
msgstr "Sklad"
-#: PO_Header.php:894
+#: PO_Header.php:892
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location"
@@ -17601,27 +17602,27 @@
"Výchozí umístění skladu nastavit pro tohoto uživatele není v současnosti "
"definován Umístění skladu"
-#: PO_Header.php:895
+#: PO_Header.php:893
msgid "Your system administrator needs to amend your user record"
msgstr "Správce systému musí změnit své uživatelské záznam"
-#: PO_Header.php:937
+#: PO_Header.php:935
msgid "Delivery Contact"
msgstr "Dodací Kontakt"
-#: PO_Header.php:962
+#: PO_Header.php:960
msgid "De...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-27 01:50:41
|
Revision: 4519
http://web-erp.svn.sourceforge.net/web-erp/?rev=4519&view=rev
Author: daintree
Date: 2011-03-27 01:50:33 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
purchasing mods
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/doc/Change.log.html
trunk/includes/DefinePOClass.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-03-26 22:11:47 UTC (rev 4518)
+++ trunk/PO_Header.php 2011-03-27 01:50:33 UTC (rev 4519)
@@ -66,9 +66,9 @@
} elseif ($_SESSION['PO'.$identifier]->Status !=$_POST['Status']) { //the old status != new status
$OKToUpdateStatus = 1;
$AuthSQL ="SELECT authlevel
- FROM purchorderauth
- WHERE userid='".$_SESSION['UserID']."'
- AND currabrev='".$_SESSION['PO'.$identifier]->CurrCode."'";
+ FROM purchorderauth
+ WHERE userid='".$_SESSION['UserID']."'
+ AND currabrev='".$_SESSION['PO'.$identifier]->CurrCode."'";
$AuthResult=DB_query($AuthSQL,$db);
$myrow=DB_fetch_array($AuthResult);
@@ -148,10 +148,10 @@
$AllowPrint=0;
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
- WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
-
+ stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ allowprint='".$AllowPrint."'
+ WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
+
$ErrMsg = _('The order status could not be updated because');
$UpdateResult=DB_query($SQL,$db,$ErrMsg);
}
@@ -230,16 +230,16 @@
$_POST['RePrint'] = 0;
}
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?' . SID . 'identifier='.$identifier. "'>";
+ echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?identifier='.$identifier. "'>";
echo '<p>';
prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' .
_('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
- "<a href='$rootpath/PO_Items.php?" . SID. 'identifier='.$identifier . "'>" . _('click here') . '</a> ' . _('to continue'),'info');
+ '<a href="' . $rootpath . '/PO_Items.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info');
include('includes/footer.inc');
exit;
} /* end of if isset _POST'EnterLines' */
-echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . "identifier=".$identifier.'">'. _('Back to Purchase Orders'). '</a></span>';
+echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?identifier='.$identifier.'">'. _('Back to Purchase Orders'). '</a></span>';
/*The page can be called with ModifyOrderNumber=x where x is a purchase
* order number. The page then looks up the details of order x and allows
@@ -303,31 +303,31 @@
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.currcode
- FROM suppliers
- WHERE suppliers.suppname LIKE '". $SearchString ."'
- ORDER BY suppliers.suppname";
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ WHERE suppliers.suppname LIKE '". $SearchString ."'
+ ORDER BY suppliers.suppname";
} elseif (strlen($_POST['SuppCode'])>0){
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.currcode
- FROM suppliers
- WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
- ORDER BY suppliers.supplierid";
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
+ ORDER BY suppliers.supplierid";
}
$ErrMsg = _('The searched supplier records requested cannot be retrieved because');
@@ -376,20 +376,20 @@
*/
$sql = "SELECT suppliers.suppname,
- suppliers.currcode,
- currencies.rate,
- suppliers.paymentterms,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.telephone,
- suppliers.port
- FROM suppliers INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='" . $_POST['Select'] . "'";
+ suppliers.currcode,
+ currencies.rate,
+ suppliers.paymentterms,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.telephone,
+ suppliers.port
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='" . $_POST['Select'] . "'";
$ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
@@ -399,9 +399,9 @@
// added for suppliers lookup fields
$AuthSql="SELECT cancreate
- FROM purchorderauth
- WHERE userid='". $_SESSION['UserID'] . "'
- AND currabrev='". $myrow['currcode'] . "'";
+ FROM purchorderauth
+ WHERE userid='". $_SESSION['UserID'] . "'
+ AND currabrev='". $myrow['currcode'] . "'";
$AuthResult=DB_query($AuthSql,$db);
@@ -444,20 +444,20 @@
} else {
$_POST['Select'] = $_SESSION['PO'.$identifier]->SupplierID;
$sql = "SELECT suppliers.suppname,
- suppliers.currcode,
- suppliers.paymentterms,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.telephone,
- suppliers.port
- FROM suppliers INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='" . $_POST['Select'] . "'";
-
+ suppliers.currcode,
+ suppliers.paymentterms,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.telephone,
+ suppliers.port
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='" . $_POST['Select'] . "'";
+
$ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
@@ -528,11 +528,11 @@
echo '<br><table cellpadding=3 colspan=7 class=selection>';
$tableheader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
- <th>' . _('Address') . '</th>
- <th>' . _('Currency') . '</th>
- </tr>';
+ <th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Address') . '</th>
+ <th>' . _('Currency') . '</th>
+ </tr>';
echo $tableheader;
@@ -576,9 +576,9 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="">
- ' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
- ' . $_SESSION['PO'.$identifier]->CurrCode . '<br />';
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="">
+ ' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
+ ' . $_SESSION['PO'.$identifier]->CurrCode . '<br />';
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
@@ -603,15 +603,15 @@
}
$sql="SELECT stockmaster.controlled,
- stockmaster.serialised,
- stockmaster.description,
- stockmaster.units ,
- stockmaster.decimalplaces,
- purchdata.price,
- purchdata.suppliersuom,
- purchdata.suppliers_partno,
- purchdata.conversionfactor,
- stockcategory.stockact
+ stockmaster.serialised,
+ stockmaster.description,
+ stockmaster.units ,
+ stockmaster.decimalplaces,
+ purchdata.price,
+ purchdata.suppliersuom,
+ purchdata.suppliers_partno,
+ purchdata.conversionfactor,
+ stockcategory.stockact
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
LEFT JOIN purchdata
@@ -626,36 +626,36 @@
}
$_SESSION['PO'.$identifier]->add_to_order( 1,
- $Purch_Item,
- $PurchItemRow['serialised'],
- $PurchItemRow['controlled'],
- $Qty,
- $PurchItemRow['description'],
- $PurchItemRow['price'],
- $PurchItemRow['units'],
- $PurchItemRow['stockact'],
- date($_SESSION['DefaultDateFormat']),
- 0,
- 0,
- '',
- 0,
- 0,
- '',
- $PurchItemRow['decimalplaces'],
- $Purch_Item,
- $PurchItemRow['suppliersuom'],
- $PurchItemRow['conversionfactor'],
- $PurchItemRow['suppliers_partno'],
- $Qty*$PurchItemRow['price'],
- '',
- 0,
- 0,
- 0,
- 0,
- $Qty,
- $Qty*$PurchItemRow['price']);
+ $Purch_Item,
+ $PurchItemRow['serialised'],
+ $PurchItemRow['controlled'],
+ $Qty,
+ $PurchItemRow['description'],
+ $PurchItemRow['price'],
+ $PurchItemRow['units'],
+ $PurchItemRow['stockact'],
+ date($_SESSION['DefaultDateFormat']),
+ 0,
+ 0,
+ '',
+ 0,
+ 0,
+ '',
+ $PurchItemRow['decimalplaces'],
+ $Purch_Item,
+ $PurchItemRow['suppliersuom'],
+ $PurchItemRow['conversionfactor'],
+ $PurchItemRow['suppliers_partno'],
+ $Qty*$PurchItemRow['price'],
+ '',
+ 0,
+ 0,
+ 0,
+ 0,
+ $Qty,
+ $Qty*$PurchItemRow['price']);
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?' . SID . 'identifier='.$identifier. "'>";
+ echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?identifier='.$identifier. "'>";
}
/*Set up form for entry of order header stuff */
@@ -733,10 +733,6 @@
echo '<tr><td>' . _('Requisition Ref') . ':</td>
<td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
-// echo '<tr><td>' . _('Exchange Rate') . ":</td>
-// <td><input type=TEXT name='ExRate' size=16 maxlength=15 VALUE=" . $_POST['ExRate'] . '></td>
-// echo "<input type='hidden' name='ExRate' size=16 maxlength=15 value=" . $_POST['ExRate'] . "></td>";
-// </tr>';
echo '<tr><td>' . _('Date Printed') . ':</td><td>';
if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted);
@@ -780,29 +776,31 @@
switch ($_SESSION['PO'.$identifier]->Status) {
case 'Pending':
echo '<option selected value="Pending">' . _('Pending') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>
- <option value="Rejected">' . _('Rejected') . '</option>';
+ <option value="Authorised">' . _('Authorised') . '</option>
+ <option value="Rejected">' . _('Rejected') . '</option>';
break;
case 'Authorised':
echo '<option value="Pending">' . _('Pending') . '</option>
- <option selected value="Authorised">' . _('Authorised') . '</option>';
+ <option selected value="Authorised">' . _('Authorised') . '</option>
+ <option value="Cancelled">' . _('Cancelled') . '</option>';
break;
case 'Printed':
echo '<option value="Pending">' . _('Pending') . '</option>
- <option selected value="Printed">' . _('Printed') . '</option>';
+ <option selected value="Printed">' . _('Printed') . '</option>
+ <option value="Cancelled">' . _('Cancelled') . '</option>';
break;
case 'Completed':
echo '<option selected value="Completed">' . _('Completed') . '</option>';
break;
case 'Rejected':
echo '<option selected value="Rejected">' . _('Rejected') . '</option>
- <option value="Pending">' . _('Pending') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>';
+ <option value="Pending">' . _('Pending') . '</option>
+ <option value="Authorised">' . _('Authorised') . '</option>';
break;
case 'Cancelled':
echo '<option selected value="Cancelled">' . _('Cancelled') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>
- <option value="Pending">' . _('Pending') . '</option>';
+ <option value="Authorised">' . _('Authorised') . '</option>
+ <option value="Pending">' . _('Pending') . '</option>';
break;
}
@@ -856,15 +854,15 @@
$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
$sql = "SELECT deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- contact
- FROM locations
- WHERE loccode='" . $_POST['StkLocation'] . "'";
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
$LocnAddrResult = DB_query($sql,$db);
if (DB_num_rows($LocnAddrResult)==1){
@@ -899,15 +897,15 @@
} elseif (isset($_POST['LookupDeliveryAddress'])){
$sql = "SELECT deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- contact
- FROM locations
- WHERE loccode='" . $_POST['StkLocation'] . "'";
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
$LocnAddrResult = DB_query($sql,$db);
if (DB_num_rows($LocnAddrResult)==1){
@@ -992,9 +990,9 @@
echo '<input type="submit" name="SearchSuppliers" value=' . _('Select Now') . '"></td></tr>';
echo '</td></tr><tr><td>' . _('Supplier Contact') . ':</td><td>
- <select name=SupplierContact>';
+ <select name="SupplierContact">';
- $sql = 'SELECT contact FROM suppliercontacts WHERE supplierid="' . $_POST['Select'] .'"';
+ $sql = "SELECT contact FROM suppliercontacts WHERE supplierid='" . $_POST['Select'] ."'";
$SuppCoResult = DB_query($sql,$db);
while ( $SuppCoRow=DB_fetch_array($SuppCoResult)){
@@ -1043,7 +1041,9 @@
DB_data_seek($result, 0);
echo '</select></td></tr>';
- $result=DB_query('SELECT loccode, locationname FROM locations WHERE loccode="' . $_SESSION['PO'.$identifier]->Port.'"', $db);
+ $result=DB_query("SELECT loccode,
+ locationname
+ FROM locations WHERE loccode='" . $_SESSION['PO'.$identifier]->Port."'", $db);
$myrow = DB_fetch_array($result);
$_POST['Port'] = $myrow['locationname'];
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-03-26 22:11:47 UTC (rev 4518)
+++ trunk/PO_Items.php 2011-03-27 01:50:33 UTC (rev 4519)
@@ -2,8 +2,6 @@
/* $Id PO_Items.php 4183 2010-12-14 09:30:20Z daintree $ */
-//$PageSecurity = 4; Now retrieved from database
-
include('includes/DefinePOClass.php');
include('includes/SQL_CommonFunctions.inc');
@@ -73,7 +71,7 @@
prnMsg( _('The purchase order can not be committed to the database because there are no lines entered on this order'),'error');
$InputError=1;
}
-
+
/*If all clear then proceed to update the database
*/
if ($InputError!=1){
@@ -103,7 +101,7 @@
if (DB_num_rows($AuthResult) ==0){
$AuthMessage = _('Your authority to approve purchase orders in') . ' ' . $_SESSION['PO'.$identifier]->CurrCode . ' ' . _('has not yet been set up') . '<br />';
} else {
- $AuthMessage = _('You can only authorise up to').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthorityLevel.'.<br />';
+ $AuthMessage = _('You can only authorise up to').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthRow['authlevel'] .'.<br />';
}
prnMsg( _('You do not have permission to authorise this purchase order').'.<br />'. _('This order is for').' '.
@@ -131,71 +129,71 @@
/*Insert to purchase order header record */
$sql = "INSERT INTO purchorders ( orderno,
- supplierno,
- comments,
- orddate,
- rate,
- initiator,
- requisitionno,
- intostocklocation,
- deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- suppdeladdress1,
- suppdeladdress2,
- suppdeladdress3,
- suppdeladdress4,
- suppdeladdress5,
- suppdeladdress6,
- suppliercontact,
- supptel,
- contact,
- version,
- revised,
- deliveryby,
- status,
- stat_comment,
- deliverydate,
- paymentterms,
- allowprint)
- VALUES( '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . "',
- '" . $_SESSION['PO'.$identifier]->Comments . "',
- '" . Date('Y-m-d') . "',
- '" . $_SESSION['PO'.$identifier]->ExRate . "',
- '" . $_SESSION['PO'.$identifier]->Initiator . "',
- '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
- '" . $_SESSION['PO'.$identifier]->Tel . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
- '" . $_SESSION['PO'.$identifier]->SupplierContact . "',
- '" . $_SESSION['PO'.$identifier]->SuppTel. "',
- '" . $_SESSION['PO'.$identifier]->Contact . "',
- '" . $_SESSION['PO'.$identifier]->Version . "',
- '" . Date('Y-m-d') . "',
- '" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
- '" . $_SESSION['PO'.$identifier]->Status . "',
- '" . $StatusComment . "',
- '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
- '" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
- '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "'
- )";
-
+ supplierno,
+ comments,
+ orddate,
+ rate,
+ initiator,
+ requisitionno,
+ intostocklocation,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ suppdeladdress1,
+ suppdeladdress2,
+ suppdeladdress3,
+ suppdeladdress4,
+ suppdeladdress5,
+ suppdeladdress6,
+ suppliercontact,
+ supptel,
+ contact,
+ version,
+ revised,
+ deliveryby,
+ status,
+ stat_comment,
+ deliverydate,
+ paymentterms,
+ allowprint)
+ VALUES( '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . "',
+ '" . $_SESSION['PO'.$identifier]->Comments . "',
+ '" . Date('Y-m-d') . "',
+ '" . $_SESSION['PO'.$identifier]->ExRate . "',
+ '" . $_SESSION['PO'.$identifier]->Initiator . "',
+ '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
+ '" . $_SESSION['PO'.$identifier]->Tel . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierContact . "',
+ '" . $_SESSION['PO'.$identifier]->SuppTel. "',
+ '" . $_SESSION['PO'.$identifier]->Contact . "',
+ '" . $_SESSION['PO'.$identifier]->Version . "',
+ '" . Date('Y-m-d') . "',
+ '" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
+ '" . $_SESSION['PO'.$identifier]->Status . "',
+ '" . $StatusComment . "',
+ '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
+ '" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
+ '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "'
+ )";
+
$ErrMsg = _('The purchase order header record could not be inserted into the database because');
$DbgMsg = _('The SQL statement used to insert the purchase order header record and failed was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
@@ -204,50 +202,50 @@
foreach ($_SESSION['PO'.$identifier]->LineItems as $POLine) {
if ($POLine->Deleted==False) {
$sql = "INSERT INTO purchorderdetails ( orderno,
- itemcode,
- deliverydate,
- itemdescription,
- glcode,
- unitprice,
- quantityord,
- shiptref,
- jobref,
- itemno,
- suppliersunit,
- suppliers_partno,
- subtotal_amount,
- package,
- pcunit,
- netweight,
- kgs,
- cuft,
- total_quantity,
- total_amount,
- assetid,
- conversionfactor )
- VALUES (
- '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $POLine->StockID . "',
- '" . FormatDateForSQL($POLine->ReqDelDate) . "',
- '" . $POLine->ItemDescription . "',
- '" . $POLine->GLCode . "',
- '" . $POLine->Price . "',
- '" . $POLine->Quantity . "',
- '" . $POLine->ShiptRef . "',
- '" . $POLine->JobRef . "',
- '" . $POLine->ItemNo . "',
- '" . $POLine->SuppliersUnit . "',
- '" . $POLine->Suppliers_PartNo . "',
- '" . $POLine->SubTotal_Amount . "',
- '" . $POLine->Package . "',
- '" . $POLine->PcUnit . "',
- '" . $POLine->NetWeight . "',
- '" . $POLine->KGs . "',
- '" . $POLine->CuFt . "',
- '" . $POLine->Total_Quantity . "',
- '" . $POLine->Total_Amount . "',
- '" . $POLine->AssetID . "',
- '" . $POLine->ConversionFactor . "')";
+ itemcode,
+ deliverydate,
+ itemdescription,
+ glcode,
+ unitprice,
+ quantityord,
+ shiptref,
+ jobref,
+ itemno,
+ suppliersunit,
+ suppliers_partno,
+ subtotal_amount,
+ package,
+ pcunit,
+ netweight,
+ kgs,
+ cuft,
+ total_quantity,
+ total_amount,
+ assetid,
+ conversionfactor )
+ VALUES (
+ '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $POLine->StockID . "',
+ '" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ '" . $POLine->ItemDescription . "',
+ '" . $POLine->GLCode . "',
+ '" . $POLine->Price . "',
+ '" . $POLine->Quantity . "',
+ '" . $POLine->ShiptRef . "',
+ '" . $POLine->JobRef . "',
+ '" . $POLine->ItemNo . "',
+ '" . $POLine->SuppliersUnit . "',
+ '" . $POLine->Suppliers_PartNo . "',
+ '" . $POLine->SubTotal_Amount . "',
+ '" . $POLine->Package . "',
+ '" . $POLine->PcUnit . "',
+ '" . $POLine->NetWeight . "',
+ '" . $POLine->KGs . "',
+ '" . $POLine->CuFt . "',
+ '" . $POLine->Total_Quantity . "',
+ '" . $POLine->Total_Amount . "',
+ '" . $POLine->AssetID . "',
+ '" . $POLine->ConversionFactor . "')";
$ErrMsg =_('One of the purchase order detail records could not be inserted into the database because');
$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
@@ -262,35 +260,35 @@
/*Update the purchase order header with any changes */
$sql = "UPDATE purchorders SET supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "' ,
- comments='" . $_SESSION['PO'.$identifier]->Comments . "',
- rate='" . $_SESSION['PO'.$identifier]->ExRate . "',
- initiator='" . $_SESSION['PO'.$identifier]->Initiator . "',
- requisitionno= '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
- version= '" . $_SESSION['PO'.$identifier]->Version . "',
- deliveryby='" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
- deliverydate='" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
- revised= '" . Date('Y-m-d') . "',
- intostocklocation='" . $_SESSION['PO'.$identifier]->Location . "',
- deladd1='" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
- deladd2='" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
- deladd3='" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
- deladd4='" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
- deladd5='" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
- deladd6='" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
- deladd6='" . $_SESSION['PO'.$identifier]->Tel . "',
- suppdeladdress1='" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
- suppdeladdress2='" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
- suppdeladdress3='" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
- suppdeladdress4='" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
- suppdeladdress5='" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
- suppdeladdress6='" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
- suppliercontact='" . $_SESSION['PO'.$identifier]->SupplierContact . "',
- supptel='" . $_SESSION['PO'.$identifier]->SuppTel . "',
- contact='" . $_SESSION['PO'.$identifier]->Contact . "',
- paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
- allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
- status = '" . $_SESSION['PO'.$identifier]->Status . "'
- WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
+ comments='" . $_SESSION['PO'.$identifier]->Comments . "',
+ rate='" . $_SESSION['PO'.$identifier]->ExRate . "',
+ initiator='" . $_SESSION['PO'.$identifier]->Initiator . "',
+ requisitionno= '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
+ version= '" . $_SESSION['PO'.$identifier]->Version . "',
+ deliveryby='" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
+ deliverydate='" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
+ revised= '" . Date('Y-m-d') . "',
+ intostocklocation='" . $_SESSION['PO'.$identifier]->Location . "',
+ deladd1='" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
+ deladd2='" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
+ deladd3='" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
+ deladd4='" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
+ deladd5='" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
+ deladd6='" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
+ deladd6='" . $_SESSION['PO'.$identifier]->Tel . "',
+ suppdeladdress1='" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
+ suppdeladdress2='" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
+ suppdeladdress3='" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
+ suppdeladdress4='" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
+ suppdeladdress5='" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
+ suppdeladdress6='" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
+ suppliercontact='" . $_SESSION['PO'.$identifier]->SupplierContact . "',
+ supptel='" . $_SESSION['PO'.$identifier]->SuppTel . "',
+ contact='" . $_SESSION['PO'.$identifier]->Contact . "',
+ paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
+ allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
+ status = '" . $_SESSION['PO'.$identifier]->Status . "'
+ WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
$DbgMsg = _('The SQL statement used to update the purchase order header record, that failed was');
@@ -309,99 +307,99 @@
} else if ($POLine->PODetailRec=='') {
$sql = "INSERT INTO purchorderdetails ( orderno,
- itemcode,
- deliverydate,
- itemdescription,
- glcode,
- unitprice,
- quantityord,
- shiptref,
- jobref,
- itemno,
- suppliersunit,
- suppliers_partno,
- subtotal_amount,
- package,
- pcunit,
- netweight,
- kgs,
- cuft,
- total_quantity,
- total_amount,
- assetid,
- conversionfactor)
- VALUES (
- '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $POLine->StockID . "',
- '" . FormatDateForSQL($POLine->ReqDelDate) . "',
- '" . $POLine->ItemDescription . "',
- '" . $POLine->GLCode . "',
- '" . $POLine->Price . "',
- '" . $POLine->Quantity . "',
- '" . $POLine->ShiptRef . "',
- '" . $POLine->JobRef . "',
- '" . $POLine->ItemNo . "',
- '" . $POLine->SuppliersUnit . "',
- '" . $POLine->Suppliers_PartNo . "',
- '" . $POLine->SubTotal_Amount . "',
- '" . $POLine->Package . "',
- '" . $POLine->PcUnit . "',
- '" . $POLine->NetWeight . "',
- '" . $POLine->KGs . "',
- '" . $POLine->CuFt . "',
- '" . $POLine->Total_Quantity . "',
- '" . $POLine->Total_Amount . "',
- '" . $POLine->AssetID . "',
- '" . $POLine->ConversionFactor . "')";
+ itemcode,
+ deliverydate,
+ itemdescription,
+ glcode,
+ unitprice,
+ quantityord,
+ shiptref,
+ jobref,
+ itemno,
+ suppliersunit,
+ suppliers_partno,
+ subtotal_amount,
+ package,
+ pcunit,
+ netweight,
+ kgs,
+ cuft,
+ total_quantity,
+ total_amount,
+ assetid,
+ conversionfactor)
+ VALUES (
+ '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $POLine->StockID . "',
+ '" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ '" . $POLine->ItemDescription . "',
+ '" . $POLine->GLCode . "',
+ '" . $POLine->Price . "',
+ '" . $POLine->Quantity . "',
+ '" . $POLine->ShiptRef . "',
+ '" . $POLine->JobRef . "',
+ '" . $POLine->ItemNo . "',
+ '" . $POLine->SuppliersUnit . "',
+ '" . $POLine->Suppliers_PartNo . "',
+ '" . $POLine->SubTotal_Amount . "',
+ '" . $POLine->Package . "',
+ '" . $POLine->PcUnit . "',
+ '" . $POLine->NetWeight . "',
+ '" . $POLine->KGs . "',
+ '" . $POLine->CuFt . "',
+ '" . $POLine->Total_Quantity . "',
+ '" . $POLine->Total_Amount . "',
+ '" . $POLine->AssetID . "',
+ '" . $POLine->ConversionFactor . "')";
} else {
if ($POLine->Quantity==$POLine->QtyReceived){
$sql = "UPDATE purchorderdetails SET itemcode='" . $POLine->StockID . "',
- deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
- itemdescription='" . $POLine->ItemDescription . "',
- glcode='" . $POLine->GLCode . "',
- unitprice='" . $POLine->Price . "',
- quantityord='" . $POLine->Quantity . "',
- shiptref='" . $POLine->ShiptRef . "',
- jobref='" . $POLine->JobRef . "',
- itemno='" . $POLine->ItemNo . "',
- suppliersunit='" . $POLine->SuppliersUnit . "',
- suppliers_partno='" . $POLine->Suppliers_PartNo . "',
- subtotal_amount='" . $POLine->SubTotal_Amount . "',
- package='" . $POLine->Package . "',
- pcunit='" . $POLine->PcUnit . "',
- netweight='" . $POLine->NetWeight . "',
- kgs='" . $POLine->KGs . "',
- cuft='" . $POLine->CuFt . "',
- total_quantity='" . $POLine->Total_Quantity . "',
- total_amount='" . $POLine->Total_Amount . "',
- completed=1,
- assetid='" . $POLine->AssetID . "',
- conversionfactor = '" . $POLine->ConversionFactor . "'
- WHERE podetailitem='" . $POLine->PODetailRec . "'";
+ deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ itemdescription='" . $POLine->ItemDescription . "',
+ glcode='" . $POLine->GLCode . "',
+ unitprice='" . $POLine->Price . "',
+ quantityord='" . $POLine->Quantity . "',
+ shiptref='" . $POLine->ShiptRef . "',
+ jobref='" . $POLine->JobRef . "',
+ itemno='" . $POLine->ItemNo . "',
+ suppliersunit='" . $POLine->SuppliersUnit . "',
+ suppliers_partno='" . $POLine->Suppliers_PartNo . "',
+ subtotal_amount='" . $POLine->SubTotal_Amount . "',
+ package='" . $POLine->Package . "',
+ pcunit='" . $POLine->PcUnit . "',
+ netweight='" . $POLine->NetWeight . "',
+ kgs='" . $POLine->KGs . "',
+ cuft='" . $POLine->CuFt . "',
+ total_quantity='" . $POLine->Total_Quantity . "',
+ total_amount='" . $POLine->Total_Amount . "',
+ completed=1,
+ assetid='" . $POLine->AssetID . "',
+ conversionfactor = '" . $POLine->ConversionFactor . "'
+ WHERE podetailitem='" . $POLine->PODetailRec . "'";
} else {
$sql = "UPDATE purchorderdetails SET itemcode='" . $POLine->StockID . "',
- deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
- itemdescription='" . $POLine->ItemDescription . "',
- glcode='" . $POLine->GLCode . "',
- unitprice='" . $POLine->Price . "',
- quantityord='" . $POLine->Quantity . "',
- shiptref='" . $POLine->ShiptRef . "',
- jobref='" . $POLine->JobRef . "',
- itemno='" . $POLine->ItemNo . "',
- suppliersunit='" . $POLine->SuppliersUnit . "',
- suppliers_partno='" . $POLine->Suppliers_PartNo . "',
- subtotal_amount='" . $POLine->SubTotal_Amount . "',
- package='" . $POLine->Package . "',
- pcunit='" . $POLine->PcUnit . "',
- netweight='" . $POLine->NetWeight . "',
- kgs='" . $POLine->KGs . "',
- cuft='" . $POLine->CuFt . "',
- total_quantity='" . $POLine->Total_Quantity . "',
- total_amount='" . $POLine->Total_Amount . "',
- assetid='" . $POLine->AssetID . "',
- conversionfactor = '" . $POLine->ConversionFactor . "'
- WHERE podetailitem='" . $POLine->PODetailRec . "'";
+ deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ itemdescription='" . $POLine->ItemDescription . "',
+ glcode='" . $POLine->GLCode . "',
+ unitprice='" . $POLine->Price . "',
+ quantityord='" . $POLine->Quantity . "',
+ shiptref='" . $POLine->ShiptRef . "',
+ jobref='" . $POLine->JobRef . "',
+ itemno='" . $POLine->ItemNo . "',
+ suppliersunit='" . $POLine->SuppliersUnit . "',
+ suppliers_partno='" . $POLine->Suppliers_PartNo . "',
+ subtotal_amount='" . $POLine->SubTotal_Amount . "',
+ package='" . $POLine->Package . "',
+ pcunit='" . $POLine->PcUnit . "',
+ netweight='" . $POLine->NetWeight . "',
+ kgs='" . $POLine->KGs . "',
+ cuft='" . $POLine->CuFt . "',
+ total_quantity='" . $POLine->Total_Quantity . "',
+ total_amount='" . $POLine->Total_Amount . "',
+ assetid='" . $POLine->AssetID . "',
+ conversionfactor = '" . $POLine->ConversionFactor . "'
+ WHERE podetailitem='" . $POLine->PODetailRec . "'";
}
}
@@ -433,6 +431,7 @@
if(isset($_GET['Delete'])){
if($_SESSION['PO'.$identifier]->Some_Already_Received($_GET['Delete'])==0){
$_SESSION['PO'.$identifier]->LineItems[$_GET['Delete']]->Deleted=True;
+ $_SESSION['PO'.$identifier]->LinesOnOrder --;
include ('includes/PO_UnsetFormVbls.php');
} else {
prnMsg( _('This item cannot be deleted because some of it has already been received'),'warn');
@@ -442,8 +441,7 @@
if (isset($_POST['EnterLine'])){ /*Inputs from the form directly without selecting a stock item from the search */
$AllowUpdate = true; /*always assume the best */
-
- if (!is_numeric($_POST['Qty'])){
+ if (!is_numeric(doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['Qty'])))){
$AllowUpdate = false;
prnMsg( _('Cannot Enter this order line') . '<br />' . _('The quantity of the order item must be numeric'),'error');
}
@@ -495,12 +493,12 @@
}
if ($_POST['AssetID'] !='Not an Asset'){
$ValidAssetResult = DB_query("SELECT assetid,
- description,
- costact
- FROM fixedassets
- INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $_POST['AssetID'] . "'",$db);
+ description,
+ costact
+ FROM fixedassets
+ INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ WHERE assetid='" . $_POST['AssetID'] . "'",$db);
if (DB_num_rows($ValidAssetResult)==0){ // then the asset id entered doesn't exist
$AllowUpdate = false;
prnMsg(_('An asset code was entered but it does not yet exist. Only pre-existing asset ids can be entered when ordering a fixed asset'),'error');
@@ -526,36 +524,36 @@
$_POST['Qty'] = doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['Qty']));
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
- '',
- 0, /*Serialised */
- 0, /*Controlled */
- $_POST['Qty'],
- $_POST['ItemDescription'],
- $_POST['Price'],
- $_POST['SuppliersUnit'],
- $_POST['GLCode'],
- $_POST['ReqDelDate'],
- '',
- 0,
- '',
- 0,
- 0,
- $GLAccountName,
- 2,
- '',
- $_POST['SuppliersUnit'],
- 1,
- '',
- '',
- ($_POST['Qty']*$_POST['Price']),
- '',
- '',
- '',
- '',
- '',
- $_POST['Qty'],
- ($_POST['Qty']*$_POST['Price']),
- $_POST['AssetID']);
+ '',
+ 0, /*Serialised */
+ 0, /*Controlled */
+ $_POST['Qty'],
+ $_POST['ItemDescription'],
+ $_POST['Price'],
+ $_POST['SuppliersUnit'],
+ $_POST['GLCode'],
+ $_POST['ReqDelDate'],
+ '',
+ 0,
+ '',
+ 0,
+ 0,
+ $GLAccountName,
+ 2,
+ '',
+ $_POST['SuppliersUnit'],
+ 1,
+ '',
+ '',
+ ($_POST['Qty']*$_POST['Price']),
+ '',
+ '',
+ '',
+ '',
+ '',
+ $_POST['Qty'],
+ ($_POST['Qty']*$_POST['Price']),
+ $_POST['AssetID']);
include ('includes/PO_UnsetFormVbls.php');
}
}
@@ -591,18 +589,18 @@
}
if ($AlreadyOnThisOrder!=1 AND $Quantity > 0){
$sql = "SELECT description,
- stockid,
- units,
- decimalplaces,
- kgs,
- netweight,
- stockact,
- accountname
- FROM stockmaster INNER JOIN stockcategory
- ON stockcategory.categoryid = stockmaster.categoryid
- INNER JOIN chartmaster
- ON chartmaster.accountcode = stockcategory.stockact
- WHERE stockmaster.stockid = '". $ItemCode . "'";
+ stockid,
+ units,
+ decimalplaces,
+ kgs,
+ netweight,
+ stockact,
+ accountname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockcategory.categoryid = stockmaster.categoryid
+ INNER JOIN chartmaster
+ ON chartmaster.accountcode = stockcategory.stockact
+ WHERE stockmaster.stockid = '". $ItemCode . "'";
$ErrMsg = _('The item details for') . ' ' . $ItemCode . ' ' . _('could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the item details but failed was');
@@ -611,26 +609,26 @@
$ItemRow = DB_fetch_array($ItemResult);
$sql = "SELECT price,
- conversionfactor,
- supplierdescription,
- suppliersuom,
- unitname,
- suppliers_partno,
- leadtime,
- MAX(purchdata.effectivefrom) AS latesteffectivefrom
- FROM purchdata LEFT JOIN unitsofmeasure
- ON purchdata.suppliersuom=unitsofmeasure.unitid
- WHERE purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
- AND purchdata.effectivefrom <='" . Date('Y-m-d') . "'
- AND purchdata.stockid = '". $ItemCode . "'
- GROUP BY purchdata.price,
- purchdata.conversionfactor,
- purchdata.supplierdescription,
- purchdata.suppliersuom,
- unitsofmeasure.unitname,
- purchdata.suppliers_partno,
- purchdata.leadtime";
-
+ conversionfactor,
+ supplierdescription,
+ suppliersuom,
+ unitname,
+ suppliers_partno,
+ leadtime,
+ MAX(purchdata.effectivefrom) AS latesteffectivefrom
+ FROM purchdata LEFT JOIN unitsofmeasure
+ ON purchdata.suppliersuom=unitsofmeasure.unitid
+ WHERE purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND purchdata.effectivefrom <='" . Date('Y-m-d') . "'
+ AND purchdata.stockid = '". $ItemCode . "'
+ GROUP BY purchdata.price,
+ purchdata.conversionfactor,
+ purchdata.supplierdescription,
+ purchdata.suppliersuom,
+ unitsofmeasure.unitname,
+ purchdata.suppliers_partno,
+ purchdata.leadtime";
+
$ErrMsg = _('The purchasing data for') . ' ' . $ItemCode . ' ' . _('could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the purchasing data but failed was');
$PurchDataResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -652,35 +650,35 @@
}
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
- $ItemCode,
- 0, /*Serialised */
- 0, /*Controlled */
- $Quantity*$ConversionFactor, /* Qty */
- $SupplierDescription,
- $PurchPrice,
- $ItemRow['units'],
- $ItemRow['stockact'],
- $_SESSION['PO'.$identifier]->DeliveryDate,
- 0,
- 0,
- 0,
- 0,
- 0,
- $Itemrow['accountname'],
- $ItemRow['decimalplaces'],
- $ItemCode,
- $SuppliersUnitOfMeasure,
- $ConversionFactor,
- $LeadTime,
- $SuppliersPartNo,
- $Quantity*$PurchPrice,
- '',
- 0,
- $ItemRow['netweight'],
- $ItemRow['kgs'],
- '',
- $Quantity,
- $Quantity*$PurchPrice );
+ $ItemCode,
+ 0, /*Serialised */
+ 0, /*Controlled */
+ $Quantity*$ConversionFactor, /* Qty */
+ $SupplierDescription,
+ $PurchPrice,
+ $ItemRow['units'],
+ $ItemRow['stockact'],
+ $_SESSION['PO'.$identifier]->DeliveryDate,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ $Itemrow['accountname'],
+ $ItemRow['decimalplaces'],
+ $ItemCode,
+ $SuppliersUnitOfMeasure,
+ $ConversionFactor,
+ $LeadTime,
+ $SuppliersPartNo,
+ $Quantity*$PurchPrice,
+ '',
+ 0,
+ $ItemRow['netweight'],
+ $ItemRow['kgs'],
+ '',
+ $Quantity,
+ $Quantity*$PurchPrice );
} else { //no rows returned by the SQL to get the item
prnMsg (_('The item code') . ' ' . $ItemCode . ' ' . _('does not exist in the database and therefore cannot be added to the order'),'error');
if ($debug==1){
@@ -832,45 +830,47 @@
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND stockmaster.description " . LIKE . " '" . $SearchString ."'
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.description " . LIKE . " '" . $SearchString ."'
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.description " . LIKE . " '". $SearchString ."'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.description " . LIKE . " '". $SearchString ."'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
}
} elseif ($_POST['StockCode']){
@@ -879,87 +879,91 @@
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- and stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ and stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
}
} else {
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- ORDER BY stockmaster.stockid
- LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DefaultDisplayRec...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-27 01:50:41
|
Revision: 4519
http://web-erp.svn.sourceforge.net/web-erp/?rev=4519&view=rev
Author: daintree
Date: 2011-03-27 01:50:33 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
purchasing mods
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/doc/Change.log.html
trunk/includes/DefinePOClass.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-03-26 22:11:47 UTC (rev 4518)
+++ trunk/PO_Header.php 2011-03-27 01:50:33 UTC (rev 4519)
@@ -66,9 +66,9 @@
} elseif ($_SESSION['PO'.$identifier]->Status !=$_POST['Status']) { //the old status != new status
$OKToUpdateStatus = 1;
$AuthSQL ="SELECT authlevel
- FROM purchorderauth
- WHERE userid='".$_SESSION['UserID']."'
- AND currabrev='".$_SESSION['PO'.$identifier]->CurrCode."'";
+ FROM purchorderauth
+ WHERE userid='".$_SESSION['UserID']."'
+ AND currabrev='".$_SESSION['PO'.$identifier]->CurrCode."'";
$AuthResult=DB_query($AuthSQL,$db);
$myrow=DB_fetch_array($AuthResult);
@@ -148,10 +148,10 @@
$AllowPrint=0;
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
- WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
-
+ stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ allowprint='".$AllowPrint."'
+ WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
+
$ErrMsg = _('The order status could not be updated because');
$UpdateResult=DB_query($SQL,$db,$ErrMsg);
}
@@ -230,16 +230,16 @@
$_POST['RePrint'] = 0;
}
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?' . SID . 'identifier='.$identifier. "'>";
+ echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?identifier='.$identifier. "'>";
echo '<p>';
prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' .
_('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
- "<a href='$rootpath/PO_Items.php?" . SID. 'identifier='.$identifier . "'>" . _('click here') . '</a> ' . _('to continue'),'info');
+ '<a href="' . $rootpath . '/PO_Items.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info');
include('includes/footer.inc');
exit;
} /* end of if isset _POST'EnterLines' */
-echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . "identifier=".$identifier.'">'. _('Back to Purchase Orders'). '</a></span>';
+echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?identifier='.$identifier.'">'. _('Back to Purchase Orders'). '</a></span>';
/*The page can be called with ModifyOrderNumber=x where x is a purchase
* order number. The page then looks up the details of order x and allows
@@ -303,31 +303,31 @@
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.currcode
- FROM suppliers
- WHERE suppliers.suppname LIKE '". $SearchString ."'
- ORDER BY suppliers.suppname";
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ WHERE suppliers.suppname LIKE '". $SearchString ."'
+ ORDER BY suppliers.suppname";
} elseif (strlen($_POST['SuppCode'])>0){
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.currcode
- FROM suppliers
- WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
- ORDER BY suppliers.supplierid";
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
+ ORDER BY suppliers.supplierid";
}
$ErrMsg = _('The searched supplier records requested cannot be retrieved because');
@@ -376,20 +376,20 @@
*/
$sql = "SELECT suppliers.suppname,
- suppliers.currcode,
- currencies.rate,
- suppliers.paymentterms,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.telephone,
- suppliers.port
- FROM suppliers INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='" . $_POST['Select'] . "'";
+ suppliers.currcode,
+ currencies.rate,
+ suppliers.paymentterms,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.telephone,
+ suppliers.port
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='" . $_POST['Select'] . "'";
$ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
@@ -399,9 +399,9 @@
// added for suppliers lookup fields
$AuthSql="SELECT cancreate
- FROM purchorderauth
- WHERE userid='". $_SESSION['UserID'] . "'
- AND currabrev='". $myrow['currcode'] . "'";
+ FROM purchorderauth
+ WHERE userid='". $_SESSION['UserID'] . "'
+ AND currabrev='". $myrow['currcode'] . "'";
$AuthResult=DB_query($AuthSql,$db);
@@ -444,20 +444,20 @@
} else {
$_POST['Select'] = $_SESSION['PO'.$identifier]->SupplierID;
$sql = "SELECT suppliers.suppname,
- suppliers.currcode,
- suppliers.paymentterms,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.telephone,
- suppliers.port
- FROM suppliers INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='" . $_POST['Select'] . "'";
-
+ suppliers.currcode,
+ suppliers.paymentterms,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.telephone,
+ suppliers.port
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='" . $_POST['Select'] . "'";
+
$ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
@@ -528,11 +528,11 @@
echo '<br><table cellpadding=3 colspan=7 class=selection>';
$tableheader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
- <th>' . _('Address') . '</th>
- <th>' . _('Currency') . '</th>
- </tr>';
+ <th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Address') . '</th>
+ <th>' . _('Currency') . '</th>
+ </tr>';
echo $tableheader;
@@ -576,9 +576,9 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="">
- ' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
- ' . $_SESSION['PO'.$identifier]->CurrCode . '<br />';
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="">
+ ' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
+ ' . $_SESSION['PO'.$identifier]->CurrCode . '<br />';
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
@@ -603,15 +603,15 @@
}
$sql="SELECT stockmaster.controlled,
- stockmaster.serialised,
- stockmaster.description,
- stockmaster.units ,
- stockmaster.decimalplaces,
- purchdata.price,
- purchdata.suppliersuom,
- purchdata.suppliers_partno,
- purchdata.conversionfactor,
- stockcategory.stockact
+ stockmaster.serialised,
+ stockmaster.description,
+ stockmaster.units ,
+ stockmaster.decimalplaces,
+ purchdata.price,
+ purchdata.suppliersuom,
+ purchdata.suppliers_partno,
+ purchdata.conversionfactor,
+ stockcategory.stockact
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
LEFT JOIN purchdata
@@ -626,36 +626,36 @@
}
$_SESSION['PO'.$identifier]->add_to_order( 1,
- $Purch_Item,
- $PurchItemRow['serialised'],
- $PurchItemRow['controlled'],
- $Qty,
- $PurchItemRow['description'],
- $PurchItemRow['price'],
- $PurchItemRow['units'],
- $PurchItemRow['stockact'],
- date($_SESSION['DefaultDateFormat']),
- 0,
- 0,
- '',
- 0,
- 0,
- '',
- $PurchItemRow['decimalplaces'],
- $Purch_Item,
- $PurchItemRow['suppliersuom'],
- $PurchItemRow['conversionfactor'],
- $PurchItemRow['suppliers_partno'],
- $Qty*$PurchItemRow['price'],
- '',
- 0,
- 0,
- 0,
- 0,
- $Qty,
- $Qty*$PurchItemRow['price']);
+ $Purch_Item,
+ $PurchItemRow['serialised'],
+ $PurchItemRow['controlled'],
+ $Qty,
+ $PurchItemRow['description'],
+ $PurchItemRow['price'],
+ $PurchItemRow['units'],
+ $PurchItemRow['stockact'],
+ date($_SESSION['DefaultDateFormat']),
+ 0,
+ 0,
+ '',
+ 0,
+ 0,
+ '',
+ $PurchItemRow['decimalplaces'],
+ $Purch_Item,
+ $PurchItemRow['suppliersuom'],
+ $PurchItemRow['conversionfactor'],
+ $PurchItemRow['suppliers_partno'],
+ $Qty*$PurchItemRow['price'],
+ '',
+ 0,
+ 0,
+ 0,
+ 0,
+ $Qty,
+ $Qty*$PurchItemRow['price']);
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?' . SID . 'identifier='.$identifier. "'>";
+ echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?identifier='.$identifier. "'>";
}
/*Set up form for entry of order header stuff */
@@ -733,10 +733,6 @@
echo '<tr><td>' . _('Requisition Ref') . ':</td>
<td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
-// echo '<tr><td>' . _('Exchange Rate') . ":</td>
-// <td><input type=TEXT name='ExRate' size=16 maxlength=15 VALUE=" . $_POST['ExRate'] . '></td>
-// echo "<input type='hidden' name='ExRate' size=16 maxlength=15 value=" . $_POST['ExRate'] . "></td>";
-// </tr>';
echo '<tr><td>' . _('Date Printed') . ':</td><td>';
if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted);
@@ -780,29 +776,31 @@
switch ($_SESSION['PO'.$identifier]->Status) {
case 'Pending':
echo '<option selected value="Pending">' . _('Pending') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>
- <option value="Rejected">' . _('Rejected') . '</option>';
+ <option value="Authorised">' . _('Authorised') . '</option>
+ <option value="Rejected">' . _('Rejected') . '</option>';
break;
case 'Authorised':
echo '<option value="Pending">' . _('Pending') . '</option>
- <option selected value="Authorised">' . _('Authorised') . '</option>';
+ <option selected value="Authorised">' . _('Authorised') . '</option>
+ <option value="Cancelled">' . _('Cancelled') . '</option>';
break;
case 'Printed':
echo '<option value="Pending">' . _('Pending') . '</option>
- <option selected value="Printed">' . _('Printed') . '</option>';
+ <option selected value="Printed">' . _('Printed') . '</option>
+ <option value="Cancelled">' . _('Cancelled') . '</option>';
break;
case 'Completed':
echo '<option selected value="Completed">' . _('Completed') . '</option>';
break;
case 'Rejected':
echo '<option selected value="Rejected">' . _('Rejected') . '</option>
- <option value="Pending">' . _('Pending') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>';
+ <option value="Pending">' . _('Pending') . '</option>
+ <option value="Authorised">' . _('Authorised') . '</option>';
break;
case 'Cancelled':
echo '<option selected value="Cancelled">' . _('Cancelled') . '</option>
- <option value="Authorised">' . _('Authorised') . '</option>
- <option value="Pending">' . _('Pending') . '</option>';
+ <option value="Authorised">' . _('Authorised') . '</option>
+ <option value="Pending">' . _('Pending') . '</option>';
break;
}
@@ -856,15 +854,15 @@
$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
$sql = "SELECT deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- contact
- FROM locations
- WHERE loccode='" . $_POST['StkLocation'] . "'";
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
$LocnAddrResult = DB_query($sql,$db);
if (DB_num_rows($LocnAddrResult)==1){
@@ -899,15 +897,15 @@
} elseif (isset($_POST['LookupDeliveryAddress'])){
$sql = "SELECT deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- contact
- FROM locations
- WHERE loccode='" . $_POST['StkLocation'] . "'";
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
$LocnAddrResult = DB_query($sql,$db);
if (DB_num_rows($LocnAddrResult)==1){
@@ -992,9 +990,9 @@
echo '<input type="submit" name="SearchSuppliers" value=' . _('Select Now') . '"></td></tr>';
echo '</td></tr><tr><td>' . _('Supplier Contact') . ':</td><td>
- <select name=SupplierContact>';
+ <select name="SupplierContact">';
- $sql = 'SELECT contact FROM suppliercontacts WHERE supplierid="' . $_POST['Select'] .'"';
+ $sql = "SELECT contact FROM suppliercontacts WHERE supplierid='" . $_POST['Select'] ."'";
$SuppCoResult = DB_query($sql,$db);
while ( $SuppCoRow=DB_fetch_array($SuppCoResult)){
@@ -1043,7 +1041,9 @@
DB_data_seek($result, 0);
echo '</select></td></tr>';
- $result=DB_query('SELECT loccode, locationname FROM locations WHERE loccode="' . $_SESSION['PO'.$identifier]->Port.'"', $db);
+ $result=DB_query("SELECT loccode,
+ locationname
+ FROM locations WHERE loccode='" . $_SESSION['PO'.$identifier]->Port."'", $db);
$myrow = DB_fetch_array($result);
$_POST['Port'] = $myrow['locationname'];
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-03-26 22:11:47 UTC (rev 4518)
+++ trunk/PO_Items.php 2011-03-27 01:50:33 UTC (rev 4519)
@@ -2,8 +2,6 @@
/* $Id PO_Items.php 4183 2010-12-14 09:30:20Z daintree $ */
-//$PageSecurity = 4; Now retrieved from database
-
include('includes/DefinePOClass.php');
include('includes/SQL_CommonFunctions.inc');
@@ -73,7 +71,7 @@
prnMsg( _('The purchase order can not be committed to the database because there are no lines entered on this order'),'error');
$InputError=1;
}
-
+
/*If all clear then proceed to update the database
*/
if ($InputError!=1){
@@ -103,7 +101,7 @@
if (DB_num_rows($AuthResult) ==0){
$AuthMessage = _('Your authority to approve purchase orders in') . ' ' . $_SESSION['PO'.$identifier]->CurrCode . ' ' . _('has not yet been set up') . '<br />';
} else {
- $AuthMessage = _('You can only authorise up to').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthorityLevel.'.<br />';
+ $AuthMessage = _('You can only authorise up to').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthRow['authlevel'] .'.<br />';
}
prnMsg( _('You do not have permission to authorise this purchase order').'.<br />'. _('This order is for').' '.
@@ -131,71 +129,71 @@
/*Insert to purchase order header record */
$sql = "INSERT INTO purchorders ( orderno,
- supplierno,
- comments,
- orddate,
- rate,
- initiator,
- requisitionno,
- intostocklocation,
- deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- suppdeladdress1,
- suppdeladdress2,
- suppdeladdress3,
- suppdeladdress4,
- suppdeladdress5,
- suppdeladdress6,
- suppliercontact,
- supptel,
- contact,
- version,
- revised,
- deliveryby,
- status,
- stat_comment,
- deliverydate,
- paymentterms,
- allowprint)
- VALUES( '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . "',
- '" . $_SESSION['PO'.$identifier]->Comments . "',
- '" . Date('Y-m-d') . "',
- '" . $_SESSION['PO'.$identifier]->ExRate . "',
- '" . $_SESSION['PO'.$identifier]->Initiator . "',
- '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
- '" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
- '" . $_SESSION['PO'.$identifier]->Tel . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
- '" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
- '" . $_SESSION['PO'.$identifier]->SupplierContact . "',
- '" . $_SESSION['PO'.$identifier]->SuppTel. "',
- '" . $_SESSION['PO'.$identifier]->Contact . "',
- '" . $_SESSION['PO'.$identifier]->Version . "',
- '" . Date('Y-m-d') . "',
- '" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
- '" . $_SESSION['PO'.$identifier]->Status . "',
- '" . $StatusComment . "',
- '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
- '" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
- '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "'
- )";
-
+ supplierno,
+ comments,
+ orddate,
+ rate,
+ initiator,
+ requisitionno,
+ intostocklocation,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ suppdeladdress1,
+ suppdeladdress2,
+ suppdeladdress3,
+ suppdeladdress4,
+ suppdeladdress5,
+ suppdeladdress6,
+ suppliercontact,
+ supptel,
+ contact,
+ version,
+ revised,
+ deliveryby,
+ status,
+ stat_comment,
+ deliverydate,
+ paymentterms,
+ allowprint)
+ VALUES( '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . "',
+ '" . $_SESSION['PO'.$identifier]->Comments . "',
+ '" . Date('Y-m-d') . "',
+ '" . $_SESSION['PO'.$identifier]->ExRate . "',
+ '" . $_SESSION['PO'.$identifier]->Initiator . "',
+ '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
+ '" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
+ '" . $_SESSION['PO'.$identifier]->Tel . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
+ '" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierContact . "',
+ '" . $_SESSION['PO'.$identifier]->SuppTel. "',
+ '" . $_SESSION['PO'.$identifier]->Contact . "',
+ '" . $_SESSION['PO'.$identifier]->Version . "',
+ '" . Date('Y-m-d') . "',
+ '" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
+ '" . $_SESSION['PO'.$identifier]->Status . "',
+ '" . $StatusComment . "',
+ '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
+ '" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
+ '" . $_SESSION['PO'.$identifier]->AllowPrintPO . "'
+ )";
+
$ErrMsg = _('The purchase order header record could not be inserted into the database because');
$DbgMsg = _('The SQL statement used to insert the purchase order header record and failed was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
@@ -204,50 +202,50 @@
foreach ($_SESSION['PO'.$identifier]->LineItems as $POLine) {
if ($POLine->Deleted==False) {
$sql = "INSERT INTO purchorderdetails ( orderno,
- itemcode,
- deliverydate,
- itemdescription,
- glcode,
- unitprice,
- quantityord,
- shiptref,
- jobref,
- itemno,
- suppliersunit,
- suppliers_partno,
- subtotal_amount,
- package,
- pcunit,
- netweight,
- kgs,
- cuft,
- total_quantity,
- total_amount,
- assetid,
- conversionfactor )
- VALUES (
- '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $POLine->StockID . "',
- '" . FormatDateForSQL($POLine->ReqDelDate) . "',
- '" . $POLine->ItemDescription . "',
- '" . $POLine->GLCode . "',
- '" . $POLine->Price . "',
- '" . $POLine->Quantity . "',
- '" . $POLine->ShiptRef . "',
- '" . $POLine->JobRef . "',
- '" . $POLine->ItemNo . "',
- '" . $POLine->SuppliersUnit . "',
- '" . $POLine->Suppliers_PartNo . "',
- '" . $POLine->SubTotal_Amount . "',
- '" . $POLine->Package . "',
- '" . $POLine->PcUnit . "',
- '" . $POLine->NetWeight . "',
- '" . $POLine->KGs . "',
- '" . $POLine->CuFt . "',
- '" . $POLine->Total_Quantity . "',
- '" . $POLine->Total_Amount . "',
- '" . $POLine->AssetID . "',
- '" . $POLine->ConversionFactor . "')";
+ itemcode,
+ deliverydate,
+ itemdescription,
+ glcode,
+ unitprice,
+ quantityord,
+ shiptref,
+ jobref,
+ itemno,
+ suppliersunit,
+ suppliers_partno,
+ subtotal_amount,
+ package,
+ pcunit,
+ netweight,
+ kgs,
+ cuft,
+ total_quantity,
+ total_amount,
+ assetid,
+ conversionfactor )
+ VALUES (
+ '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $POLine->StockID . "',
+ '" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ '" . $POLine->ItemDescription . "',
+ '" . $POLine->GLCode . "',
+ '" . $POLine->Price . "',
+ '" . $POLine->Quantity . "',
+ '" . $POLine->ShiptRef . "',
+ '" . $POLine->JobRef . "',
+ '" . $POLine->ItemNo . "',
+ '" . $POLine->SuppliersUnit . "',
+ '" . $POLine->Suppliers_PartNo . "',
+ '" . $POLine->SubTotal_Amount . "',
+ '" . $POLine->Package . "',
+ '" . $POLine->PcUnit . "',
+ '" . $POLine->NetWeight . "',
+ '" . $POLine->KGs . "',
+ '" . $POLine->CuFt . "',
+ '" . $POLine->Total_Quantity . "',
+ '" . $POLine->Total_Amount . "',
+ '" . $POLine->AssetID . "',
+ '" . $POLine->ConversionFactor . "')";
$ErrMsg =_('One of the purchase order detail records could not be inserted into the database because');
$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
@@ -262,35 +260,35 @@
/*Update the purchase order header with any changes */
$sql = "UPDATE purchorders SET supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "' ,
- comments='" . $_SESSION['PO'.$identifier]->Comments . "',
- rate='" . $_SESSION['PO'.$identifier]->ExRate . "',
- initiator='" . $_SESSION['PO'.$identifier]->Initiator . "',
- requisitionno= '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
- version= '" . $_SESSION['PO'.$identifier]->Version . "',
- deliveryby='" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
- deliverydate='" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
- revised= '" . Date('Y-m-d') . "',
- intostocklocation='" . $_SESSION['PO'.$identifier]->Location . "',
- deladd1='" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
- deladd2='" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
- deladd3='" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
- deladd4='" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
- deladd5='" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
- deladd6='" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
- deladd6='" . $_SESSION['PO'.$identifier]->Tel . "',
- suppdeladdress1='" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
- suppdeladdress2='" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
- suppdeladdress3='" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
- suppdeladdress4='" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
- suppdeladdress5='" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
- suppdeladdress6='" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
- suppliercontact='" . $_SESSION['PO'.$identifier]->SupplierContact . "',
- supptel='" . $_SESSION['PO'.$identifier]->SuppTel . "',
- contact='" . $_SESSION['PO'.$identifier]->Contact . "',
- paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
- allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
- status = '" . $_SESSION['PO'.$identifier]->Status . "'
- WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
+ comments='" . $_SESSION['PO'.$identifier]->Comments . "',
+ rate='" . $_SESSION['PO'.$identifier]->ExRate . "',
+ initiator='" . $_SESSION['PO'.$identifier]->Initiator . "',
+ requisitionno= '" . $_SESSION['PO'.$identifier]->RequisitionNo . "',
+ version= '" . $_SESSION['PO'.$identifier]->Version . "',
+ deliveryby='" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
+ deliverydate='" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
+ revised= '" . Date('Y-m-d') . "',
+ intostocklocation='" . $_SESSION['PO'.$identifier]->Location . "',
+ deladd1='" . $_SESSION['PO'.$identifier]->DelAdd1 . "',
+ deladd2='" . $_SESSION['PO'.$identifier]->DelAdd2 . "',
+ deladd3='" . $_SESSION['PO'.$identifier]->DelAdd3 . "',
+ deladd4='" . $_SESSION['PO'.$identifier]->DelAdd4 . "',
+ deladd5='" . $_SESSION['PO'.$identifier]->DelAdd5 . "',
+ deladd6='" . $_SESSION['PO'.$identifier]->DelAdd6 . "',
+ deladd6='" . $_SESSION['PO'.$identifier]->Tel . "',
+ suppdeladdress1='" . $_SESSION['PO'.$identifier]->SuppDelAdd1 . "',
+ suppdeladdress2='" . $_SESSION['PO'.$identifier]->SuppDelAdd2 . "',
+ suppdeladdress3='" . $_SESSION['PO'.$identifier]->SuppDelAdd3 . "',
+ suppdeladdress4='" . $_SESSION['PO'.$identifier]->SuppDelAdd4 . "',
+ suppdeladdress5='" . $_SESSION['PO'.$identifier]->SuppDelAdd5 . "',
+ suppdeladdress6='" . $_SESSION['PO'.$identifier]->SuppDelAdd6 . "',
+ suppliercontact='" . $_SESSION['PO'.$identifier]->SupplierContact . "',
+ supptel='" . $_SESSION['PO'.$identifier]->SuppTel . "',
+ contact='" . $_SESSION['PO'.$identifier]->Contact . "',
+ paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
+ allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
+ status = '" . $_SESSION['PO'.$identifier]->Status . "'
+ WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
$DbgMsg = _('The SQL statement used to update the purchase order header record, that failed was');
@@ -309,99 +307,99 @@
} else if ($POLine->PODetailRec=='') {
$sql = "INSERT INTO purchorderdetails ( orderno,
- itemcode,
- deliverydate,
- itemdescription,
- glcode,
- unitprice,
- quantityord,
- shiptref,
- jobref,
- itemno,
- suppliersunit,
- suppliers_partno,
- subtotal_amount,
- package,
- pcunit,
- netweight,
- kgs,
- cuft,
- total_quantity,
- total_amount,
- assetid,
- conversionfactor)
- VALUES (
- '" . $_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $POLine->StockID . "',
- '" . FormatDateForSQL($POLine->ReqDelDate) . "',
- '" . $POLine->ItemDescription . "',
- '" . $POLine->GLCode . "',
- '" . $POLine->Price . "',
- '" . $POLine->Quantity . "',
- '" . $POLine->ShiptRef . "',
- '" . $POLine->JobRef . "',
- '" . $POLine->ItemNo . "',
- '" . $POLine->SuppliersUnit . "',
- '" . $POLine->Suppliers_PartNo . "',
- '" . $POLine->SubTotal_Amount . "',
- '" . $POLine->Package . "',
- '" . $POLine->PcUnit . "',
- '" . $POLine->NetWeight . "',
- '" . $POLine->KGs . "',
- '" . $POLine->CuFt . "',
- '" . $POLine->Total_Quantity . "',
- '" . $POLine->Total_Amount . "',
- '" . $POLine->AssetID . "',
- '" . $POLine->ConversionFactor . "')";
+ itemcode,
+ deliverydate,
+ itemdescription,
+ glcode,
+ unitprice,
+ quantityord,
+ shiptref,
+ jobref,
+ itemno,
+ suppliersunit,
+ suppliers_partno,
+ subtotal_amount,
+ package,
+ pcunit,
+ netweight,
+ kgs,
+ cuft,
+ total_quantity,
+ total_amount,
+ assetid,
+ conversionfactor)
+ VALUES (
+ '" . $_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $POLine->StockID . "',
+ '" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ '" . $POLine->ItemDescription . "',
+ '" . $POLine->GLCode . "',
+ '" . $POLine->Price . "',
+ '" . $POLine->Quantity . "',
+ '" . $POLine->ShiptRef . "',
+ '" . $POLine->JobRef . "',
+ '" . $POLine->ItemNo . "',
+ '" . $POLine->SuppliersUnit . "',
+ '" . $POLine->Suppliers_PartNo . "',
+ '" . $POLine->SubTotal_Amount . "',
+ '" . $POLine->Package . "',
+ '" . $POLine->PcUnit . "',
+ '" . $POLine->NetWeight . "',
+ '" . $POLine->KGs . "',
+ '" . $POLine->CuFt . "',
+ '" . $POLine->Total_Quantity . "',
+ '" . $POLine->Total_Amount . "',
+ '" . $POLine->AssetID . "',
+ '" . $POLine->ConversionFactor . "')";
} else {
if ($POLine->Quantity==$POLine->QtyReceived){
$sql = "UPDATE purchorderdetails SET itemcode='" . $POLine->StockID . "',
- deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
- itemdescription='" . $POLine->ItemDescription . "',
- glcode='" . $POLine->GLCode . "',
- unitprice='" . $POLine->Price . "',
- quantityord='" . $POLine->Quantity . "',
- shiptref='" . $POLine->ShiptRef . "',
- jobref='" . $POLine->JobRef . "',
- itemno='" . $POLine->ItemNo . "',
- suppliersunit='" . $POLine->SuppliersUnit . "',
- suppliers_partno='" . $POLine->Suppliers_PartNo . "',
- subtotal_amount='" . $POLine->SubTotal_Amount . "',
- package='" . $POLine->Package . "',
- pcunit='" . $POLine->PcUnit . "',
- netweight='" . $POLine->NetWeight . "',
- kgs='" . $POLine->KGs . "',
- cuft='" . $POLine->CuFt . "',
- total_quantity='" . $POLine->Total_Quantity . "',
- total_amount='" . $POLine->Total_Amount . "',
- completed=1,
- assetid='" . $POLine->AssetID . "',
- conversionfactor = '" . $POLine->ConversionFactor . "'
- WHERE podetailitem='" . $POLine->PODetailRec . "'";
+ deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ itemdescription='" . $POLine->ItemDescription . "',
+ glcode='" . $POLine->GLCode . "',
+ unitprice='" . $POLine->Price . "',
+ quantityord='" . $POLine->Quantity . "',
+ shiptref='" . $POLine->ShiptRef . "',
+ jobref='" . $POLine->JobRef . "',
+ itemno='" . $POLine->ItemNo . "',
+ suppliersunit='" . $POLine->SuppliersUnit . "',
+ suppliers_partno='" . $POLine->Suppliers_PartNo . "',
+ subtotal_amount='" . $POLine->SubTotal_Amount . "',
+ package='" . $POLine->Package . "',
+ pcunit='" . $POLine->PcUnit . "',
+ netweight='" . $POLine->NetWeight . "',
+ kgs='" . $POLine->KGs . "',
+ cuft='" . $POLine->CuFt . "',
+ total_quantity='" . $POLine->Total_Quantity . "',
+ total_amount='" . $POLine->Total_Amount . "',
+ completed=1,
+ assetid='" . $POLine->AssetID . "',
+ conversionfactor = '" . $POLine->ConversionFactor . "'
+ WHERE podetailitem='" . $POLine->PODetailRec . "'";
} else {
$sql = "UPDATE purchorderdetails SET itemcode='" . $POLine->StockID . "',
- deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
- itemdescription='" . $POLine->ItemDescription . "',
- glcode='" . $POLine->GLCode . "',
- unitprice='" . $POLine->Price . "',
- quantityord='" . $POLine->Quantity . "',
- shiptref='" . $POLine->ShiptRef . "',
- jobref='" . $POLine->JobRef . "',
- itemno='" . $POLine->ItemNo . "',
- suppliersunit='" . $POLine->SuppliersUnit . "',
- suppliers_partno='" . $POLine->Suppliers_PartNo . "',
- subtotal_amount='" . $POLine->SubTotal_Amount . "',
- package='" . $POLine->Package . "',
- pcunit='" . $POLine->PcUnit . "',
- netweight='" . $POLine->NetWeight . "',
- kgs='" . $POLine->KGs . "',
- cuft='" . $POLine->CuFt . "',
- total_quantity='" . $POLine->Total_Quantity . "',
- total_amount='" . $POLine->Total_Amount . "',
- assetid='" . $POLine->AssetID . "',
- conversionfactor = '" . $POLine->ConversionFactor . "'
- WHERE podetailitem='" . $POLine->PODetailRec . "'";
+ deliverydate ='" . FormatDateForSQL($POLine->ReqDelDate) . "',
+ itemdescription='" . $POLine->ItemDescription . "',
+ glcode='" . $POLine->GLCode . "',
+ unitprice='" . $POLine->Price . "',
+ quantityord='" . $POLine->Quantity . "',
+ shiptref='" . $POLine->ShiptRef . "',
+ jobref='" . $POLine->JobRef . "',
+ itemno='" . $POLine->ItemNo . "',
+ suppliersunit='" . $POLine->SuppliersUnit . "',
+ suppliers_partno='" . $POLine->Suppliers_PartNo . "',
+ subtotal_amount='" . $POLine->SubTotal_Amount . "',
+ package='" . $POLine->Package . "',
+ pcunit='" . $POLine->PcUnit . "',
+ netweight='" . $POLine->NetWeight . "',
+ kgs='" . $POLine->KGs . "',
+ cuft='" . $POLine->CuFt . "',
+ total_quantity='" . $POLine->Total_Quantity . "',
+ total_amount='" . $POLine->Total_Amount . "',
+ assetid='" . $POLine->AssetID . "',
+ conversionfactor = '" . $POLine->ConversionFactor . "'
+ WHERE podetailitem='" . $POLine->PODetailRec . "'";
}
}
@@ -433,6 +431,7 @@
if(isset($_GET['Delete'])){
if($_SESSION['PO'.$identifier]->Some_Already_Received($_GET['Delete'])==0){
$_SESSION['PO'.$identifier]->LineItems[$_GET['Delete']]->Deleted=True;
+ $_SESSION['PO'.$identifier]->LinesOnOrder --;
include ('includes/PO_UnsetFormVbls.php');
} else {
prnMsg( _('This item cannot be deleted because some of it has already been received'),'warn');
@@ -442,8 +441,7 @@
if (isset($_POST['EnterLine'])){ /*Inputs from the form directly without selecting a stock item from the search */
$AllowUpdate = true; /*always assume the best */
-
- if (!is_numeric($_POST['Qty'])){
+ if (!is_numeric(doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['Qty'])))){
$AllowUpdate = false;
prnMsg( _('Cannot Enter this order line') . '<br />' . _('The quantity of the order item must be numeric'),'error');
}
@@ -495,12 +493,12 @@
}
if ($_POST['AssetID'] !='Not an Asset'){
$ValidAssetResult = DB_query("SELECT assetid,
- description,
- costact
- FROM fixedassets
- INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $_POST['AssetID'] . "'",$db);
+ description,
+ costact
+ FROM fixedassets
+ INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ WHERE assetid='" . $_POST['AssetID'] . "'",$db);
if (DB_num_rows($ValidAssetResult)==0){ // then the asset id entered doesn't exist
$AllowUpdate = false;
prnMsg(_('An asset code was entered but it does not yet exist. Only pre-existing asset ids can be entered when ordering a fixed asset'),'error');
@@ -526,36 +524,36 @@
$_POST['Qty'] = doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['Qty']));
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
- '',
- 0, /*Serialised */
- 0, /*Controlled */
- $_POST['Qty'],
- $_POST['ItemDescription'],
- $_POST['Price'],
- $_POST['SuppliersUnit'],
- $_POST['GLCode'],
- $_POST['ReqDelDate'],
- '',
- 0,
- '',
- 0,
- 0,
- $GLAccountName,
- 2,
- '',
- $_POST['SuppliersUnit'],
- 1,
- '',
- '',
- ($_POST['Qty']*$_POST['Price']),
- '',
- '',
- '',
- '',
- '',
- $_POST['Qty'],
- ($_POST['Qty']*$_POST['Price']),
- $_POST['AssetID']);
+ '',
+ 0, /*Serialised */
+ 0, /*Controlled */
+ $_POST['Qty'],
+ $_POST['ItemDescription'],
+ $_POST['Price'],
+ $_POST['SuppliersUnit'],
+ $_POST['GLCode'],
+ $_POST['ReqDelDate'],
+ '',
+ 0,
+ '',
+ 0,
+ 0,
+ $GLAccountName,
+ 2,
+ '',
+ $_POST['SuppliersUnit'],
+ 1,
+ '',
+ '',
+ ($_POST['Qty']*$_POST['Price']),
+ '',
+ '',
+ '',
+ '',
+ '',
+ $_POST['Qty'],
+ ($_POST['Qty']*$_POST['Price']),
+ $_POST['AssetID']);
include ('includes/PO_UnsetFormVbls.php');
}
}
@@ -591,18 +589,18 @@
}
if ($AlreadyOnThisOrder!=1 AND $Quantity > 0){
$sql = "SELECT description,
- stockid,
- units,
- decimalplaces,
- kgs,
- netweight,
- stockact,
- accountname
- FROM stockmaster INNER JOIN stockcategory
- ON stockcategory.categoryid = stockmaster.categoryid
- INNER JOIN chartmaster
- ON chartmaster.accountcode = stockcategory.stockact
- WHERE stockmaster.stockid = '". $ItemCode . "'";
+ stockid,
+ units,
+ decimalplaces,
+ kgs,
+ netweight,
+ stockact,
+ accountname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockcategory.categoryid = stockmaster.categoryid
+ INNER JOIN chartmaster
+ ON chartmaster.accountcode = stockcategory.stockact
+ WHERE stockmaster.stockid = '". $ItemCode . "'";
$ErrMsg = _('The item details for') . ' ' . $ItemCode . ' ' . _('could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the item details but failed was');
@@ -611,26 +609,26 @@
$ItemRow = DB_fetch_array($ItemResult);
$sql = "SELECT price,
- conversionfactor,
- supplierdescription,
- suppliersuom,
- unitname,
- suppliers_partno,
- leadtime,
- MAX(purchdata.effectivefrom) AS latesteffectivefrom
- FROM purchdata LEFT JOIN unitsofmeasure
- ON purchdata.suppliersuom=unitsofmeasure.unitid
- WHERE purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
- AND purchdata.effectivefrom <='" . Date('Y-m-d') . "'
- AND purchdata.stockid = '". $ItemCode . "'
- GROUP BY purchdata.price,
- purchdata.conversionfactor,
- purchdata.supplierdescription,
- purchdata.suppliersuom,
- unitsofmeasure.unitname,
- purchdata.suppliers_partno,
- purchdata.leadtime";
-
+ conversionfactor,
+ supplierdescription,
+ suppliersuom,
+ unitname,
+ suppliers_partno,
+ leadtime,
+ MAX(purchdata.effectivefrom) AS latesteffectivefrom
+ FROM purchdata LEFT JOIN unitsofmeasure
+ ON purchdata.suppliersuom=unitsofmeasure.unitid
+ WHERE purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND purchdata.effectivefrom <='" . Date('Y-m-d') . "'
+ AND purchdata.stockid = '". $ItemCode . "'
+ GROUP BY purchdata.price,
+ purchdata.conversionfactor,
+ purchdata.supplierdescription,
+ purchdata.suppliersuom,
+ unitsofmeasure.unitname,
+ purchdata.suppliers_partno,
+ purchdata.leadtime";
+
$ErrMsg = _('The purchasing data for') . ' ' . $ItemCode . ' ' . _('could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the purchasing data but failed was');
$PurchDataResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -652,35 +650,35 @@
}
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
- $ItemCode,
- 0, /*Serialised */
- 0, /*Controlled */
- $Quantity*$ConversionFactor, /* Qty */
- $SupplierDescription,
- $PurchPrice,
- $ItemRow['units'],
- $ItemRow['stockact'],
- $_SESSION['PO'.$identifier]->DeliveryDate,
- 0,
- 0,
- 0,
- 0,
- 0,
- $Itemrow['accountname'],
- $ItemRow['decimalplaces'],
- $ItemCode,
- $SuppliersUnitOfMeasure,
- $ConversionFactor,
- $LeadTime,
- $SuppliersPartNo,
- $Quantity*$PurchPrice,
- '',
- 0,
- $ItemRow['netweight'],
- $ItemRow['kgs'],
- '',
- $Quantity,
- $Quantity*$PurchPrice );
+ $ItemCode,
+ 0, /*Serialised */
+ 0, /*Controlled */
+ $Quantity*$ConversionFactor, /* Qty */
+ $SupplierDescription,
+ $PurchPrice,
+ $ItemRow['units'],
+ $ItemRow['stockact'],
+ $_SESSION['PO'.$identifier]->DeliveryDate,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ $Itemrow['accountname'],
+ $ItemRow['decimalplaces'],
+ $ItemCode,
+ $SuppliersUnitOfMeasure,
+ $ConversionFactor,
+ $LeadTime,
+ $SuppliersPartNo,
+ $Quantity*$PurchPrice,
+ '',
+ 0,
+ $ItemRow['netweight'],
+ $ItemRow['kgs'],
+ '',
+ $Quantity,
+ $Quantity*$PurchPrice );
} else { //no rows returned by the SQL to get the item
prnMsg (_('The item code') . ' ' . $ItemCode . ' ' . _('does not exist in the database and therefore cannot be added to the order'),'error');
if ($debug==1){
@@ -832,45 +830,47 @@
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND stockmaster.description " . LIKE . " '" . $SearchString ."'
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND stockmaster.description " . LIKE . " '" . $SearchString ."'
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.description " . LIKE . " '". $SearchString ."'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.description " . LIKE . " '". $SearchString ."'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
}
} elseif ($_POST['StockCode']){
@@ -879,87 +879,91 @@
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
} else {
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- and stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid
- LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ and stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ AND stockmaster.stockid " . LIKE . " '" . $_POST['StockCode'] . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid
+ LIMIT ".$_SESSION['DefaultDisplayRecordsMax'];
}
} else {
if ($_POST['StockCat']=='All'){
$sql = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.units,
- unitsofmeasure.unitname
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- LEFT JOIN purchdata
- ON stockmaster.stockid=purchdata.stockid
- LEFT JOIN unitsofmeasure
- ON unitsofmeasure.unitid=purchdata.suppliersuom
- WHERE stockmaster.mbflag<>'D'
- AND stockmaster.mbflag<>'K'
- AND stockmaster.mbflag<>'G'
- AND stockmaster.discontinued<>1
- AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
- OR purchdata.supplierno IS NULL)
- ORDER BY stockmaster.stockid
- LIMIT " . $_SESSION['DefaultDisplayRecordsMax'];
+ stockmaster.description,
+ stockmaster.units,
+ purchdata.conversionfactor,
+ unitsofmeasure.unitname
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ LEFT JOIN purchdata
+ ON stockmaster.stockid=purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON unitsofmeasure.unitid=purchdata.suppliersuom
+ WHERE stockmaster.mbflag<>'D'
+ AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'G'
+ AND stockmaster.discontinued<>1
+ AND (purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID."'
+ OR purchdata.supplierno IS NULL)
+ ORDER BY stockmaster.stockid
+ LIMIT " . $_SESSION['DefaultDisplayRec...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-26 22:11:54
|
Revision: 4518
http://web-erp.svn.sourceforge.net/web-erp/?rev=4518&view=rev
Author: daintree
Date: 2011-03-26 22:11:47 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
SQL ansi fixes - remove typo resulting in visible <td> in WorkOrderIssue.php
Modified Paths:
--------------
trunk/MRP.php
trunk/WorkOrderIssue.php
trunk/doc/Change.log.html
trunk/doc/README.txt
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/MRP.php 2011-03-26 22:11:47 UTC (rev 4518)
@@ -25,14 +25,14 @@
$result = DB_query('DROP TABLE IF EXISTS levels',$db);
$sql = 'CREATE TEMPORARY TABLE passbom (part char(20),
- sortpart text) DEFAULT CHARSET=utf8';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = 'CREATE TEMPORARY TABLE tempbom (parent char(20),
- component char(20),
- sortpart text,
- level int) DEFAULT CHARSET=utf8';
+ component char(20),
+ sortpart text,
+ level int) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// To create levels, first, find parts in bom that are top level assemblies.
// Do this by doing a LEFT JOIN from bom to bom (as bom2), linking
@@ -44,11 +44,11 @@
prnMsg(_('Creating first level'),'info');
flush();
// This finds the top level
- $sql = 'INSERT INTO passbom (part, sortpart)
+ $sql = "INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
- CONCAT(bom.parent,"%",bom.component) AS sortpart
+ CONCAT(bom.parent,'%',bom.component) AS sortpart
FROM bom LEFT JOIN bom as bom2 ON bom.parent = bom2.component
- WHERE bom2.component IS NULL';
+ WHERE bom2.component IS NULL";
$result = DB_query($sql,$db);
$lctr = 2;
@@ -132,32 +132,32 @@
flush();
// Create levels from bomlevels using the highest level number found for a part
- $sql = 'CREATE TABLE levels (
+ $sql = "CREATE TABLE levels (
part char(20),
level int,
- leadtime smallint(6) NOT NULL default "0",
- pansize double NOT NULL default "0",
- shrinkfactor double NOT NULL default "0",
- eoq double NOT NULL default "0") DEFAULT CHARSET=utf8';
+ leadtime smallint(6) NOT NULL default '0',
+ pansize double NOT NULL default '0',
+ shrinkfactor double NOT NULL default '0',
+ eoq double NOT NULL default '0') DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db);
$sql = 'INSERT INTO levels (part,
- level,
- leadtime,
- pansize,
- shrinkfactor,
- eoq)
- SELECT bomlevels.part,
- MAX(bomlevels.level),
- 0,
- pansize,
- shrinkfactor,
- stockmaster.eoq
- FROM bomlevels
- INNER JOIN stockmaster ON bomlevels.part = stockmaster.stockid
- GROUP BY bomlevels.part,
- pansize,
- shrinkfactor,
- stockmaster.eoq';
+ level,
+ leadtime,
+ pansize,
+ shrinkfactor,
+ eoq)
+ SELECT bomlevels.part,
+ MAX(bomlevels.level),
+ 0,
+ pansize,
+ shrinkfactor,
+ stockmaster.eoq
+ FROM bomlevels
+ INNER JOIN stockmaster ON bomlevels.part = stockmaster.stockid
+ GROUP BY bomlevels.part,
+ pansize,
+ shrinkfactor,
+ stockmaster.eoq';
$result = DB_query($sql,$db);
$sql = 'ALTER TABLE levels ADD INDEX part(part)';
$result = DB_query($sql,$db);
@@ -166,26 +166,26 @@
// are not in bom
$sql = 'INSERT INTO levels (part,
- level,
- leadtime,
- pansize,
- shrinkfactor,
- eoq)
- SELECT stockmaster.stockid AS part,
- 0,
- 0,
- stockmaster.pansize,
- stockmaster.shrinkfactor,
- stockmaster.eoq
- FROM stockmaster
- LEFT JOIN levels ON stockmaster.stockid = levels.part
- WHERE levels.part IS NULL';
+ level,
+ leadtime,
+ pansize,
+ shrinkfactor,
+ eoq)
+ SELECT stockmaster.stockid AS part,
+ 0,
+ 0,
+ stockmaster.pansize,
+ stockmaster.shrinkfactor,
+ stockmaster.eoq
+ FROM stockmaster
+ LEFT JOIN levels ON stockmaster.stockid = levels.part
+ WHERE levels.part IS NULL';
$result = DB_query($sql,$db);
// Update leadtime in levels from purchdata. Do it twice so can make sure leadtime from preferred
// vendor is used
$sql = 'UPDATE levels,purchdata
- SET levels.leadtime = purchdata.leadtime
+ SET levels.leadtime = purchdata.leadtime
WHERE levels.part = purchdata.stockid
AND purchdata.leadtime > 0';
$result = DB_query($sql,$db);
@@ -220,99 +220,98 @@
// CreateLowerLevelRequirement() function. Mostly do this so can distinguish the type
// of requirements for the MRPShortageReport so don't show double requirements.
$sql = 'CREATE TABLE mrprequirements ( part char(20),
- daterequired date,
- quantity double,
- mrpdemandtype varchar(6),
- orderno int(11),
- directdemand smallint,
- whererequired char(20)) DEFAULT CHARSET=utf8';
+ daterequired date,
+ quantity double,
+ mrpdemandtype varchar(6),
+ orderno int(11),
+ directdemand smallint,
+ whererequired char(20)) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of mrprequirements failed because'));
prnMsg(_('Loading requirements from sales orders'),'info');
flush();
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stkcode,
- deliverydate,
- (quantity - qtyinvoiced) AS netqty,
- "SO",
- salesorderdetails.orderno,
- "1",
- stkcode
- FROM salesorders, salesorderdetails
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND (quantity - qtyinvoiced) > 0
- AND salesorderdetails.completed = 0
- AND salesorders.quotation = 0';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stkcode,
+ deliverydate,
+ (quantity - qtyinvoiced) AS netqty,
+ 'SO',
+ salesorderdetails.orderno,
+ '1',
+ stkcode
+ FROM salesorders, salesorderdetails
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND (quantity - qtyinvoiced) > 0
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation = 0";
$result = DB_query($sql,$db);
-
prnMsg(_('Loading requirements from work orders'),'info');
flush();
// Definition of demand from SelectProduct.php
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT worequirements.stockid,
- workorders.requiredby,
- qtypu*(woitems.qtyreqd - woitems.qtyrecd) AS netqty,
- "WO",
- woitems.wo,
- "1",
- parentstockid
- FROM woitems INNER JOIN worequirements
- ON woitems.stockid=worequirements.parentstockid
- INNER JOIN workorders
- ON woitems.wo=workorders.wo
- AND woitems.wo=worequirements.wo
- WHERE workorders.closed=0';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT worequirements.stockid,
+ workorders.requiredby,
+ qtypu*(woitems.qtyreqd - woitems.qtyrecd) AS netqty,
+ 'WO',
+ woitems.wo,
+ '1',
+ parentstockid
+ FROM woitems INNER JOIN worequirements
+ ON woitems.stockid=worequirements.parentstockid
+ INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ AND woitems.wo=worequirements.wo
+ WHERE workorders.closed=0";
$result = DB_query($sql,$db);
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stockid,
- duedate,
- quantity,
- mrpdemandtype,
- demandid,
- "1",
- stockid
- FROM mrpdemands';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stockid,
+ duedate,
+ quantity,
+ mrpdemandtype,
+ demandid,
+ '1',
+ stockid
+ FROM mrpdemands";
if ($_POST['usemrpdemands'] == 'y') {
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements based on mrpdemands'),'info');
flush();
}
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stockid,
- NOW(),
- (reorderlevel - quantity) AS reordqty,
- "REORD",
- "1",
- "1",
- stockid
- FROM locstock
- WHERE reorderlevel > quantity';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stockid,
+ NOW(),
+ (reorderlevel - quantity) AS reordqty,
+ 'REORD',
+ '1',
+ '1',
+ stockid
+ FROM locstock
+ WHERE reorderlevel > quantity";
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements based on reorder level'),'info');
flush();
@@ -327,40 +326,40 @@
// updateflag is set to 1 in UpdateSupplies if change date when matching requirements to
// supplies. Actually only change update flag in the array created from mrpsupplies
$sql = 'CREATE TABLE mrpsupplies ( id int(11) NOT NULL auto_increment,
- part char(20),
- duedate date,
- supplyquantity double,
- ordertype varchar(6),
- orderno int(11),
- mrpdate date,
- updateflag smallint(6),
- PRIMARY KEY (id)) DEFAULT CHARSET=utf8';
+ part char(20),
+ duedate date,
+ supplyquantity double,
+ ordertype varchar(6),
+ orderno int(11),
+ mrpdate date,
+ updateflag smallint(6),
+ PRIMARY KEY (id)) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of mrpsupplies failed because'));
prnMsg(_('Loading supplies from purchase orders'),'info');
flush();
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- purchorderdetails.itemcode,
- purchorderdetails.deliverydate,
- (quantityord - quantityrecd) AS netqty,
- "PO",
- purchorderdetails.orderno,
- purchorderdetails.deliverydate,
- 0
- FROM purchorderdetails,
- purchorders
- WHERE purchorderdetails.orderno = purchorders.orderno
- AND purchorders.status != "Cancelled"
- AND purchorders.status != "Rejected"
- AND(quantityord - quantityrecd) > 0';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ purchorderdetails.itemcode,
+ purchorderdetails.deliverydate,
+ (quantityord - quantityrecd) AS netqty,
+ 'PO',
+ purchorderdetails.orderno,
+ purchorderdetails.deliverydate,
+ 0
+ FROM purchorderdetails,
+ purchorders
+ WHERE purchorderdetails.orderno = purchorders.orderno
+ AND purchorders.status != 'Cancelled'
+ AND purchorders.status != 'Rejected'
+ AND(quantityord - quantityrecd) > 0";
$result = DB_query($sql,$db);
prnMsg(_('Loading supplies from inventory on hand'),'info');
@@ -382,49 +381,49 @@
} // End of foreach
$WhereLocation .= ')';
}
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- stockid,
- "0000-00-00",
- SUM(quantity),
- "QOH",
- 1,
- "0000-00-00",
- 0
- FROM locstock
- WHERE quantity > 0 ' .
- $WhereLocation .
- 'GROUP BY stockid';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ stockid,
+ '0000-00-00',
+ SUM(quantity),
+ 'QOH',
+ 1,
+ '0000-00-00',
+ 0
+ FROM locstock
+ WHERE quantity > 0 " .
+ $WhereLocation .
+ 'GROUP BY stockid';
$result = DB_query($sql,$db);
prnMsg(_('Loading supplies from work orders'),'info');
flush();
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- stockid,
- workorders.requiredby,
- (woitems.qtyreqd-woitems.qtyrecd) AS netqty,
- "WO",
- woitems.wo,
- workorders.requiredby,
- 0
- FROM woitems INNER JOIN workorders
- ON woitems.wo=workorders.wo
- WHERE workorders.closed=0';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ stockid,
+ workorders.requiredby,
+ (woitems.qtyreqd-woitems.qtyrecd) AS netqty,
+ 'WO',
+ woitems.wo,
+ workorders.requiredby,
+ 0
+ FROM woitems INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ WHERE workorders.closed=0";
$result = DB_query($sql,$db);
$sql = 'ALTER TABLE mrpsupplies ADD INDEX part(part)';
@@ -462,7 +461,7 @@
// part, that serves as a gross requirement for a lower level part, so will read down through
// the Bill of Materials to generate those requirements in function LevelNetting().
for ($level = $maxlevel; $level >= $minlevel; $level--) {
- $sql = 'SELECT * FROM levels WHERE level = "' . $level .'" LIMIT 50000'; //should cover most eventualities!! ... yes indeed :-)
+ $sql = "SELECT * FROM levels WHERE level = '" . $level ."' LIMIT 50000"; //should cover most eventualities!! ... yes indeed :-)
prnMsg('</br>------ ' . _('Processing level') .' ' . $level . ' ------','info');
flush();
@@ -497,19 +496,19 @@
} // End of if
} // End of foreach
$sql = "INSERT INTO mrpparameters (runtime,
- location,
- pansizeflag,
- shrinkageflag,
- eoqflag,
- usemrpdemands,
- leeway)
- VALUES (NOW(),
- '" . $locparm . "',
- '" . $_POST['pansizeflag'] . "',
- '" . $_POST['shrinkageflag'] . "',
- '" . $_POST['eoqflag'] . "',
- '" . $_POST['usemrpdemands'] . "',
- '" . $_POST['Leeway'] . "')";
+ location,
+ pansizeflag,
+ shrinkageflag,
+ eoqflag,
+ usemrpdemands,
+ leeway)
+ VALUES (NOW(),
+ '" . $locparm . "',
+ '" . $_POST['pansizeflag'] . "',
+ '" . $_POST['shrinkageflag'] . "',
+ '" . $_POST['eoqflag'] . "',
+ '" . $_POST['usemrpdemands'] . "',
+ '" . $_POST['Leeway'] . "')";
$result = DB_query($sql,$db);
} else { // End of if submit isset
@@ -556,7 +555,7 @@
}
echo "<p><form method='post' action='" . $_SERVER['PHP_SELF'] . '?' . SID . "'>";
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<td><table class=selection>';
+ echo '<table class=selection>';
// Generate selections for Location
echo '<tr><th colspan=3><font color=blue size=3>'._('This Run Details').'</font></th></tr>';
echo '<tr>
@@ -804,7 +803,7 @@
$newdate = FormatDateForSQL($dateadd);
}
- $component = $myrow['component'];
+ $component = $myrow['component'];
$extendedquantity = $myrow['quantity'] * $topquantity;
// Commented out the following lines 8/15/09 because the eoq should be considered in the
// LevelNetting() function where $excessqty is calculated
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/WorkOrderIssue.php 2011-03-26 22:11:47 UTC (rev 4518)
@@ -556,8 +556,8 @@
echo '</select>';
} else {
$LocResult = DB_query("SELECT loccode, locationname
- FROM locations
- WHERE loccode='" . $_POST['FromLocation'] . "'",
+ FROM locations
+ WHERE loccode='" . $_POST['FromLocation'] . "'",
$db);
$LocRow = DB_fetch_array($LocResult);
echo '<input type="hidden" name="FromLocation" value="' . $_POST['FromLocation'] . '">';
@@ -615,10 +615,10 @@
echo '<table class=selection><tr><td>' . _('Select a stock category') . ':<select name="StockCat">';
if (!isset($_POST['StockCat'])){
- echo "<option selected VALUE='All'>" . _('All');
+ echo "<option selected VALUE='All'>" . _('All') . '</option>';
$_POST['StockCat'] ='All';
} else {
- echo "<option VALUE='All'>" . _('All');
+ echo "<option VALUE='All'>" . _('All') . '</option>';
}
while ($myrow1 = DB_fetch_array($result1)) {
@@ -636,7 +636,7 @@
<td><input type="Text" name="Keywords" size=20 maxlength=25 VALUE="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
<tr><td></td>
<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="Text" name="StockCode" size=15 maxlength=18 VALUE="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><input type="Text" name="StockCode" size="15" maxlength="18" VALUE="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
<br /><div class="centre"><input type=submit name="Search" VALUE="<?php echo _('Search Now'); ?>">
@@ -767,13 +767,13 @@
<td><input type="textbox" name="Qty' . $i .'"></td></tr>';
}
echo '<input type="hidden" name="IssueItem" value="' . $_POST['IssueItem'] . '">';
- echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"><</div>/td></tr>';
+ echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
} //end of lot/batch control
} else { //not controlled - an easy one!
echo '<input type="hidden" name="IssueItem" value="' . $_POST['IssueItem'] . '">';
echo '<tr><td>' . _('Quantity Issued') . ':</td>
<td><input class=number type="textbox" name="Qty"></tr>';
- echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
+ echo '<tr><td colspan=2><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
}
} //end if selecting new item to issue or entering the issued item quantities
echo '</table>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/doc/Change.log.html 2011-03-26 22:11:47 UTC (rev 4518)
@@ -20,7 +20,7 @@
<p>10/3/11: Phil fix pagination of PrintCustOrder_generic.php - second copy was not restarting page numbers</p>
<p>10/3/11: Tims launchpad fixes brought in MRP.php fix for table charset utf8 so joins work correctly; typeo in PO_Header preventing purchasing data being retrieved ($result not $Result); correct sql on searching for customer in SelectCreditItems.php; StockStatus.php pricing history bug resolved (4450); StockQuantityByDate.php now allowed to show for all categories - enclosed 'All' in gettext</p>
<p>8/3/11: Tim/Phil PO_Items.php in committing an order detail the assetid of 'Not an Asset' was being inserted to an integer field. Modified $_POST['AssetID'] to = 0 if it was 'Not an Asset' as advised by Tim</p>
-<p>8/3/11:Phil fix SalesAnalysis reports for TCPDF as reported by Joe Zhou</p>
+<p>8/3/11: Phil fix SalesAnalysis reports for TCPDF as reported by Joe Zhou</p>
<p>5/3/11: Kovács Attila fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL</p>
<p>5/3/11: Kovács Attila fix to LanguageSetup.php to use utf-8 not ISO-8859-1. Phil hardcoded UTF-8 now as no dynamic changing of character set required all translations are utf-8</p>
<p>3/3/11: Exson/Baran/Phil fix to customer login to ensure that other customers orders are not displayed when searching by customer ref or order no</p>
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/doc/README.txt 2011-03-26 22:11:47 UTC (rev 4518)
@@ -2,8 +2,28 @@
/* $Id$*/
-Thankyou for using webERP.
+Version 4.03 of webERP
+Now fully utf-8 compatible. Now reports can be created in any language using the utf-8 character set, the resultant pdf reports use Adobe CID fonts and the fonts that come with the Adobe Acrobat reader on client computers. This avoids the problem of large pdf downloads on the creation of reports as the alternative is to bundle the enormous utf-8 fonts with the reports.
+
+Also, this release comes with an automated database upgrade system, so that database changes in later versions will be applied automatically on upgrade of the scripts.
+
+Other than the re-engineering of pdf reporting using the TCPDF pdf report creation class, that has enabled the utf-8 pdf reporting, the other new areas of functionality since the 3 series include:
+
+1. Fixed assets module, this allows the recording of fixed asset additions, depreciation calculations on a monthly basis and disposals all integrated with the sale/debtors system with appropriate general ledger journals also created.
+
+2. Contract Costing functionality that allows contracts to be defined and the costs recorded against the contract. Contracts can be created using items from stock and also other items that might be required to be purchased that are not currently stock items. Contracts can be converted to quotations and from a quotation to a sales order/sale. The final variances on contracts are recorded and a final costing comparison report available.
+
+3. Significant work has also been done in conjunction with Secunia, the software security testing people, who have scruitinised webERP for security vulnerabilities. Their findings were useful in identifying scripts that needed to be changed. All identified weaknesses have now been removed.
+
+4. Prices can now be set for a period - with start and end date, to allow for promotional periods where the price should revert back and can be set ahead of time.
+
+5. Counter Sales functionality to allow sales to be processed to a default cash sales account and receipt of cash processed at the same time. This avoids having to enter a sales order, confirm the dispatch to invoice, the also entering the receipt as separate process and effectively enables a kind of point of sale system for each inventory location.
+
+6. A significant push has been made to try to reduce the number of bugs, with a great deal of testing from all quarters.
+
+The change log shows descriptions and dates of all changes made.
+
Installation instructions are in the file INSTALL.txt in the doc directory. It is important to read the INSTALL.txt file in its entirety before proceeding. A printout is recommended.
The user documentation contains a wealth of information and is installed under the doc/Manual directory in html format. Links to it are available from the application itself.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/includes/ConnectDB.inc 2011-03-26 22:11:47 UTC (rev 4518)
@@ -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.03.4'; //must update manually every time there is a DB change
+$Version='4.03.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/includes/ConnectDB_mysqli.inc 2011-03-26 22:11:47 UTC (rev 4518)
@@ -14,19 +14,13 @@
}
global $db; // Make sure it IS global, regardless of our context
$db = mysqli_connect($host , $dbuser, $dbpassword,$_SESSION['DatabaseName'], $mysqlport);
+$result=DB_query('SET sql_mode = ANSI', $db);
-//printf("tried making mysql-i Connection.\n");
-//$varabc = mysqli_client_encoding($db);
-//printf("client encoding is %s\n", $varabc);
//this statement sets the charset to be used for sending data to and from the db server
//if not set, both mysqli server and mysqli client/library may assume otherwise
mysqli_set_charset($db, "utf8");
-//$varabc = mysqli_client_encoding($db);
-//printf("client encoding is %s\n", $varabc);
-
-
/* check connection */
if (mysqli_connect_errno()) {
printf("Connect failed: %s\n", mysqli_connect_error());
@@ -78,7 +72,6 @@
$result=mysql_query($SQL,$Conn);
*/
-
$result=mysqli_query($Conn, $SQL);
$_SESSION['LastInsertId'] = mysqli_insert_id($Conn);
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-26 22:11:47 UTC (rev 4518)
@@ -834,5 +834,5 @@
ALTER TABLE locations ADD cashsalebranch varchar(10) DEFAULT '';
ALTER TABLE `locations` CHANGE `cashsalecustomer` `cashsalecustomer` VARCHAR( 10 ) DEFAULT '';
UPDATE config SET confvalue='4.03.3' WHERE confname='VersionNumber';
-INSERT INTO `weberpdemo`.`scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_ChangeSupplierCode.php', '15', 'Script to change a supplier code accross all tables necessary');
-UPDATE config SET confvalue='4.03.4' WHERE confname='VersionNumber';
\ No newline at end of file
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_ChangeSupplierCode.php', '15', 'Script to change a supplier code accross all tables necessary');
+UPDATE config SET confvalue='4.03.5' WHERE confname='VersionNumber';
\ 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-03-26 22:11:54
|
Revision: 4518
http://web-erp.svn.sourceforge.net/web-erp/?rev=4518&view=rev
Author: daintree
Date: 2011-03-26 22:11:47 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
SQL ansi fixes - remove typo resulting in visible <td> in WorkOrderIssue.php
Modified Paths:
--------------
trunk/MRP.php
trunk/WorkOrderIssue.php
trunk/doc/Change.log.html
trunk/doc/README.txt
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/MRP.php 2011-03-26 22:11:47 UTC (rev 4518)
@@ -25,14 +25,14 @@
$result = DB_query('DROP TABLE IF EXISTS levels',$db);
$sql = 'CREATE TEMPORARY TABLE passbom (part char(20),
- sortpart text) DEFAULT CHARSET=utf8';
+ sortpart text) DEFAULT CHARSET=utf8';
$ErrMsg = _('The SQL to to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = 'CREATE TEMPORARY TABLE tempbom (parent char(20),
- component char(20),
- sortpart text,
- level int) DEFAULT CHARSET=utf8';
+ component char(20),
+ sortpart text,
+ level int) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of tempbom failed because'));
// To create levels, first, find parts in bom that are top level assemblies.
// Do this by doing a LEFT JOIN from bom to bom (as bom2), linking
@@ -44,11 +44,11 @@
prnMsg(_('Creating first level'),'info');
flush();
// This finds the top level
- $sql = 'INSERT INTO passbom (part, sortpart)
+ $sql = "INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
- CONCAT(bom.parent,"%",bom.component) AS sortpart
+ CONCAT(bom.parent,'%',bom.component) AS sortpart
FROM bom LEFT JOIN bom as bom2 ON bom.parent = bom2.component
- WHERE bom2.component IS NULL';
+ WHERE bom2.component IS NULL";
$result = DB_query($sql,$db);
$lctr = 2;
@@ -132,32 +132,32 @@
flush();
// Create levels from bomlevels using the highest level number found for a part
- $sql = 'CREATE TABLE levels (
+ $sql = "CREATE TABLE levels (
part char(20),
level int,
- leadtime smallint(6) NOT NULL default "0",
- pansize double NOT NULL default "0",
- shrinkfactor double NOT NULL default "0",
- eoq double NOT NULL default "0") DEFAULT CHARSET=utf8';
+ leadtime smallint(6) NOT NULL default '0',
+ pansize double NOT NULL default '0',
+ shrinkfactor double NOT NULL default '0',
+ eoq double NOT NULL default '0') DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db);
$sql = 'INSERT INTO levels (part,
- level,
- leadtime,
- pansize,
- shrinkfactor,
- eoq)
- SELECT bomlevels.part,
- MAX(bomlevels.level),
- 0,
- pansize,
- shrinkfactor,
- stockmaster.eoq
- FROM bomlevels
- INNER JOIN stockmaster ON bomlevels.part = stockmaster.stockid
- GROUP BY bomlevels.part,
- pansize,
- shrinkfactor,
- stockmaster.eoq';
+ level,
+ leadtime,
+ pansize,
+ shrinkfactor,
+ eoq)
+ SELECT bomlevels.part,
+ MAX(bomlevels.level),
+ 0,
+ pansize,
+ shrinkfactor,
+ stockmaster.eoq
+ FROM bomlevels
+ INNER JOIN stockmaster ON bomlevels.part = stockmaster.stockid
+ GROUP BY bomlevels.part,
+ pansize,
+ shrinkfactor,
+ stockmaster.eoq';
$result = DB_query($sql,$db);
$sql = 'ALTER TABLE levels ADD INDEX part(part)';
$result = DB_query($sql,$db);
@@ -166,26 +166,26 @@
// are not in bom
$sql = 'INSERT INTO levels (part,
- level,
- leadtime,
- pansize,
- shrinkfactor,
- eoq)
- SELECT stockmaster.stockid AS part,
- 0,
- 0,
- stockmaster.pansize,
- stockmaster.shrinkfactor,
- stockmaster.eoq
- FROM stockmaster
- LEFT JOIN levels ON stockmaster.stockid = levels.part
- WHERE levels.part IS NULL';
+ level,
+ leadtime,
+ pansize,
+ shrinkfactor,
+ eoq)
+ SELECT stockmaster.stockid AS part,
+ 0,
+ 0,
+ stockmaster.pansize,
+ stockmaster.shrinkfactor,
+ stockmaster.eoq
+ FROM stockmaster
+ LEFT JOIN levels ON stockmaster.stockid = levels.part
+ WHERE levels.part IS NULL';
$result = DB_query($sql,$db);
// Update leadtime in levels from purchdata. Do it twice so can make sure leadtime from preferred
// vendor is used
$sql = 'UPDATE levels,purchdata
- SET levels.leadtime = purchdata.leadtime
+ SET levels.leadtime = purchdata.leadtime
WHERE levels.part = purchdata.stockid
AND purchdata.leadtime > 0';
$result = DB_query($sql,$db);
@@ -220,99 +220,98 @@
// CreateLowerLevelRequirement() function. Mostly do this so can distinguish the type
// of requirements for the MRPShortageReport so don't show double requirements.
$sql = 'CREATE TABLE mrprequirements ( part char(20),
- daterequired date,
- quantity double,
- mrpdemandtype varchar(6),
- orderno int(11),
- directdemand smallint,
- whererequired char(20)) DEFAULT CHARSET=utf8';
+ daterequired date,
+ quantity double,
+ mrpdemandtype varchar(6),
+ orderno int(11),
+ directdemand smallint,
+ whererequired char(20)) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of mrprequirements failed because'));
prnMsg(_('Loading requirements from sales orders'),'info');
flush();
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stkcode,
- deliverydate,
- (quantity - qtyinvoiced) AS netqty,
- "SO",
- salesorderdetails.orderno,
- "1",
- stkcode
- FROM salesorders, salesorderdetails
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND (quantity - qtyinvoiced) > 0
- AND salesorderdetails.completed = 0
- AND salesorders.quotation = 0';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stkcode,
+ deliverydate,
+ (quantity - qtyinvoiced) AS netqty,
+ 'SO',
+ salesorderdetails.orderno,
+ '1',
+ stkcode
+ FROM salesorders, salesorderdetails
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND (quantity - qtyinvoiced) > 0
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation = 0";
$result = DB_query($sql,$db);
-
prnMsg(_('Loading requirements from work orders'),'info');
flush();
// Definition of demand from SelectProduct.php
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT worequirements.stockid,
- workorders.requiredby,
- qtypu*(woitems.qtyreqd - woitems.qtyrecd) AS netqty,
- "WO",
- woitems.wo,
- "1",
- parentstockid
- FROM woitems INNER JOIN worequirements
- ON woitems.stockid=worequirements.parentstockid
- INNER JOIN workorders
- ON woitems.wo=workorders.wo
- AND woitems.wo=worequirements.wo
- WHERE workorders.closed=0';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT worequirements.stockid,
+ workorders.requiredby,
+ qtypu*(woitems.qtyreqd - woitems.qtyrecd) AS netqty,
+ 'WO',
+ woitems.wo,
+ '1',
+ parentstockid
+ FROM woitems INNER JOIN worequirements
+ ON woitems.stockid=worequirements.parentstockid
+ INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ AND woitems.wo=worequirements.wo
+ WHERE workorders.closed=0";
$result = DB_query($sql,$db);
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stockid,
- duedate,
- quantity,
- mrpdemandtype,
- demandid,
- "1",
- stockid
- FROM mrpdemands';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stockid,
+ duedate,
+ quantity,
+ mrpdemandtype,
+ demandid,
+ '1',
+ stockid
+ FROM mrpdemands";
if ($_POST['usemrpdemands'] == 'y') {
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements based on mrpdemands'),'info');
flush();
}
- $sql = 'INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT stockid,
- NOW(),
- (reorderlevel - quantity) AS reordqty,
- "REORD",
- "1",
- "1",
- stockid
- FROM locstock
- WHERE reorderlevel > quantity';
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT stockid,
+ NOW(),
+ (reorderlevel - quantity) AS reordqty,
+ 'REORD',
+ '1',
+ '1',
+ stockid
+ FROM locstock
+ WHERE reorderlevel > quantity";
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements based on reorder level'),'info');
flush();
@@ -327,40 +326,40 @@
// updateflag is set to 1 in UpdateSupplies if change date when matching requirements to
// supplies. Actually only change update flag in the array created from mrpsupplies
$sql = 'CREATE TABLE mrpsupplies ( id int(11) NOT NULL auto_increment,
- part char(20),
- duedate date,
- supplyquantity double,
- ordertype varchar(6),
- orderno int(11),
- mrpdate date,
- updateflag smallint(6),
- PRIMARY KEY (id)) DEFAULT CHARSET=utf8';
+ part char(20),
+ duedate date,
+ supplyquantity double,
+ ordertype varchar(6),
+ orderno int(11),
+ mrpdate date,
+ updateflag smallint(6),
+ PRIMARY KEY (id)) DEFAULT CHARSET=utf8';
$result = DB_query($sql,$db,_('Create of mrpsupplies failed because'));
prnMsg(_('Loading supplies from purchase orders'),'info');
flush();
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- purchorderdetails.itemcode,
- purchorderdetails.deliverydate,
- (quantityord - quantityrecd) AS netqty,
- "PO",
- purchorderdetails.orderno,
- purchorderdetails.deliverydate,
- 0
- FROM purchorderdetails,
- purchorders
- WHERE purchorderdetails.orderno = purchorders.orderno
- AND purchorders.status != "Cancelled"
- AND purchorders.status != "Rejected"
- AND(quantityord - quantityrecd) > 0';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ purchorderdetails.itemcode,
+ purchorderdetails.deliverydate,
+ (quantityord - quantityrecd) AS netqty,
+ 'PO',
+ purchorderdetails.orderno,
+ purchorderdetails.deliverydate,
+ 0
+ FROM purchorderdetails,
+ purchorders
+ WHERE purchorderdetails.orderno = purchorders.orderno
+ AND purchorders.status != 'Cancelled'
+ AND purchorders.status != 'Rejected'
+ AND(quantityord - quantityrecd) > 0";
$result = DB_query($sql,$db);
prnMsg(_('Loading supplies from inventory on hand'),'info');
@@ -382,49 +381,49 @@
} // End of foreach
$WhereLocation .= ')';
}
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- stockid,
- "0000-00-00",
- SUM(quantity),
- "QOH",
- 1,
- "0000-00-00",
- 0
- FROM locstock
- WHERE quantity > 0 ' .
- $WhereLocation .
- 'GROUP BY stockid';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ stockid,
+ '0000-00-00',
+ SUM(quantity),
+ 'QOH',
+ 1,
+ '0000-00-00',
+ 0
+ FROM locstock
+ WHERE quantity > 0 " .
+ $WhereLocation .
+ 'GROUP BY stockid';
$result = DB_query($sql,$db);
prnMsg(_('Loading supplies from work orders'),'info');
flush();
- $sql = 'INSERT INTO mrpsupplies (id,
- part,
- duedate,
- supplyquantity,
- ordertype,
- orderno,
- mrpdate,
- updateflag)
- SELECT Null,
- stockid,
- workorders.requiredby,
- (woitems.qtyreqd-woitems.qtyrecd) AS netqty,
- "WO",
- woitems.wo,
- workorders.requiredby,
- 0
- FROM woitems INNER JOIN workorders
- ON woitems.wo=workorders.wo
- WHERE workorders.closed=0';
+ $sql = "INSERT INTO mrpsupplies (id,
+ part,
+ duedate,
+ supplyquantity,
+ ordertype,
+ orderno,
+ mrpdate,
+ updateflag)
+ SELECT Null,
+ stockid,
+ workorders.requiredby,
+ (woitems.qtyreqd-woitems.qtyrecd) AS netqty,
+ 'WO',
+ woitems.wo,
+ workorders.requiredby,
+ 0
+ FROM woitems INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ WHERE workorders.closed=0";
$result = DB_query($sql,$db);
$sql = 'ALTER TABLE mrpsupplies ADD INDEX part(part)';
@@ -462,7 +461,7 @@
// part, that serves as a gross requirement for a lower level part, so will read down through
// the Bill of Materials to generate those requirements in function LevelNetting().
for ($level = $maxlevel; $level >= $minlevel; $level--) {
- $sql = 'SELECT * FROM levels WHERE level = "' . $level .'" LIMIT 50000'; //should cover most eventualities!! ... yes indeed :-)
+ $sql = "SELECT * FROM levels WHERE level = '" . $level ."' LIMIT 50000"; //should cover most eventualities!! ... yes indeed :-)
prnMsg('</br>------ ' . _('Processing level') .' ' . $level . ' ------','info');
flush();
@@ -497,19 +496,19 @@
} // End of if
} // End of foreach
$sql = "INSERT INTO mrpparameters (runtime,
- location,
- pansizeflag,
- shrinkageflag,
- eoqflag,
- usemrpdemands,
- leeway)
- VALUES (NOW(),
- '" . $locparm . "',
- '" . $_POST['pansizeflag'] . "',
- '" . $_POST['shrinkageflag'] . "',
- '" . $_POST['eoqflag'] . "',
- '" . $_POST['usemrpdemands'] . "',
- '" . $_POST['Leeway'] . "')";
+ location,
+ pansizeflag,
+ shrinkageflag,
+ eoqflag,
+ usemrpdemands,
+ leeway)
+ VALUES (NOW(),
+ '" . $locparm . "',
+ '" . $_POST['pansizeflag'] . "',
+ '" . $_POST['shrinkageflag'] . "',
+ '" . $_POST['eoqflag'] . "',
+ '" . $_POST['usemrpdemands'] . "',
+ '" . $_POST['Leeway'] . "')";
$result = DB_query($sql,$db);
} else { // End of if submit isset
@@ -556,7 +555,7 @@
}
echo "<p><form method='post' action='" . $_SERVER['PHP_SELF'] . '?' . SID . "'>";
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<td><table class=selection>';
+ echo '<table class=selection>';
// Generate selections for Location
echo '<tr><th colspan=3><font color=blue size=3>'._('This Run Details').'</font></th></tr>';
echo '<tr>
@@ -804,7 +803,7 @@
$newdate = FormatDateForSQL($dateadd);
}
- $component = $myrow['component'];
+ $component = $myrow['component'];
$extendedquantity = $myrow['quantity'] * $topquantity;
// Commented out the following lines 8/15/09 because the eoq should be considered in the
// LevelNetting() function where $excessqty is calculated
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/WorkOrderIssue.php 2011-03-26 22:11:47 UTC (rev 4518)
@@ -556,8 +556,8 @@
echo '</select>';
} else {
$LocResult = DB_query("SELECT loccode, locationname
- FROM locations
- WHERE loccode='" . $_POST['FromLocation'] . "'",
+ FROM locations
+ WHERE loccode='" . $_POST['FromLocation'] . "'",
$db);
$LocRow = DB_fetch_array($LocResult);
echo '<input type="hidden" name="FromLocation" value="' . $_POST['FromLocation'] . '">';
@@ -615,10 +615,10 @@
echo '<table class=selection><tr><td>' . _('Select a stock category') . ':<select name="StockCat">';
if (!isset($_POST['StockCat'])){
- echo "<option selected VALUE='All'>" . _('All');
+ echo "<option selected VALUE='All'>" . _('All') . '</option>';
$_POST['StockCat'] ='All';
} else {
- echo "<option VALUE='All'>" . _('All');
+ echo "<option VALUE='All'>" . _('All') . '</option>';
}
while ($myrow1 = DB_fetch_array($result1)) {
@@ -636,7 +636,7 @@
<td><input type="Text" name="Keywords" size=20 maxlength=25 VALUE="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td></tr>
<tr><td></td>
<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="Text" name="StockCode" size=15 maxlength=18 VALUE="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><input type="Text" name="StockCode" size="15" maxlength="18" VALUE="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
</tr>
</table>
<br /><div class="centre"><input type=submit name="Search" VALUE="<?php echo _('Search Now'); ?>">
@@ -767,13 +767,13 @@
<td><input type="textbox" name="Qty' . $i .'"></td></tr>';
}
echo '<input type="hidden" name="IssueItem" value="' . $_POST['IssueItem'] . '">';
- echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"><</div>/td></tr>';
+ echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
} //end of lot/batch control
} else { //not controlled - an easy one!
echo '<input type="hidden" name="IssueItem" value="' . $_POST['IssueItem'] . '">';
echo '<tr><td>' . _('Quantity Issued') . ':</td>
<td><input class=number type="textbox" name="Qty"></tr>';
- echo '<tr><td colspan=2><div class=centre><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
+ echo '<tr><td colspan=2><input type=submit name="Process" value="' . _('Process Items Issued') . '"></div></td></tr>';
}
} //end if selecting new item to issue or entering the issued item quantities
echo '</table>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/doc/Change.log.html 2011-03-26 22:11:47 UTC (rev 4518)
@@ -20,7 +20,7 @@
<p>10/3/11: Phil fix pagination of PrintCustOrder_generic.php - second copy was not restarting page numbers</p>
<p>10/3/11: Tims launchpad fixes brought in MRP.php fix for table charset utf8 so joins work correctly; typeo in PO_Header preventing purchasing data being retrieved ($result not $Result); correct sql on searching for customer in SelectCreditItems.php; StockStatus.php pricing history bug resolved (4450); StockQuantityByDate.php now allowed to show for all categories - enclosed 'All' in gettext</p>
<p>8/3/11: Tim/Phil PO_Items.php in committing an order detail the assetid of 'Not an Asset' was being inserted to an integer field. Modified $_POST['AssetID'] to = 0 if it was 'Not an Asset' as advised by Tim</p>
-<p>8/3/11:Phil fix SalesAnalysis reports for TCPDF as reported by Joe Zhou</p>
+<p>8/3/11: Phil fix SalesAnalysis reports for TCPDF as reported by Joe Zhou</p>
<p>5/3/11: Kovács Attila fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL</p>
<p>5/3/11: Kovács Attila fix to LanguageSetup.php to use utf-8 not ISO-8859-1. Phil hardcoded UTF-8 now as no dynamic changing of character set required all translations are utf-8</p>
<p>3/3/11: Exson/Baran/Phil fix to customer login to ensure that other customers orders are not displayed when searching by customer ref or order no</p>
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/doc/README.txt 2011-03-26 22:11:47 UTC (rev 4518)
@@ -2,8 +2,28 @@
/* $Id$*/
-Thankyou for using webERP.
+Version 4.03 of webERP
+Now fully utf-8 compatible. Now reports can be created in any language using the utf-8 character set, the resultant pdf reports use Adobe CID fonts and the fonts that come with the Adobe Acrobat reader on client computers. This avoids the problem of large pdf downloads on the creation of reports as the alternative is to bundle the enormous utf-8 fonts with the reports.
+
+Also, this release comes with an automated database upgrade system, so that database changes in later versions will be applied automatically on upgrade of the scripts.
+
+Other than the re-engineering of pdf reporting using the TCPDF pdf report creation class, that has enabled the utf-8 pdf reporting, the other new areas of functionality since the 3 series include:
+
+1. Fixed assets module, this allows the recording of fixed asset additions, depreciation calculations on a monthly basis and disposals all integrated with the sale/debtors system with appropriate general ledger journals also created.
+
+2. Contract Costing functionality that allows contracts to be defined and the costs recorded against the contract. Contracts can be created using items from stock and also other items that might be required to be purchased that are not currently stock items. Contracts can be converted to quotations and from a quotation to a sales order/sale. The final variances on contracts are recorded and a final costing comparison report available.
+
+3. Significant work has also been done in conjunction with Secunia, the software security testing people, who have scruitinised webERP for security vulnerabilities. Their findings were useful in identifying scripts that needed to be changed. All identified weaknesses have now been removed.
+
+4. Prices can now be set for a period - with start and end date, to allow for promotional periods where the price should revert back and can be set ahead of time.
+
+5. Counter Sales functionality to allow sales to be processed to a default cash sales account and receipt of cash processed at the same time. This avoids having to enter a sales order, confirm the dispatch to invoice, the also entering the receipt as separate process and effectively enables a kind of point of sale system for each inventory location.
+
+6. A significant push has been made to try to reduce the number of bugs, with a great deal of testing from all quarters.
+
+The change log shows descriptions and dates of all changes made.
+
Installation instructions are in the file INSTALL.txt in the doc directory. It is important to read the INSTALL.txt file in its entirety before proceeding. A printout is recommended.
The user documentation contains a wealth of information and is installed under the doc/Manual directory in html format. Links to it are available from the application itself.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/includes/ConnectDB.inc 2011-03-26 22:11:47 UTC (rev 4518)
@@ -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.03.4'; //must update manually every time there is a DB change
+$Version='4.03.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/includes/ConnectDB_mysqli.inc 2011-03-26 22:11:47 UTC (rev 4518)
@@ -14,19 +14,13 @@
}
global $db; // Make sure it IS global, regardless of our context
$db = mysqli_connect($host , $dbuser, $dbpassword,$_SESSION['DatabaseName'], $mysqlport);
+$result=DB_query('SET sql_mode = ANSI', $db);
-//printf("tried making mysql-i Connection.\n");
-//$varabc = mysqli_client_encoding($db);
-//printf("client encoding is %s\n", $varabc);
//this statement sets the charset to be used for sending data to and from the db server
//if not set, both mysqli server and mysqli client/library may assume otherwise
mysqli_set_charset($db, "utf8");
-//$varabc = mysqli_client_encoding($db);
-//printf("client encoding is %s\n", $varabc);
-
-
/* check connection */
if (mysqli_connect_errno()) {
printf("Connect failed: %s\n", mysqli_connect_error());
@@ -78,7 +72,6 @@
$result=mysql_query($SQL,$Conn);
*/
-
$result=mysqli_query($Conn, $SQL);
$_SESSION['LastInsertId'] = mysqli_insert_id($Conn);
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-26 03:33:53 UTC (rev 4517)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-26 22:11:47 UTC (rev 4518)
@@ -834,5 +834,5 @@
ALTER TABLE locations ADD cashsalebranch varchar(10) DEFAULT '';
ALTER TABLE `locations` CHANGE `cashsalecustomer` `cashsalecustomer` VARCHAR( 10 ) DEFAULT '';
UPDATE config SET confvalue='4.03.3' WHERE confname='VersionNumber';
-INSERT INTO `weberpdemo`.`scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_ChangeSupplierCode.php', '15', 'Script to change a supplier code accross all tables necessary');
-UPDATE config SET confvalue='4.03.4' WHERE confname='VersionNumber';
\ No newline at end of file
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_ChangeSupplierCode.php', '15', 'Script to change a supplier code accross all tables necessary');
+UPDATE config SET confvalue='4.03.5' WHERE confname='VersionNumber';
\ 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-03-26 03:34:04
|
Revision: 4517
http://web-erp.svn.sourceforge.net/web-erp/?rev=4517&view=rev
Author: daintree
Date: 2011-03-26 03:33:53 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
pre 4.03 release
Modified Paths:
--------------
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcTypeTabs.php
trunk/doc/Change.log.html
trunk/doc/Manual/ManualContents.php
trunk/includes/session.inc
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/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/upgrade3.11.1-4.00.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/companies/weberpdemo/logo.jpg
Removed Paths:
-------------
trunk/companies/weberpdemo/logo.jpg
trunk/companies/weberpdemo/logo.png
trunk/companies/weberpdemo/logo1.jpg
trunk/companies/weberpdemo/logo2.jpg
trunk/companies/weberpdemo/logo4.jpg
trunk/companies/weberpdemo/logo5.jpg
trunk/companies/weberpdemo/logo6.jpg
trunk/companies/weberpdemo/logo7.jpg
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcExpenses.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -35,19 +35,29 @@
if ($_POST['codeexpense']=='' OR $_POST['codeexpense']==' ' OR $_POST['codeexpense']==' ') {
$InputError = 1;
- prnMsg('<br>' . _('The Expense type code cannot be an empty string or spaces'),'error');
+ prnMsg(_('The Expense type code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'PcExpenses';
$i++;
} elseif (strlen($_POST['codeexpense']) >20) {
$InputError = 1;
- echo prnMsg(_('The Expense code must be twenty characters or less long'),'error');
+ prnMsg(_('The Expense code must be twenty characters or less long'),'error');
$Errors[$i] = 'PcExpenses';
$i++;
- }elseif (strlen($_POST['description']) >50) {
+ }elseif (ContainsIllegalCharacters($_POST['codeexpense'])){
$InputError = 1;
- echo prnMsg(_('The tab code must be Fifty characters or less long'),'error');
+ prnMsg(_('The Expense code cannot contain any of the following characters " \' - &'),'error');
+ $Errors[$i] = 'PcExpenses';
+ $i++;
+ } elseif (ContainsIllegalCharacters($_POST['description'])){
+ $InputError = 1;
+ prnMsg(_('The Expense description cannot contain any of the following characters " \' - &'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
+ } elseif (strlen($_POST['description']) >50) {
+ $InputError = 1;
+ prnMsg(_('The tab code must be Fifty characters or less long'),'error');
+ $Errors[$i] = 'TypeTabCode';
+ $i++;
}
if (isset($SelectedExpense) AND $InputError !=1) {
@@ -71,7 +81,7 @@
if ( $checkrow[0] > 0 ) {
$InputError = 1;
- prnMsg( _('The Expense type ') . $_POST['codeexpense'] . _(' already exist.'),'error');
+ prnMsg( _('The Expense type ') . $_POST['codeexpense'] . _(' already exists.'),'error');
} else {
// Add new record on submit
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcExpensesTypeTab.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -15,7 +15,10 @@
} elseif (isset($_GET['SelectedType'])){
$SelectedType = strtoupper($_GET['SelectedType']);
}
-
+if (ContainsIllegalCharacters($SelectedType) OR strpos($SelectedType,' ')>0){
+ $InputError = 1;
+ prnMsg(_('The petty cash tab type contain any of the following characters " \' - & or a space'),'error');
+}
if (isset($_POST['SelectedTabs'])){
$SelectedTabs = strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
@@ -162,8 +165,8 @@
</tr>",
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow[0],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow[0]);
+ $_SERVER['PHP_SELF'], $myrow[0],
+ $_SERVER['PHP_SELF'], $myrow[0]);
}
//END WHILE LIST LOOP
echo '</table>';
@@ -173,7 +176,7 @@
if (! isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class=selection>'; //Main table
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcTypeTabs.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -33,18 +33,21 @@
//first off validate inputs sensible
$i=1;
- if ($_POST['typetabcode']=='' OR $_POST['typetabcode']==' ' OR $_POST['typetabcode']==' ') {
+ if ($_POST['TypeTabCode']=='' OR $_POST['TypeTabCode']==' ' OR $_POST['TypeTabCode']==' ') {
$InputError = 1;
prnMsg('<br>' . _('The Tabs type code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
- } elseif (strlen($_POST['typetabcode']) >20) {
+ } elseif (strlen($_POST['TypeTabCode']) >20) {
$InputError = 1;
echo prnMsg(_('The tab code must be twenty characters or less long'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
- }elseif (strlen($_POST['typetabdescription']) >50) {
+ }elseif (ContainsIllegalCharacters($_POST['TypeTabCode']) OR strpos($_POST['TypeTabCode'],' ')>0){
$InputError = 1;
+ prnMsg(_('The petty cash tab type code cannot contain any of the following characters " \' - & or a space'),'error');
+ } elseif (strlen($_POST['TypeTabDescription']) >50) {
+ $InputError = 1;
echo prnMsg(_('The tab code must be Fifty characters or less long'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
@@ -53,7 +56,7 @@
if (isset($SelectedTab) AND $InputError !=1) {
$sql = "UPDATE pctypetabs
- SET typetabdescription = '" . $_POST['typetabdescription'] . "'
+ SET typetabdescription = '" . $_POST['TypeTabDescription'] . "'
WHERE typetabcode = '".$SelectedTab."'";
$msg = _('The Tabs type') . ' ' . $SelectedTab . ' ' . _('has been updated');
@@ -63,7 +66,7 @@
$checkSql = "SELECT count(*)
FROM pctypetabs
- WHERE typetabcode = '" . $_POST['typetabcode'] . "'";
+ WHERE typetabcode = '" . $_POST['TypeTabCode'] . "'";
$checkresult = DB_query($checkSql,$db);
$checkrow = DB_fetch_row($checkresult);
@@ -78,10 +81,10 @@
$sql = "INSERT INTO pctypetabs
(typetabcode,
typetabdescription)
- VALUES ('" . $_POST['typetabcode'] . "',
- '" . $_POST['typetabdescription'] . "')";
+ VALUES ('" . $_POST['TypeTabCode'] . "',
+ '" . $_POST['TypeTabDescription'] . "')";
- $msg = _('Tabs type') . ' ' . $_POST["typetabcode"] . ' ' . _('has been created');
+ $msg = _('Tabs type') . ' ' . $_POST['TypeTabCode'] . ' ' . _('has been created');
}
}
@@ -92,35 +95,35 @@
prnMsg($msg,'success');
unset($SelectedTab);
- unset($_POST['typetabcode']);
- unset($_POST['typetabdescription']);
+ unset($_POST['TypeTabCode']);
+ unset($_POST['TypeTabDescription']);
}
} elseif ( isset($_GET['delete']) ) {
// PREVENT DELETES IF DEPENDENT RECORDS IN 'PcTabExpenses'
- $sqlpctabexpenses= "SELECT COUNT(*)
+ $SQLPcTabExpenses= "SELECT COUNT(*)
FROM pctabexpenses
WHERE typetabcode='".$SelectedTab."'";
$ErrMsg = _('The number of tabs using this Tab type could not be retrieved');
- $resultpctabexpenses = DB_query($sqlpctabexpenses,$db,$ErrMsg);
+ $ResultPcTabExpenses = DB_query($SQLPcTabExpenses,$db,$ErrMsg);
- $myrowpctabexpenses = DB_fetch_row($resultpctabexpenses);
+ $myrowPcTabExpenses = DB_fetch_row($ResultPcTabExpenses);
- $sqlpctabs= "SELECT COUNT(*)
+ $SqlPcTabs= "SELECT COUNT(*)
FROM pctabs
WHERE typetabcode='".$SelectedTab."'";
$ErrMsg = _('The number of tabs using this Tab type could not be retrieved');
- $resultpctabs = DB_query($sqlpctabs,$db,$ErrMsg);
+ $ResultPcTabs = DB_query($SqlPcTabs,$db,$ErrMsg);
- $myrowpctabs = DB_fetch_row($resultpctabs);
- if ($myrowpctabexpenses[0]>0 or $myrowpctabs[0]>0) {
+ $myrowPcTabs = DB_fetch_row($ResultPcTabs);
+ if ($myrowPcTabExpenses[0]>0 or $myrowPcTabs[0]>0) {
prnMsg(_('Cannot delete this tab type because tabs have been created using this tab type'),'error');
echo '<br>';
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p><div class="centre"><input type=submit name=return VALUE="' . _('Return to list of tab types') . '"></div>';
echo '</form>';
@@ -150,10 +153,10 @@
$result = DB_query($sql,$db);
echo '<table class=selection>';
- echo "<tr>
- <th>" . _('Type Of Tab') . "</th>
- <th>" . _('Description') . "</th>
- </tr>";
+ echo '<tr>
+ <th>' . _('Type Of Tab') . '</th>
+ <th>' . _('Description') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -173,8 +176,8 @@
</tr>",
$myrow['0'],
$myrow['1'],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow['0'],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow['0']);
+ $_SERVER['PHP_SELF']. '?', $myrow['0'],
+ $_SERVER['PHP_SELF']. '?', $myrow['0']);
}
//END WHILE LIST LOOP
echo '</table>';
@@ -183,11 +186,11 @@
//end of ifs and buts!
if (isset($SelectedTab)) {
- echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Types Tabs Defined') . '</a></div><p>';
+ echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show All Types Tabs Defined') . '</a></div><p>';
}
if (! isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p><table class=selection>'; //Main table
@@ -202,30 +205,30 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
- $_POST['typetabcode'] = $myrow['typetabcode'];
- $_POST['typetabdescription'] = $myrow['typetabdescription'];
+ $_POST['TypeTabCode'] = $myrow['typetabcode'];
+ $_POST['TypeTabDescription'] = $myrow['typetabdescription'];
echo "<input type=hidden name='SelectedTab' VALUE=" . $SelectedTab . ">";
- echo "<input type=hidden name='typetabcode' VALUE=" . $_POST['typetabcode']. ">";
+ echo "<input type=hidden name='TypeTabCode' VALUE=" . $_POST['TypeTabCode']. ">";
echo "<table> <tr><td>" . _('Code Of Type Of Tab') . ":</td><td>";
// We dont allow the user to change an existing type code
- echo $_POST['typetabcode'] . '</td></tr>';
+ echo $_POST['TypeTabCode'] . '</td></tr>';
} else {
// This is a new type so the user may volunteer a type code
echo "<table class=selection><tr><td>" . _('Code Of Type Of Tab') . ":</td><td><input type='Text'
- " . (in_array('TypeTabCode',$Errors) ? 'class="inputerror"' : '' ) ." name='typetabcode'></td></tr>";
+ " . (in_array('TypeTabCode',$Errors) ? 'class="inputerror"' : '' ) ." name='TypeTabCode'></td></tr>";
}
- if (!isset($_POST['typetabdescription'])) {
- $_POST['typetabdescription']='';
+ if (!isset($_POST['TypeTabDescription'])) {
+ $_POST['TypeTabDescription']='';
}
- echo "<tr><td>" . _('Description Of Type of Tab') . ":</td><td><input type='Text' name='typetabdescription' size=50 maxlength=49 value='" . $_POST['typetabdescription'] . "'></td></tr>";
+ echo "<tr><td>" . _('Description Of Type of Tab') . ":</td><td><input type='Text' name='TypeTabDescription' size=50 maxlength=49 value='" . $_POST['TypeTabDescription'] . "'></td></tr>";
echo '</td></tr></table>'; // close main table
Deleted: trunk/companies/weberpdemo/logo.jpg
===================================================================
(Binary files differ)
Copied: trunk/companies/weberpdemo/logo.jpg (from rev 4516, trunk/companies/weberpdemo/logo2.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/logo.png
===================================================================
--- trunk/companies/weberpdemo/logo.png 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/companies/weberpdemo/logo.png 2011-03-26 03:33:53 UTC (rev 4517)
@@ -1,678 +0,0 @@
-\x89PNG
-
- |
|
From: <dai...@us...> - 2011-03-26 03:34:03
|
Revision: 4517
http://web-erp.svn.sourceforge.net/web-erp/?rev=4517&view=rev
Author: daintree
Date: 2011-03-26 03:33:53 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
pre 4.03 release
Modified Paths:
--------------
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcTypeTabs.php
trunk/doc/Change.log.html
trunk/doc/Manual/ManualContents.php
trunk/includes/session.inc
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/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/upgrade3.11.1-4.00.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/companies/weberpdemo/logo.jpg
Removed Paths:
-------------
trunk/companies/weberpdemo/logo.jpg
trunk/companies/weberpdemo/logo.png
trunk/companies/weberpdemo/logo1.jpg
trunk/companies/weberpdemo/logo2.jpg
trunk/companies/weberpdemo/logo4.jpg
trunk/companies/weberpdemo/logo5.jpg
trunk/companies/weberpdemo/logo6.jpg
trunk/companies/weberpdemo/logo7.jpg
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcExpenses.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -35,19 +35,29 @@
if ($_POST['codeexpense']=='' OR $_POST['codeexpense']==' ' OR $_POST['codeexpense']==' ') {
$InputError = 1;
- prnMsg('<br>' . _('The Expense type code cannot be an empty string or spaces'),'error');
+ prnMsg(_('The Expense type code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'PcExpenses';
$i++;
} elseif (strlen($_POST['codeexpense']) >20) {
$InputError = 1;
- echo prnMsg(_('The Expense code must be twenty characters or less long'),'error');
+ prnMsg(_('The Expense code must be twenty characters or less long'),'error');
$Errors[$i] = 'PcExpenses';
$i++;
- }elseif (strlen($_POST['description']) >50) {
+ }elseif (ContainsIllegalCharacters($_POST['codeexpense'])){
$InputError = 1;
- echo prnMsg(_('The tab code must be Fifty characters or less long'),'error');
+ prnMsg(_('The Expense code cannot contain any of the following characters " \' - &'),'error');
+ $Errors[$i] = 'PcExpenses';
+ $i++;
+ } elseif (ContainsIllegalCharacters($_POST['description'])){
+ $InputError = 1;
+ prnMsg(_('The Expense description cannot contain any of the following characters " \' - &'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
+ } elseif (strlen($_POST['description']) >50) {
+ $InputError = 1;
+ prnMsg(_('The tab code must be Fifty characters or less long'),'error');
+ $Errors[$i] = 'TypeTabCode';
+ $i++;
}
if (isset($SelectedExpense) AND $InputError !=1) {
@@ -71,7 +81,7 @@
if ( $checkrow[0] > 0 ) {
$InputError = 1;
- prnMsg( _('The Expense type ') . $_POST['codeexpense'] . _(' already exist.'),'error');
+ prnMsg( _('The Expense type ') . $_POST['codeexpense'] . _(' already exists.'),'error');
} else {
// Add new record on submit
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcExpensesTypeTab.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -15,7 +15,10 @@
} elseif (isset($_GET['SelectedType'])){
$SelectedType = strtoupper($_GET['SelectedType']);
}
-
+if (ContainsIllegalCharacters($SelectedType) OR strpos($SelectedType,' ')>0){
+ $InputError = 1;
+ prnMsg(_('The petty cash tab type contain any of the following characters " \' - & or a space'),'error');
+}
if (isset($_POST['SelectedTabs'])){
$SelectedTabs = strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
@@ -162,8 +165,8 @@
</tr>",
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow[0],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow[0]);
+ $_SERVER['PHP_SELF'], $myrow[0],
+ $_SERVER['PHP_SELF'], $myrow[0]);
}
//END WHILE LIST LOOP
echo '</table>';
@@ -173,7 +176,7 @@
if (! isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class=selection>'; //Main table
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/PcTypeTabs.php 2011-03-26 03:33:53 UTC (rev 4517)
@@ -33,18 +33,21 @@
//first off validate inputs sensible
$i=1;
- if ($_POST['typetabcode']=='' OR $_POST['typetabcode']==' ' OR $_POST['typetabcode']==' ') {
+ if ($_POST['TypeTabCode']=='' OR $_POST['TypeTabCode']==' ' OR $_POST['TypeTabCode']==' ') {
$InputError = 1;
prnMsg('<br>' . _('The Tabs type code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
- } elseif (strlen($_POST['typetabcode']) >20) {
+ } elseif (strlen($_POST['TypeTabCode']) >20) {
$InputError = 1;
echo prnMsg(_('The tab code must be twenty characters or less long'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
- }elseif (strlen($_POST['typetabdescription']) >50) {
+ }elseif (ContainsIllegalCharacters($_POST['TypeTabCode']) OR strpos($_POST['TypeTabCode'],' ')>0){
$InputError = 1;
+ prnMsg(_('The petty cash tab type code cannot contain any of the following characters " \' - & or a space'),'error');
+ } elseif (strlen($_POST['TypeTabDescription']) >50) {
+ $InputError = 1;
echo prnMsg(_('The tab code must be Fifty characters or less long'),'error');
$Errors[$i] = 'TypeTabCode';
$i++;
@@ -53,7 +56,7 @@
if (isset($SelectedTab) AND $InputError !=1) {
$sql = "UPDATE pctypetabs
- SET typetabdescription = '" . $_POST['typetabdescription'] . "'
+ SET typetabdescription = '" . $_POST['TypeTabDescription'] . "'
WHERE typetabcode = '".$SelectedTab."'";
$msg = _('The Tabs type') . ' ' . $SelectedTab . ' ' . _('has been updated');
@@ -63,7 +66,7 @@
$checkSql = "SELECT count(*)
FROM pctypetabs
- WHERE typetabcode = '" . $_POST['typetabcode'] . "'";
+ WHERE typetabcode = '" . $_POST['TypeTabCode'] . "'";
$checkresult = DB_query($checkSql,$db);
$checkrow = DB_fetch_row($checkresult);
@@ -78,10 +81,10 @@
$sql = "INSERT INTO pctypetabs
(typetabcode,
typetabdescription)
- VALUES ('" . $_POST['typetabcode'] . "',
- '" . $_POST['typetabdescription'] . "')";
+ VALUES ('" . $_POST['TypeTabCode'] . "',
+ '" . $_POST['TypeTabDescription'] . "')";
- $msg = _('Tabs type') . ' ' . $_POST["typetabcode"] . ' ' . _('has been created');
+ $msg = _('Tabs type') . ' ' . $_POST['TypeTabCode'] . ' ' . _('has been created');
}
}
@@ -92,35 +95,35 @@
prnMsg($msg,'success');
unset($SelectedTab);
- unset($_POST['typetabcode']);
- unset($_POST['typetabdescription']);
+ unset($_POST['TypeTabCode']);
+ unset($_POST['TypeTabDescription']);
}
} elseif ( isset($_GET['delete']) ) {
// PREVENT DELETES IF DEPENDENT RECORDS IN 'PcTabExpenses'
- $sqlpctabexpenses= "SELECT COUNT(*)
+ $SQLPcTabExpenses= "SELECT COUNT(*)
FROM pctabexpenses
WHERE typetabcode='".$SelectedTab."'";
$ErrMsg = _('The number of tabs using this Tab type could not be retrieved');
- $resultpctabexpenses = DB_query($sqlpctabexpenses,$db,$ErrMsg);
+ $ResultPcTabExpenses = DB_query($SQLPcTabExpenses,$db,$ErrMsg);
- $myrowpctabexpenses = DB_fetch_row($resultpctabexpenses);
+ $myrowPcTabExpenses = DB_fetch_row($ResultPcTabExpenses);
- $sqlpctabs= "SELECT COUNT(*)
+ $SqlPcTabs= "SELECT COUNT(*)
FROM pctabs
WHERE typetabcode='".$SelectedTab."'";
$ErrMsg = _('The number of tabs using this Tab type could not be retrieved');
- $resultpctabs = DB_query($sqlpctabs,$db,$ErrMsg);
+ $ResultPcTabs = DB_query($SqlPcTabs,$db,$ErrMsg);
- $myrowpctabs = DB_fetch_row($resultpctabs);
- if ($myrowpctabexpenses[0]>0 or $myrowpctabs[0]>0) {
+ $myrowPcTabs = DB_fetch_row($ResultPcTabs);
+ if ($myrowPcTabExpenses[0]>0 or $myrowPcTabs[0]>0) {
prnMsg(_('Cannot delete this tab type because tabs have been created using this tab type'),'error');
echo '<br>';
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p><div class="centre"><input type=submit name=return VALUE="' . _('Return to list of tab types') . '"></div>';
echo '</form>';
@@ -150,10 +153,10 @@
$result = DB_query($sql,$db);
echo '<table class=selection>';
- echo "<tr>
- <th>" . _('Type Of Tab') . "</th>
- <th>" . _('Description') . "</th>
- </tr>";
+ echo '<tr>
+ <th>' . _('Type Of Tab') . '</th>
+ <th>' . _('Description') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -173,8 +176,8 @@
</tr>",
$myrow['0'],
$myrow['1'],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow['0'],
- $_SERVER['PHP_SELF'] . '?' . SID, $myrow['0']);
+ $_SERVER['PHP_SELF']. '?', $myrow['0'],
+ $_SERVER['PHP_SELF']. '?', $myrow['0']);
}
//END WHILE LIST LOOP
echo '</table>';
@@ -183,11 +186,11 @@
//end of ifs and buts!
if (isset($SelectedTab)) {
- echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Types Tabs Defined') . '</a></div><p>';
+ echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show All Types Tabs Defined') . '</a></div><p>';
}
if (! isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p><table class=selection>'; //Main table
@@ -202,30 +205,30 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
- $_POST['typetabcode'] = $myrow['typetabcode'];
- $_POST['typetabdescription'] = $myrow['typetabdescription'];
+ $_POST['TypeTabCode'] = $myrow['typetabcode'];
+ $_POST['TypeTabDescription'] = $myrow['typetabdescription'];
echo "<input type=hidden name='SelectedTab' VALUE=" . $SelectedTab . ">";
- echo "<input type=hidden name='typetabcode' VALUE=" . $_POST['typetabcode']. ">";
+ echo "<input type=hidden name='TypeTabCode' VALUE=" . $_POST['TypeTabCode']. ">";
echo "<table> <tr><td>" . _('Code Of Type Of Tab') . ":</td><td>";
// We dont allow the user to change an existing type code
- echo $_POST['typetabcode'] . '</td></tr>';
+ echo $_POST['TypeTabCode'] . '</td></tr>';
} else {
// This is a new type so the user may volunteer a type code
echo "<table class=selection><tr><td>" . _('Code Of Type Of Tab') . ":</td><td><input type='Text'
- " . (in_array('TypeTabCode',$Errors) ? 'class="inputerror"' : '' ) ." name='typetabcode'></td></tr>";
+ " . (in_array('TypeTabCode',$Errors) ? 'class="inputerror"' : '' ) ." name='TypeTabCode'></td></tr>";
}
- if (!isset($_POST['typetabdescription'])) {
- $_POST['typetabdescription']='';
+ if (!isset($_POST['TypeTabDescription'])) {
+ $_POST['TypeTabDescription']='';
}
- echo "<tr><td>" . _('Description Of Type of Tab') . ":</td><td><input type='Text' name='typetabdescription' size=50 maxlength=49 value='" . $_POST['typetabdescription'] . "'></td></tr>";
+ echo "<tr><td>" . _('Description Of Type of Tab') . ":</td><td><input type='Text' name='TypeTabDescription' size=50 maxlength=49 value='" . $_POST['TypeTabDescription'] . "'></td></tr>";
echo '</td></tr></table>'; // close main table
Deleted: trunk/companies/weberpdemo/logo.jpg
===================================================================
(Binary files differ)
Copied: trunk/companies/weberpdemo/logo.jpg (from rev 4516, trunk/companies/weberpdemo/logo2.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/logo.png
===================================================================
--- trunk/companies/weberpdemo/logo.png 2011-03-24 09:12:22 UTC (rev 4516)
+++ trunk/companies/weberpdemo/logo.png 2011-03-26 03:33:53 UTC (rev 4517)
@@ -1,678 +0,0 @@
-\x89PNG
-
- |
|
From: <dai...@us...> - 2011-03-24 09:12:30
|
Revision: 4516
http://web-erp.svn.sourceforge.net/web-erp/?rev=4516&view=rev
Author: daintree
Date: 2011-03-24 09:12:22 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
James SelectProduct.php product image - Phil mods to PDFStockTransfer.php
Modified Paths:
--------------
trunk/PDFStockTransfer.php
trunk/SelectProduct.php
trunk/doc/Change.log.html
trunk/index.php
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/PDFStockTransfer.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -2,11 +2,35 @@
/* $Id$*/
-/* $Revision: 1.5 $ */
-
-//$PageSecurity = 2;
include('includes/session.inc');
+if (!isset($_GET['TransferNo'])){
+ if (isset($_POST['TransferNo'])){
+ if (is_numeric($_POST['TransferNo'])){
+ $_GET['TransferNo'] = $_POST['TransferNo'];
+ } else {
+ prnMsg(_('The entered transfer reference is expected to be numeric'),'error');
+ unset($_POST['TransferNo']);
+ }
+ }
+ if (!isset($_GET['TransferNo'])){ //still not set from a post then
+ //open a form for entering a transfer number
+ $title = _('Print Stock Transfer');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print Transfer Note') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post" name="form">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection"><tr>';
+ echo '<td>'._('Print Stock Transfer Note').' : '.'</td>';
+ echo '<td><input type=text class="number" name="TransferNo" maxlength=10 size=11 /></td></tr>';
+ echo '</table>';
+ echo '<br><div class="centre"><input type="submit" name="Process" value="' . _('Print Transfer Note') . '"></div></form>';
+ include('includes/footer.inc');
+ exit();
+ }
+}
+
+
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Stock Transfer Form') );
$FontSize=10;
@@ -18,56 +42,43 @@
/*Print out the category totals */
-$sql="SELECT stockid, transno, loccode, trandate, qty from stockmoves where transno='".$_GET['TransferNo']."' and type=16";
+$sql="SELECT stockmoves.stockid,
+ description,
+ transno,
+ stockmoves.loccode,
+ locationname,
+ trandate,
+ qty
+ FROM stockmoves
+ INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN locations
+ ON stockmoves.loccode=locations.loccode
+ WHERE transno='".$_GET['TransferNo']."'
+ AND type=16";
$result=DB_query($sql, $db);
-$myrow=DB_fetch_array($result);
-$StockID=$myrow[0];
-$FromCode=$myrow[2];
-$Date=$myrow[3];
-
-$myrow=DB_fetch_array($result);
-$ToCode=$myrow[2];
-$Quantity=$myrow[4];
-
-$sql="select description from stockmaster where stockid='".$StockID."'";
-$result=DB_query($sql, $db);
-
if (DB_num_rows($result) == 0){
+ $title = _('Print Stock Transfer - Error');
include ('includes/header.inc');
- prnMsg(_('There are no decription for '.$StockID), 'warn');
+ prnMsg(_('There was no transfer found with number') . ': ' . $_GET['TransferNo'], 'error');
+ echo '<a href="PDFStockTransfer.php">' . _('Try Again') .'</a>';
include ('includes/footer.inc');
exit;
}
-
+//get the first stock movement which will be the quantity taken from the initiating location
$myrow=DB_fetch_array($result);
-$Description=$myrow[0];
+$StockID=$myrow['stockid'];
+$FromCode=$myrow['loccode'];
+$From = $myrow['locationname'];
+$Date=$myrow['trandate'];
+//get the next row which will be the quantity received in the receiving location
+$myNextRow=DB_fetch_array($result);
+$ToCode=$myNextRow['loccode'];
+$To = $myrow['locationname'];
+$Quantity=$myNextRow['qty'];
+$Description=$myNextRow['description'];
-$sql="select locationname from locations where loccode='".$FromCode."'";
-$result=DB_query($sql, $db);
-if (DB_num_rows($result) == 0){
- include ('includes/header.inc');
- prnMsg(_('There are no location From for '.$StockID), 'warn');
- include ('includes/footer.inc');
- exit;
-}
-
-$myrow=DB_fetch_array($result);
-$From=$myrow[0];
-
-$sql="select locationname from locations where loccode='".$ToCode."'";
-$result=DB_query($sql, $db);
-
-if (DB_num_rows($result) == 0){
- include ('includes/header.inc');
- prnMsg(_('There are no location To for '.$StockID), 'warn');
- include ('includes/footer.inc');
- exit;
-}
-
-$myrow=DB_fetch_array($result);
-$To=$myrow[0];
-
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos-10,300-$Left_Margin,$FontSize, $StockID);
$LeftOvers = $pdf->addTextWrap($Left_Margin+75,$YPos-10,300-$Left_Margin,$FontSize, $Description);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos-10,300-$Left_Margin,$FontSize, $From);
@@ -78,30 +89,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos-120,300-$Left_Margin,$FontSize, _('Signed for ').$From.'______________________');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos-160,300-$Left_Margin,$FontSize, _('Signed for ').$To.'______________________');
-/*
-$pdfcode = $pdf->output();
-$len = strlen($pdfcode);
-if ($len<=20){
- $title = _('Print Price List Error');
- include('includes/header.inc');
- prnMsg(_('There were no stock transfer details to print'),'warn');
- echo '<br><a href="'.$rootpath.'/index.php?' . SID . '">'. _('Back to the menu').'</a>';
- include('includes/footer.inc');
- exit;
-} else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=StockTransfer.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('StockTransfer.pdf', 'I');
-}
-*/
-$pdf->OutputD($_SESSION['DatabaseName'] . '_StockTransfer_' . date('Y-m-d') . '.pdf');//UldisN
-$pdf->__destruct(); //UldisN
-
- /*end of else not PrintPDF */
-?>
+$pdf->OutputD($_SESSION['DatabaseName'] . '_StockTransfer_' . date('Y-m-d') . '.pdf');
+$pdf->__destruct();
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/SelectProduct.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -35,7 +35,7 @@
$result1 = DB_query($SQL, $db);
if (DB_num_rows($result1) == 0) {
echo '<p><font size=4 color=red>' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>';
- echo '<br /><a href="' . $rootpath . '/StockCategories.php?' . SID . '">' . _('Define Stock Categories') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
exit;
}
// end of showing search facilities
@@ -352,7 +352,7 @@
} else {
echo '<td class="select">' . _('No') . '</td>';
}
- echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' .
+ echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' .
$SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
echo '</tr>';
}
@@ -367,47 +367,64 @@
</tr>';
echo '<tr><td valign="top" class="select">';
/*Stock Inquiry Options */
-echo '<a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
+echo '<a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockUsage.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
}
-echo '<a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
-echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
+echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
+echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg?' . SID . '">' . _('Show Part Picture (if available)') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
- echo '<a href="' . $rootpath . '/BOMInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
+ echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
}
if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
}
wikiLink('Product', $StockID);
echo '</td><td valign="top" class="select">';
/* Stock Transactions */
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockTransfers.php?' . SID . '&StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockAdjustments.php?StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
+
+ if (function_exists('imagecreatefrompng')){
+ $StockImgLink = '
+ GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=200'.
+ '&height=200'.
+ ' ';
+ } else {
+ if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = ' ' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
+
if ($myrow['mbflag'] == 'B') {
echo '<br />';
$SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.supplierid,
- purchdata.preferred,
- purchdata.minorderqty
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.stockid = '" . $StockID . "'", $db);
+ suppliers.supplierid,
+ purchdata.preferred,
+ purchdata.minorderqty
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ WHERE purchdata.stockid = '" . $StockID . "'", $db);
while ($SuppRow = DB_fetch_array($SuppResult)) {
if ($myrow['eoq'] == 0) {
$EOQ = $SuppRow['minorderqty'];
} else {
$EOQ = $myrow['eoq'];
}
- echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
+ echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
'&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
/**/
} /* end of while */
@@ -416,21 +433,21 @@
echo '</td><td valign="top" class="select">';
/* Stock Maintenance Options */
echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
-echo '<a href="' . $rootpath . '/Stocks.php?' . SID . '&StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
+echo '<a href="' . $rootpath . '/Stocks.php?StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockReorderLevel.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
- echo '<a href="' . $rootpath . '/PurchData.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockReorderLevel.php?StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PurchData.php?StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
}
if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
}
if (!$Its_A_Kitset) {
- echo '<a href="' . $rootpath . '/Prices.php?' . SID . '&Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
+ echo '<a href="' . $rootpath . '/Prices.php?Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != "" AND Strlen($_SESSION['CustomerID']) > 0) {
- echo '<a href="' . $rootpath . '/Prices_Customer.php?' . SID . '&Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ echo '<a href="' . $rootpath . '/Prices_Customer.php?Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
}
- echo '<a href="' . $rootpath . '/DiscountCategories.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
+ echo '<a href="' . $rootpath . '/DiscountCategories.php?StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
}
echo '</td></tr></table>';
} else {
@@ -450,7 +467,7 @@
echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
echo '</td></tr></table>';
} // end displaying item options if there is one and only one record
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post">';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
@@ -634,7 +651,7 @@
/* end query for list of records */
/* display list if there is more than one record */
if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post">';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($searchresult);
if ($ListCount > 0) {
@@ -707,7 +724,7 @@
<td>".$myrow['description']."</td>
<td class='number'>".$qoh."</td>
<td>".$myrow['units']."</td>
- <td><a target='_blank' href='" . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $myrow['stockid']."'>" . _('View') . '</a></td>
+ <td><a target='_blank' href='" . $rootpath . '/StockStatus.php?StockID=' . $myrow['stockid']."'>" . _('View') . '</a></td>
</tr>';
$j++;
if ($j == 20 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/doc/Change.log.html 2011-03-24 09:12:22 UTC (rev 4516)
@@ -1,5 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>24/3/11: Phil rework PDFStockTransfer.php remove a few round trips to DB and added facility to be able to select a transfer number to reprint - added to main menu</p>
+<p>24/3/11: James wer...@ya... Added snall image in middle of SelectProduct.php</p>
<p>19/3/11: Phil added country to packing slips </p>
<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php </p>
<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php</p>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/index.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -11,15 +11,15 @@
$ModuleLink = array('orders', 'AR', 'AP', 'PO', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system');
/*The headings showing on the tabs accross the main index used also in WWW_Users for defining what should be visible to the user */
$ModuleList = array(_('Sales'),
- _('Receivables'),
- _('Payables'),
- _('Purchases'),
- _('Inventory'),
- _('Manufacturing'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'));
+ _('Receivables'),
+ _('Payables'),
+ _('Purchases'),
+ _('Inventory'),
+ _('Manufacturing'),
+ _('General Ledger'),
+ _('Asset Manager'),
+ _('Petty Cash'),
+ _('Setup'));
if (isset($_GET['Application'])){ /*This is sent by this page (to itself) when the user clicks on a tab */
$_SESSION['Module'] = $_GET['Application'];
@@ -39,17 +39,17 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' . SID . '&NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -65,7 +65,7 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php?' . SID . '">' . _('Supplier Tenders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php">' . _('Supplier Tenders') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -93,9 +93,9 @@
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
- echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
} else {
- echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
}
}
$i++;
@@ -126,7 +126,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' .sid . '&NewOrder=Yes">' . _('Enter An Order or Quotation') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?NewOrder=Yes">' . _('Enter An Order or Quotation') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -141,12 +141,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SpecialOrder.php?' .sid . '&NewSpecial=Yes">' . _('Special Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SpecialOrder.php?NewSpecial=Yes">' . _('Special Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -165,52 +165,52 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '">' . _('Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php">' . _('Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php?' . SID . '">' . _('Print Price Lists') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php">' . _('Print Price Lists') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php?' . SID . '">' . _('Order Status Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php">' . _('Order Status Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php?' . SID . '">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php?' . SID . '">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php?' . SID . '">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php?' . SID . '">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php?' . SID . '">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php?' . SID . '">' . _('Top Sales Items Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php">' . _('Top Sales Items Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php?' . SID . '">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -228,12 +228,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php?' . SID . '">' . _('Select Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php">' . _('Select Contract') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php?' . SID . '">' . _('Create Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php">' . _('Create Contract') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -266,23 +266,23 @@
<table width="100%"class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Select Order to Invoice') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Select Order to Invoice') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCreditItems.php?' .sid . '&NewCredit=Yes">' . _('Create A Credit Note') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCreditItems.php?NewCredit=Yes">' . _('Create A Credit Note') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . SID . '&NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php?' . SID . '">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -291,63 +291,63 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php?' . SID . '">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
<?php
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php">' . _('Print Invoices or Credit Notes') . '</a></p>';
} else {
- echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php">' . _('Print Invoices or Credit Notes') . '</a></p>';
}
?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php?' . SID . '">' . _('Print Statements') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php">' . _('Print Statements') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php?' . SID . '">' . _('Sales Analysis Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php">' . _('Sales Analysis Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php?' . SID . '">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php?' . SID . '">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php?' . SID . '">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php?' . SID . '">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php?' . SID . '">' . _('Sales Graphs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php">' . _('Sales Graphs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php?' . SID . '">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -361,12 +361,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Customers.php?' . SID . '">' . _('Add Customer') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Customers.php">' . _('Add Customer') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php?' . SID . '">' . _('Customers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php">' . _('Customers') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -396,7 +396,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Select Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php">' . _('Select Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -410,37 +410,37 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php?' . SID . '">' . _('Aged Supplier Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php">' . _('Aged Supplier Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php?' . SID . '">' . _('Payment Run Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php">' . _('Payment Run Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php?' . SID . '">' . _('Remittance Advices') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php">' . _('Remittance Advices') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php?' . SID . '">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php?' . SID . '">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php?' . SID . '">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -454,12 +454,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php?' . SID . '">' . _('Add Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php">' . _('Add Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Factors.php?' . SID . '">' . _('Maintain Factor Companies') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Factors.php">' . _('Maintain Factor Companies') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -487,7 +487,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -497,22 +497,22 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php?' . SID . '">' . _('Process Tenders and Offers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php">' . _('Process Tenders and Offers') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php?' . SID . '">' . _('Orders to Authorise') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php">' . _('Orders to Authorise') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Shipment Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php">' . _('Shipment Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php?' . SID . '">' . _('Select A Shipment') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php">' . _('Select A Shipment') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -521,12 +521,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/POReport.php?' . SID . '">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/POReport.php">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -566,7 +566,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Receive Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Receive Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -576,12 +576,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php?' . SID . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php?' . SID . '">' . _('Inventory Location Transfers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php">' . _('Inventory Location Transfers') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -591,12 +591,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php?' . SID . '">' . _('Reverse Goods Received') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php">' . _('Reverse Goods Received') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php?' . SID . '">' . _('Enter Stock Counts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php">' . _('Enter Stock Counts') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -620,83 +620,87 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php?' . SID . '">' . _('Inventory Item Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php">' . _('Inventory Item Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php?' . SID . '">' . _('Inventory Item Usage') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php">' . _('Inventory Item Usage') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php?' . SID . '">' . _('Inventory Quantities') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php">' . _('Inventory Quantities') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php?' . SID . '">' . _('Reorder Level') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php">' . _('Reorder Level') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php?' . SID . '">' . _('Stock Dispatch') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php">' . _('Stock Dispatch') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php?' . SID . '">' . _('Inventory Valuation Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php">' . _('Inventory Valuation Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php?' . SID . '">' . _('Inventory Planning Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php">' . _('Inventory Planning Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php?' . SID . '">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php?' . SID . '">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php?' . SID . '">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php?' . SID . '">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php?' . SID . '">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php?' . SID . '">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php?' . SID . '">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php?' . SID . '">' . _('List Negative Stocks') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php">' . _('List Negative Stocks') . '</a></p>'; ?>
</td>
</tr>
<tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
+ </td>
+ </tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php?' . SID . '">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransfer.php">' . _('Stock Transfer Note') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -710,32 +714,32 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php?' . SID . '">' . _('Add A New Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php">' . _('Add A New Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php?' . SID . '">' . _('Select An Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php">' . _('Select An Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php?' . SID . '">' . _('Sales Category Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php">' . _('Sales Category Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php?' . SID . '">' . _('Add or Update Prices Based On Costs Or Other Price List') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php">' . _('Add or Update Prices Based On Costs Or Other Price List') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php?' . SID . '">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php?' . SID . '">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -765,12 +769,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('Work Order Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php">' . _('Work Order Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -779,57 +783,57 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php?' . SID . '">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '">' . _('Where Used Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php">' . _('Where Used Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php?' . SID . '">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php?' . SID . '">' . _('List Components Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php">' . _('List Components Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php?' . SID . '">' . _('Indented Where Used Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php">' . _('Indented Where Used Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php?' . SID . '">' . _('MRP') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php">' . _('MRP') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php?' . SID . '">' . _('MRP Shortages') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php">' . _('MRP Shortages') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php?' . SID . '">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php?' . SID . '">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php?' . SID . '">' . _('MRP Reschedules Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php">' . _('MRP Reschedules Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -843,28 +847,28 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php?' . SID . '">' . _('Work Centre') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php">' . _('Work Centre') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php?' . SID . '">' . _('Bills Of Material') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php">' . _('Bills Of Material') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php?' . SID . '">' . _('Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php">' . _('Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php?' . SID . '">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRP.php?' . SID . '">' . _('MRP Calculation') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRP.php">' . _('MRP Calculation') . '</a></p>'; ?>
</td>
</tr>
@@ -932,62 +936,62 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php?' . SID . '">' . _('Company Preferences') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php">' . _('Company Preferences') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php?' . SID . '">' . _('Configuration Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php">' . _('Configuration Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php?' . SID . '">' . _('User Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php">' . _('User Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php?' . SID . '">' . _('Role Permissions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php">' . _('Role Permissions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php?' . SID . '">' . _('Page Security Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php">' . _('Page Security Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php?' . SID . '">' . _('Bank Accounts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php">' . _('Bank Accounts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php?' . SID . '">' . _('Currency Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php">' . _('Currency Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php?' . SID . '">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php?' . SID . '">' . _('Tax Group Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php">' . _('Tax Group Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php?' . SID . '">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxCategories.php?' . SI...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-24 09:12:30
|
Revision: 4516
http://web-erp.svn.sourceforge.net/web-erp/?rev=4516&view=rev
Author: daintree
Date: 2011-03-24 09:12:22 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
James SelectProduct.php product image - Phil mods to PDFStockTransfer.php
Modified Paths:
--------------
trunk/PDFStockTransfer.php
trunk/SelectProduct.php
trunk/doc/Change.log.html
trunk/index.php
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/PDFStockTransfer.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -2,11 +2,35 @@
/* $Id$*/
-/* $Revision: 1.5 $ */
-
-//$PageSecurity = 2;
include('includes/session.inc');
+if (!isset($_GET['TransferNo'])){
+ if (isset($_POST['TransferNo'])){
+ if (is_numeric($_POST['TransferNo'])){
+ $_GET['TransferNo'] = $_POST['TransferNo'];
+ } else {
+ prnMsg(_('The entered transfer reference is expected to be numeric'),'error');
+ unset($_POST['TransferNo']);
+ }
+ }
+ if (!isset($_GET['TransferNo'])){ //still not set from a post then
+ //open a form for entering a transfer number
+ $title = _('Print Stock Transfer');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print Transfer Note') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post" name="form">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection"><tr>';
+ echo '<td>'._('Print Stock Transfer Note').' : '.'</td>';
+ echo '<td><input type=text class="number" name="TransferNo" maxlength=10 size=11 /></td></tr>';
+ echo '</table>';
+ echo '<br><div class="centre"><input type="submit" name="Process" value="' . _('Print Transfer Note') . '"></div></form>';
+ include('includes/footer.inc');
+ exit();
+ }
+}
+
+
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Stock Transfer Form') );
$FontSize=10;
@@ -18,56 +42,43 @@
/*Print out the category totals */
-$sql="SELECT stockid, transno, loccode, trandate, qty from stockmoves where transno='".$_GET['TransferNo']."' and type=16";
+$sql="SELECT stockmoves.stockid,
+ description,
+ transno,
+ stockmoves.loccode,
+ locationname,
+ trandate,
+ qty
+ FROM stockmoves
+ INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN locations
+ ON stockmoves.loccode=locations.loccode
+ WHERE transno='".$_GET['TransferNo']."'
+ AND type=16";
$result=DB_query($sql, $db);
-$myrow=DB_fetch_array($result);
-$StockID=$myrow[0];
-$FromCode=$myrow[2];
-$Date=$myrow[3];
-
-$myrow=DB_fetch_array($result);
-$ToCode=$myrow[2];
-$Quantity=$myrow[4];
-
-$sql="select description from stockmaster where stockid='".$StockID."'";
-$result=DB_query($sql, $db);
-
if (DB_num_rows($result) == 0){
+ $title = _('Print Stock Transfer - Error');
include ('includes/header.inc');
- prnMsg(_('There are no decription for '.$StockID), 'warn');
+ prnMsg(_('There was no transfer found with number') . ': ' . $_GET['TransferNo'], 'error');
+ echo '<a href="PDFStockTransfer.php">' . _('Try Again') .'</a>';
include ('includes/footer.inc');
exit;
}
-
+//get the first stock movement which will be the quantity taken from the initiating location
$myrow=DB_fetch_array($result);
-$Description=$myrow[0];
+$StockID=$myrow['stockid'];
+$FromCode=$myrow['loccode'];
+$From = $myrow['locationname'];
+$Date=$myrow['trandate'];
+//get the next row which will be the quantity received in the receiving location
+$myNextRow=DB_fetch_array($result);
+$ToCode=$myNextRow['loccode'];
+$To = $myrow['locationname'];
+$Quantity=$myNextRow['qty'];
+$Description=$myNextRow['description'];
-$sql="select locationname from locations where loccode='".$FromCode."'";
-$result=DB_query($sql, $db);
-if (DB_num_rows($result) == 0){
- include ('includes/header.inc');
- prnMsg(_('There are no location From for '.$StockID), 'warn');
- include ('includes/footer.inc');
- exit;
-}
-
-$myrow=DB_fetch_array($result);
-$From=$myrow[0];
-
-$sql="select locationname from locations where loccode='".$ToCode."'";
-$result=DB_query($sql, $db);
-
-if (DB_num_rows($result) == 0){
- include ('includes/header.inc');
- prnMsg(_('There are no location To for '.$StockID), 'warn');
- include ('includes/footer.inc');
- exit;
-}
-
-$myrow=DB_fetch_array($result);
-$To=$myrow[0];
-
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos-10,300-$Left_Margin,$FontSize, $StockID);
$LeftOvers = $pdf->addTextWrap($Left_Margin+75,$YPos-10,300-$Left_Margin,$FontSize, $Description);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos-10,300-$Left_Margin,$FontSize, $From);
@@ -78,30 +89,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos-120,300-$Left_Margin,$FontSize, _('Signed for ').$From.'______________________');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos-160,300-$Left_Margin,$FontSize, _('Signed for ').$To.'______________________');
-/*
-$pdfcode = $pdf->output();
-$len = strlen($pdfcode);
-if ($len<=20){
- $title = _('Print Price List Error');
- include('includes/header.inc');
- prnMsg(_('There were no stock transfer details to print'),'warn');
- echo '<br><a href="'.$rootpath.'/index.php?' . SID . '">'. _('Back to the menu').'</a>';
- include('includes/footer.inc');
- exit;
-} else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=StockTransfer.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('StockTransfer.pdf', 'I');
-}
-*/
-$pdf->OutputD($_SESSION['DatabaseName'] . '_StockTransfer_' . date('Y-m-d') . '.pdf');//UldisN
-$pdf->__destruct(); //UldisN
-
- /*end of else not PrintPDF */
-?>
+$pdf->OutputD($_SESSION['DatabaseName'] . '_StockTransfer_' . date('Y-m-d') . '.pdf');
+$pdf->__destruct();
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/SelectProduct.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -35,7 +35,7 @@
$result1 = DB_query($SQL, $db);
if (DB_num_rows($result1) == 0) {
echo '<p><font size=4 color=red>' . _('Problem Report') . ':</font><br />' . _('There are no stock categories currently defined please use the link below to set them up').'</p>';
- echo '<br /><a href="' . $rootpath . '/StockCategories.php?' . SID . '">' . _('Define Stock Categories') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
exit;
}
// end of showing search facilities
@@ -352,7 +352,7 @@
} else {
echo '<td class="select">' . _('No') . '</td>';
}
- echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' .
+ echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' .
$SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
echo '</tr>';
}
@@ -367,47 +367,64 @@
</tr>';
echo '<tr><td valign="top" class="select">';
/*Stock Inquiry Options */
-echo '<a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
+echo '<a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockUsage.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
}
-echo '<a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
-echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
+echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
+echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg?' . SID . '">' . _('Show Part Picture (if available)') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
- echo '<a href="' . $rootpath . '/BOMInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
+ echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
}
if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
}
wikiLink('Product', $StockID);
echo '</td><td valign="top" class="select">';
/* Stock Transactions */
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockTransfers.php?' . SID . '&StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockAdjustments.php?StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
+
+ if (function_exists('imagecreatefrompng')){
+ $StockImgLink = '
+ GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=200'.
+ '&height=200'.
+ ' ';
+ } else {
+ if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = ' ' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
+
if ($myrow['mbflag'] == 'B') {
echo '<br />';
$SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.supplierid,
- purchdata.preferred,
- purchdata.minorderqty
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.stockid = '" . $StockID . "'", $db);
+ suppliers.supplierid,
+ purchdata.preferred,
+ purchdata.minorderqty
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ WHERE purchdata.stockid = '" . $StockID . "'", $db);
while ($SuppRow = DB_fetch_array($SuppResult)) {
if ($myrow['eoq'] == 0) {
$EOQ = $SuppRow['minorderqty'];
} else {
$EOQ = $myrow['eoq'];
}
- echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
+ echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
'&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
/**/
} /* end of while */
@@ -416,21 +433,21 @@
echo '</td><td valign="top" class="select">';
/* Stock Maintenance Options */
echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
-echo '<a href="' . $rootpath . '/Stocks.php?' . SID . '&StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
+echo '<a href="' . $rootpath . '/Stocks.php?StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockReorderLevel.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
- echo '<a href="' . $rootpath . '/PurchData.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockReorderLevel.php?StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PurchData.php?StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
}
if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
}
if (!$Its_A_Kitset) {
- echo '<a href="' . $rootpath . '/Prices.php?' . SID . '&Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
+ echo '<a href="' . $rootpath . '/Prices.php?Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != "" AND Strlen($_SESSION['CustomerID']) > 0) {
- echo '<a href="' . $rootpath . '/Prices_Customer.php?' . SID . '&Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ echo '<a href="' . $rootpath . '/Prices_Customer.php?Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
}
- echo '<a href="' . $rootpath . '/DiscountCategories.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
+ echo '<a href="' . $rootpath . '/DiscountCategories.php?StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
}
echo '</td></tr></table>';
} else {
@@ -450,7 +467,7 @@
echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
echo '</td></tr></table>';
} // end displaying item options if there is one and only one record
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post">';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
@@ -634,7 +651,7 @@
/* end query for list of records */
/* display list if there is more than one record */
if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post">';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($searchresult);
if ($ListCount > 0) {
@@ -707,7 +724,7 @@
<td>".$myrow['description']."</td>
<td class='number'>".$qoh."</td>
<td>".$myrow['units']."</td>
- <td><a target='_blank' href='" . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $myrow['stockid']."'>" . _('View') . '</a></td>
+ <td><a target='_blank' href='" . $rootpath . '/StockStatus.php?StockID=' . $myrow['stockid']."'>" . _('View') . '</a></td>
</tr>';
$j++;
if ($j == 20 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/doc/Change.log.html 2011-03-24 09:12:22 UTC (rev 4516)
@@ -1,5 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>24/3/11: Phil rework PDFStockTransfer.php remove a few round trips to DB and added facility to be able to select a transfer number to reprint - added to main menu</p>
+<p>24/3/11: James wer...@ya... Added snall image in middle of SelectProduct.php</p>
<p>19/3/11: Phil added country to packing slips </p>
<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php </p>
<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php</p>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-03-20 02:51:01 UTC (rev 4515)
+++ trunk/index.php 2011-03-24 09:12:22 UTC (rev 4516)
@@ -11,15 +11,15 @@
$ModuleLink = array('orders', 'AR', 'AP', 'PO', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system');
/*The headings showing on the tabs accross the main index used also in WWW_Users for defining what should be visible to the user */
$ModuleList = array(_('Sales'),
- _('Receivables'),
- _('Payables'),
- _('Purchases'),
- _('Inventory'),
- _('Manufacturing'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'));
+ _('Receivables'),
+ _('Payables'),
+ _('Purchases'),
+ _('Inventory'),
+ _('Manufacturing'),
+ _('General Ledger'),
+ _('Asset Manager'),
+ _('Petty Cash'),
+ _('Setup'));
if (isset($_GET['Application'])){ /*This is sent by this page (to itself) when the user clicks on a tab */
$_SESSION['Module'] = $_GET['Application'];
@@ -39,17 +39,17 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' . SID . '&NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -65,7 +65,7 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php?' . SID . '">' . _('Supplier Tenders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php">' . _('Supplier Tenders') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -93,9 +93,9 @@
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
- echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
} else {
- echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
}
}
$i++;
@@ -126,7 +126,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' .sid . '&NewOrder=Yes">' . _('Enter An Order or Quotation') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?NewOrder=Yes">' . _('Enter An Order or Quotation') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -141,12 +141,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SpecialOrder.php?' .sid . '&NewSpecial=Yes">' . _('Special Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SpecialOrder.php?NewSpecial=Yes">' . _('Special Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -165,52 +165,52 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '">' . _('Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php">' . _('Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php?' . SID . '">' . _('Print Price Lists') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php">' . _('Print Price Lists') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php?' . SID . '">' . _('Order Status Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php">' . _('Order Status Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php?' . SID . '">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php?' . SID . '">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php?' . SID . '">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php?' . SID . '">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php?' . SID . '">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php?' . SID . '">' . _('Top Sales Items Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php">' . _('Top Sales Items Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php?' . SID . '">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -228,12 +228,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php?' . SID . '">' . _('Select Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php">' . _('Select Contract') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php?' . SID . '">' . _('Create Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php">' . _('Create Contract') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -266,23 +266,23 @@
<table width="100%"class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Select Order to Invoice') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Select Order to Invoice') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCreditItems.php?' .sid . '&NewCredit=Yes">' . _('Create A Credit Note') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCreditItems.php?NewCredit=Yes">' . _('Create A Credit Note') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . SID . '&NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php?' . SID . '">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -291,63 +291,63 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php?' . SID . '">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
<?php
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php">' . _('Print Invoices or Credit Notes') . '</a></p>';
} else {
- echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php">' . _('Print Invoices or Credit Notes') . '</a></p>';
}
?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php?' . SID . '">' . _('Print Statements') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php">' . _('Print Statements') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php?' . SID . '">' . _('Sales Analysis Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php">' . _('Sales Analysis Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php?' . SID . '">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php?' . SID . '">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php?' . SID . '">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php?' . SID . '">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php?' . SID . '">' . _('Sales Graphs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php">' . _('Sales Graphs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php?' . SID . '">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -361,12 +361,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Customers.php?' . SID . '">' . _('Add Customer') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Customers.php">' . _('Add Customer') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php?' . SID . '">' . _('Customers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php">' . _('Customers') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -396,7 +396,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Select Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php">' . _('Select Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -410,37 +410,37 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php?' . SID . '">' . _('Aged Supplier Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php">' . _('Aged Supplier Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php?' . SID . '">' . _('Payment Run Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php">' . _('Payment Run Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php?' . SID . '">' . _('Remittance Advices') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php">' . _('Remittance Advices') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php?' . SID . '">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php?' . SID . '">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php?' . SID . '">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -454,12 +454,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php?' . SID . '">' . _('Add Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php">' . _('Add Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Factors.php?' . SID . '">' . _('Maintain Factor Companies') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Factors.php">' . _('Maintain Factor Companies') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -487,7 +487,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -497,22 +497,22 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php?' . SID . '">' . _('Process Tenders and Offers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php">' . _('Process Tenders and Offers') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php?' . SID . '">' . _('Orders to Authorise') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php">' . _('Orders to Authorise') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Shipment Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php">' . _('Shipment Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php?' . SID . '">' . _('Select A Shipment') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php">' . _('Select A Shipment') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -521,12 +521,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/POReport.php?' . SID . '">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/POReport.php">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -566,7 +566,7 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Receive Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Receive Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -576,12 +576,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php?' . SID . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php?' . SID . '">' . _('Inventory Location Transfers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php">' . _('Inventory Location Transfers') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -591,12 +591,12 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php?' . SID . '">' . _('Reverse Goods Received') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php">' . _('Reverse Goods Received') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php?' . SID . '">' . _('Enter Stock Counts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php">' . _('Enter Stock Counts') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -620,83 +620,87 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php?' . SID . '">' . _('Inventory Item Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php">' . _('Inventory Item Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php?' . SID . '">' . _('Inventory Item Usage') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php">' . _('Inventory Item Usage') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php?' . SID . '">' . _('Inventory Quantities') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php">' . _('Inventory Quantities') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php?' . SID . '">' . _('Reorder Level') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php">' . _('Reorder Level') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php?' . SID . '">' . _('Stock Dispatch') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php">' . _('Stock Dispatch') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php?' . SID . '">' . _('Inventory Valuation Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php">' . _('Inventory Valuation Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php?' . SID . '">' . _('Inventory Planning Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php">' . _('Inventory Planning Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php?' . SID . '">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php?' . SID . '">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php?' . SID . '">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php?' . SID . '">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php?' . SID . '">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php?' . SID . '">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php?' . SID . '">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php?' . SID . '">' . _('List Negative Stocks') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php">' . _('List Negative Stocks') . '</a></p>'; ?>
</td>
</tr>
<tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
+ </td>
+ </tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php?' . SID . '">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransfer.php">' . _('Stock Transfer Note') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -710,32 +714,32 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php?' . SID . '">' . _('Add A New Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php">' . _('Add A New Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php?' . SID . '">' . _('Select An Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php">' . _('Select An Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php?' . SID . '">' . _('Sales Category Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php">' . _('Sales Category Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php?' . SID . '">' . _('Add or Update Prices Based On Costs Or Other Price List') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php">' . _('Add or Update Prices Based On Costs Or Other Price List') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php?' . SID . '">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php?' . SID . '">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -765,12 +769,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('Work Order Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php">' . _('Work Order Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -779,57 +783,57 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php?' . SID . '">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '">' . _('Where Used Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php">' . _('Where Used Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php?' . SID . '">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php?' . SID . '">' . _('List Components Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php">' . _('List Components Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php?' . SID . '">' . _('Indented Where Used Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php">' . _('Indented Where Used Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php?' . SID . '">' . _('MRP') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php">' . _('MRP') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php?' . SID . '">' . _('MRP Shortages') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php">' . _('MRP Shortages') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php?' . SID . '">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php?' . SID . '">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php?' . SID . '">' . _('MRP Reschedules Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php">' . _('MRP Reschedules Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -843,28 +847,28 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php?' . SID . '">' . _('Work Centre') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php">' . _('Work Centre') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php?' . SID . '">' . _('Bills Of Material') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php">' . _('Bills Of Material') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php?' . SID . '">' . _('Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php">' . _('Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php?' . SID . '">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRP.php?' . SID . '">' . _('MRP Calculation') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRP.php">' . _('MRP Calculation') . '</a></p>'; ?>
</td>
</tr>
@@ -932,62 +936,62 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php?' . SID . '">' . _('Company Preferences') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php">' . _('Company Preferences') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php?' . SID . '">' . _('Configuration Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php">' . _('Configuration Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php?' . SID . '">' . _('User Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php">' . _('User Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php?' . SID . '">' . _('Role Permissions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php">' . _('Role Permissions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php?' . SID . '">' . _('Page Security Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php">' . _('Page Security Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php?' . SID . '">' . _('Bank Accounts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php">' . _('Bank Accounts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php?' . SID . '">' . _('Currency Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php">' . _('Currency Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php?' . SID . '">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php?' . SID . '">' . _('Tax Group Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php">' . _('Tax Group Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php?' . SID . '">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxCategories.php?' . SI...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-20 02:51:13
|
Revision: 4515
http://web-erp.svn.sourceforge.net/web-erp/?rev=4515&view=rev
Author: daintree
Date: 2011-03-20 02:51:01 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
remove redundant files
Modified Paths:
--------------
trunk/UserSettings.php
trunk/WWW_Users.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/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
Removed Paths:
-------------
trunk/fpdi/decoders/
trunk/fpdi/fpdf_tpl.php
trunk/fpdi/fpdi.php
trunk/fpdi/fpdi2tcpdf_bridge.php
trunk/fpdi/fpdi_pdf_parser.php
trunk/fpdi/pdf_context.php
trunk/fpdi/pdf_parser.php
trunk/fpdi/wrapper_functions-borrar.php
trunk/sql/mysql/weberp313iso-demo.sql
trunk/sql/mysql/weberp313iso-new.sql
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/UserSettings.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -130,7 +130,6 @@
if (is_dir('locale/' . $LanguageEntry)
AND $LanguageEntry != '..'
- AND $LanguageEntry != 'CVS'
AND $LanguageEntry != '.svn'
AND $LanguageEntry!='.'){
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/WWW_Users.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -79,7 +79,7 @@
}
//comment out except for demo! Do not want anyone modifying demo user.
/*
- elseif ($_POST['UserID'] == 'demo') {
+ elseif ($_POST['UserID'] == 'admin') {
prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
$InputError = 1;
}
@@ -215,7 +215,7 @@
// comment out except for demo! Do not want anyopne deleting demo user.
/*
- if ($SelectedUser == 'demo') {
+ if ($SelectedUser == 'admin') {
prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
} else {
*/
Deleted: trunk/fpdi/fpdf_tpl.php
===================================================================
--- trunk/fpdi/fpdf_tpl.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdf_tpl.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,409 +0,0 @@
-<?php
-//
-// FPDF_TPL - Version 1.1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-class FPDF_TPL extends FPDF {
- /**
- * Array of Tpl-Data
- * @var array
- */
- var $tpls = array();
-
- /**
- * Current Template-ID
- * @var int
- */
- var $tpl = 0;
-
- /**
- * "In Template"-Flag
- * @var boolean
- */
- var $_intpl = false;
-
- /**
- * Nameprefix of Templates used in Resources-Dictonary
- * @var string A String defining the Prefix used as Template-Object-Names. Have to beginn with an /
- */
- var $tplprefix = "/TPL";
-
- /**
- * Resources used By Templates and Pages
- * @var array
- */
- var $_res = array();
-
- /**
- * Last used Template data
- *
- * @var array
- */
- var $lastUsedTemplateData = array();
-
- /**
- * Start a Template
- *
- * This method starts a template. You can give own coordinates to build an own sized
- * Template. Pay attention, that the margins are adapted to the new templatesize.
- * If you want to write outside the template, for example to build a clipped Template,
- * you have to set the Margins and "Cursor"-Position manual after beginTemplate-Call.
- *
- * If no parameter is given, the template uses the current page-size.
- * The Method returns an ID of the current Template. This ID is used later for using this template.
- * Warning: A created Template is used in PDF at all events. Still if you don't use it after creation!
- *
- * @param int $x The x-coordinate given in user-unit
- * @param int $y The y-coordinate given in user-unit
- * @param int $w The width given in user-unit
- * @param int $h The height given in user-unit
- * @return int The ID of new created Template
- */
- function beginTemplate($x=null, $y=null, $w=null, $h=null) {
- if ($this->page <= 0)
- $this->error("You have to add a page to fpdf first!");
-
- if ($x == null)
- $x = 0;
- if ($y == null)
- $y = 0;
- if ($w == null)
- $w = $this->w;
- if ($h == null)
- $h = $this->h;
-
- // Save settings
- $this->tpl++;
- $tpl =& $this->tpls[$this->tpl];
- $tpl = array(
- 'o_x' => $this->x,
- 'o_y' => $this->y,
- 'o_AutoPageBreak' => $this->AutoPageBreak,
- 'o_bMargin' => $this->bMargin,
- 'o_tMargin' => $this->tMargin,
- 'o_lMargin' => $this->lMargin,
- 'o_rMargin' => $this->rMargin,
- 'o_h' => $this->h,
- 'o_w' => $this->w,
- 'buffer' => '',
- 'x' => $x,
- 'y' => $y,
- 'w' => $w,
- 'h' => $h
- );
-
- $this->SetAutoPageBreak(false);
-
- // Define own high and width to calculate possitions correct
- $this->h = $h;
- $this->w = $w;
-
- $this->_intpl = true;
- $this->SetXY($x+$this->lMargin, $y+$this->tMargin);
- $this->SetRightMargin($this->w-$w+$this->rMargin);
-
- return $this->tpl;
- }
-
- /**
- * End Template
- *
- * This method ends a template and reset initiated variables on beginTemplate.
- *
- * @return mixed If a template is opened, the ID is returned. If not a false is returned.
- */
- function endTemplate() {
- if ($this->_intpl) {
- $this->_intpl = false;
- $tpl =& $this->tpls[$this->tpl];
- $this->SetXY($tpl['o_x'], $tpl['o_y']);
- $this->tMargin = $tpl['o_tMargin'];
- $this->lMargin = $tpl['o_lMargin'];
- $this->rMargin = $tpl['o_rMargin'];
- $this->h = $tpl['o_h'];
- $this->w = $tpl['o_w'];
- $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
-
- return $this->tpl;
- } else {
- return false;
- }
- }
-
- /**
- * Use a Template in current Page or other Template
- *
- * You can use a template in a page or in another template.
- * You can give the used template a new size like you use the Image()-method.
- * All parameters are optional. The width or height is calculated automaticaly
- * if one is given. If no parameter is given the origin size as defined in
- * beginTemplate() is used.
- * The calculated or used width and height are returned as an array.
- *
- * @param int $tplidx A valid template-Id
- * @param int $_x The x-position
- * @param int $_y The y-position
- * @param int $_w The new width of the template
- * @param int $_h The new height of the template
- * @retrun array The height and width of the template
- */
- function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0) {
- if ($this->page <= 0)
- $this->error("You have to add a page to fpdf first!");
-
- if (!isset($this->tpls[$tplidx]))
- $this->error("Template does not exist!");
-
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
- }
-
- $tpl =& $this->tpls[$tplidx];
- $w = $tpl['w'];
- $h = $tpl['h'];
-
- if ($_x == null)
- $_x = 0;
- if ($_y == null)
- $_y = 0;
-
- $_x += $tpl['x'];
- $_y += $tpl['y'];
-
- $wh = $this->getTemplateSize($tplidx, $_w, $_h);
- $_w = $wh['w'];
- $_h = $wh['h'];
-
- $tData = array(
- 'x' => $this->x,
- 'y' => $this->y,
- 'w' => $_w,
- 'h' => $_h,
- 'scaleX' => ($_w/$w),
- 'scaleY' => ($_h/$h),
- 'tx' => $_x,
- 'ty' => ($this->h-$_y-$_h),
- 'lty' => ($this->h-$_y-$_h) - ($this->h-$h) * ($_h/$h)
- );
-
- $this->_out(sprintf("q %.4F 0 0 %.4F %.4F %.4F cm", $tData['scaleX'], $tData['scaleY'], $tData['tx']*$this->k, $tData['ty']*$this->k)); // Translate
- $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
-
- $this->lastUsedTemplateData = $tData;
-
- return array("w" => $_w, "h" => $_h);
- }
-
- /**
- * Get The calculated Size of a Template
- *
- * If one size is given, this method calculates the other one.
- *
- * @param int $tplidx A valid template-Id
- * @param int $_w The width of the template
- * @param int $_h The height of the template
- * @return array The height and width of the template
- */
- function getTemplateSize($tplidx, $_w=0, $_h=0) {
- if (!$this->tpls[$tplidx])
- return false;
-
- $tpl =& $this->tpls[$tplidx];
- $w = $tpl['w'];
- $h = $tpl['h'];
-
- if ($_w == 0 and $_h == 0) {
- $_w = $w;
- $_h = $h;
- }
-
- if($_w==0)
- $_w = $_h*$w/$h;
- if($_h==0)
- $_h = $_w*$h/$w;
-
- return array("w" => $_w, "h" => $_h);
- }
-
- /**
- * See FPDF/TCPDF-Documentation ;-)
- */
- function SetFont($family, $style='', $size=0, $fontfile='') {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 3) {
- $this->Error('More than 3 arguments for the SetFont method are only available in TCPDF.');
- }
- /**
- * force the resetting of font changes in a template
- */
- if ($this->_intpl)
- $this->FontFamily = '';
-
- parent::SetFont($family, $style, $size, $fontfile);
-
- $fontkey = $this->FontFamily.$this->FontStyle;
-
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
- } else {
- $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
- }
- }
-
- /**
- * See FPDF/TCPDF-Documentation ;-)
- */
- function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false) {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 7) {
- $this->Error('More than 7 arguments for the Image method are only available in TCPDF.');
- }
-
- parent::Image($file, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $ismask, $imgmask, $border, $fitbox, $hidden, $fitonpage);
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
- } else {
- $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
- }
- }
-
- /**
- * See FPDF-Documentation ;-)
- *
- * AddPage is not available when you're "in" a template.
- */
- function AddPage($orientation='', $format='', $keepmargins=false) {
- if ($this->_intpl)
- $this->Error('Adding pages in templates isn\'t possible!');
- parent::AddPage($orientation, $format);
- }
-
- /**
- * Preserve adding Links in Templates ...won't work
- */
- function Link($x, $y, $w, $h, $link, $spaces=0) {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 5) {
- $this->Error('More than 7 arguments for the Image method are only available in TCPDF.');
- }
-
- if ($this->_intpl)
- $this->Error('Using links in templates aren\'t possible!');
- parent::Link($x, $y, $w, $h, $link, $spaces);
- }
-
- function AddLink() {
- if ($this->_intpl)
- $this->Error('Adding links in templates aren\'t possible!');
- return parent::AddLink();
- }
-
- function SetLink($link, $y=0, $page=-1) {
- if ($this->_intpl)
- $this->Error('Setting links in templates aren\'t possible!');
- parent::SetLink($link, $y, $page);
- }
-
- /**
- * Private Method that writes the form xobjects
- */
- function _putformxobjects() {
- $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
- reset($this->tpls);
- foreach($this->tpls AS $tplidx => $tpl) {
-
- $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
- $this->_newobj();
- $this->tpls[$tplidx]['n'] = $this->n;
- $this->_out('<<'.$filter.'/Type /XObject');
- $this->_out('/Subtype /Form');
- $this->_out('/FormType 1');
- $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
- // llx
- $tpl['x'],
- // lly
- -$tpl['y'],
- // urx
- ($tpl['w']+$tpl['x'])*$this->k,
- // ury
- ($tpl['h']-$tpl['y'])*$this->k
- ));
-
- if ($tpl['x'] != 0 || $tpl['y'] != 0) {
- $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
- -$tpl['x']*$this->k*2, $tpl['y']*$this->k*2
- ));
- }
-
- $this->_out('/Resources ');
-
- $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
- if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
- $this->_out('/Font <<');
- foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
- $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
- $this->_out('>>');
- }
- if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
- isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
- {
- $this->_out('/XObject <<');
- if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
- foreach($this->_res['tpl'][$tplidx]['images'] as $image)
- $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
- }
- if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
- foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
- $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
- }
- $this->_out('>>');
- }
- $this->_out('>>');
-
- $this->_out('/Length '.strlen($p).' >>');
- $this->_putstream($p);
- $this->_out('endobj');
- }
- }
-
- /**
- * Overwritten to add _putformxobjects() after _putimages()
- *
- */
- function _putimages() {
- parent::_putimages();
- $this->_putformxobjects();
- }
-
- function _putxobjectdict() {
- parent::_putxobjectdict();
-
- if (count($this->tpls)) {
- foreach($this->tpls as $tplidx => $tpl) {
- $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
- }
- }
- }
-
- /**
- * Private Method
- */
- function _out($s) {
- if ($this->state==2 && $this->_intpl) {
- $this->tpls[$this->tpl]['buffer'] .= $s."\n";
- } else {
- parent::_out($s);
- }
- }
-}
Deleted: trunk/fpdi/fpdi.php
===================================================================
--- trunk/fpdi/fpdi.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,504 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-define('FPDI_VERSION','1.3');
-
-// Check for TCPDF and remap TCPDF to FPDF
-if (class_exists('TCPDF')) {
- require_once('fpdi2tcpdf_bridge.php');
-}
-
-require_once('fpdf_tpl.php');
-require_once('fpdi_pdf_parser.php');
-
-
-class FPDI extends FPDF_TPL {
- /**
- * Actual filename
- * @var string
- */
- var $current_filename;
-
- /**
- * Parser-Objects
- * @var array
- */
- var $parsers;
-
- /**
- * Current parser
- * @var object
- */
- var $current_parser;
-
- /**
- * object stack
- * @var array
- */
- var $_obj_stack;
-
- /**
- * done object stack
- * @var array
- */
- var $_don_obj_stack;
-
- /**
- * Current Object Id.
- * @var integer
- */
- var $_current_obj_id;
-
- /**
- * The name of the last imported page box
- * @var string
- */
- var $lastUsedPageBox;
-
- var $_importedPages = array();
-
-
- /**
- * Set a source-file
- *
- * @param string $filename a valid filename
- * @return int number of available pages
- */
- function setSourceFile($filename) {
- $this->current_filename = $filename;
- $fn =& $this->current_filename;
-
- if (!isset($this->parsers[$fn]))
- $this->parsers[$fn] = new fpdi_pdf_parser($fn, $this);
- $this->current_parser =& $this->parsers[$fn];
-
- return $this->parsers[$fn]->getPageCount();
- }
-
- /**
- * Import a page
- *
- * @param int $pageno pagenumber
- * @return int Index of imported page - to use with fpdf_tpl::useTemplate()
- */
- function importPage($pageno, $boxName='/CropBox') {
- if ($this->_intpl) {
- return $this->error('Please import the desired pages before creating a new template.');
- }
-
- $fn =& $this->current_filename;
-
- // check if page already imported
- $pageKey = $fn.((int)$pageno).$boxName;
- if (isset($this->_importedPages[$pageKey]))
- return $this->_importedPages[$pageKey];
-
- $parser =& $this->parsers[$fn];
- $parser->setPageno($pageno);
-
- $this->tpl++;
- $this->tpls[$this->tpl] = array();
- $tpl =& $this->tpls[$this->tpl];
- $tpl['parser'] =& $parser;
- $tpl['resources'] = $parser->getPageResources();
- $tpl['buffer'] = $parser->getContent();
-
- if (!in_array($boxName, $parser->availableBoxes))
- return $this->Error(sprintf('Unknown box: %s', $boxName));
- $pageboxes = $parser->getPageBoxes($pageno);
-
- /**
- * MediaBox
- * CropBox: Default -> MediaBox
- * BleedBox: Default -> CropBox
- * TrimBox: Default -> CropBox
- * ArtBox: Default -> CropBox
- */
- if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
- $boxName = '/CropBox';
- if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
- $boxName = '/MediaBox';
-
- if (!isset($pageboxes[$boxName]))
- return false;
- $this->lastUsedPageBox = $boxName;
-
- $box = $pageboxes[$boxName];
- $tpl['box'] = $box;
-
- // To build an array that can be used by PDF_TPL::useTemplate()
- $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl],$box);
-
- // An imported page will start at 0,0 everytime. Translation will be set in _putformxobjects()
- $tpl['x'] = 0;
- $tpl['y'] = 0;
-
- $page =& $parser->pages[$parser->pageno];
-
- // handle rotated pages
- $rotation = $parser->getPageRotation($pageno);
- $tpl['_rotationAngle'] = 0;
- if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
- $steps = $angle / 90;
-
- $_w = $tpl['w'];
- $_h = $tpl['h'];
- $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
- $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
-
- $tpl['_rotationAngle'] = $angle*-1;
- }
-
- $this->_importedPages[$pageKey] = $this->tpl;
-
- return $this->tpl;
- }
-
- function getLastUsedPageBox() {
- return $this->lastUsedPageBox;
- }
-
- function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0, $adjustPageSize=false) {
- if ($adjustPageSize == true && is_null($_x) && is_null($_y)) {
- $size = $this->getTemplateSize($tplidx, $_w, $_h);
- $format = array($size['w'], $size['h']);
- if ($format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1]) {
- $this->w=$format[0];
- $this->h=$format[1];
- $this->wPt=$this->w*$this->k;
- $this->hPt=$this->h*$this->k;
- $this->PageBreakTrigger=$this->h-$this->bMargin;
- $this->CurPageFormat=$format;
- $this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
- }
- }
-
- $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
- $s = parent::useTemplate($tplidx, $_x, $_y, $_w, $_h);
- $this->_out('Q');
- return $s;
- }
-
- /**
- * Private method, that rebuilds all needed objects of source files
- */
- function _putimportedobjects() {
- if (is_array($this->parsers) && count($this->parsers) > 0) {
- foreach($this->parsers AS $filename => $p) {
- $this->current_parser =& $this->parsers[$filename];
- if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
- while(($n = key($this->_obj_stack[$filename])) !== null) {
- $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c,$this->_obj_stack[$filename][$n][1]);
-
- $this->_newobj($this->_obj_stack[$filename][$n][0]);
-
- if ($nObj[0] == PDF_TYPE_STREAM) {
- $this->pdf_write_value ($nObj);
- } else {
- $this->pdf_write_value ($nObj[1]);
- }
-
- $this->_out('endobj');
- $this->_obj_stack[$filename][$n] = null; // free memory
- unset($this->_obj_stack[$filename][$n]);
- reset($this->_obj_stack[$filename]);
- }
- }
- }
- }
- }
-
-
- /**
- * Private Method that writes the form xobjects
- */
- function _putformxobjects() {
- $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
- reset($this->tpls);
- foreach($this->tpls AS $tplidx => $tpl) {
- $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
- $this->_newobj();
- $cN = $this->n; // TCPDF/Protection: rem current "n"
-
- $this->tpls[$tplidx]['n'] = $this->n;
- $this->_out('<<'.$filter.'/Type /XObject');
- $this->_out('/Subtype /Form');
- $this->_out('/FormType 1');
-
- $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
- (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x'])*$this->k,
- (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y'])*$this->k,
- (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x'])*$this->k,
- (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h']-$tpl['y'])*$this->k
- ));
-
- $c = 1;
- $s = 0;
- $tx = 0;
- $ty = 0;
-
- if (isset($tpl['box'])) {
- $tx = -$tpl['box']['llx'];
- $ty = -$tpl['box']['lly'];
-
- if ($tpl['_rotationAngle'] <> 0) {
- $angle = $tpl['_rotationAngle'] * M_PI/180;
- $c=cos($angle);
- $s=sin($angle);
-
- switch($tpl['_rotationAngle']) {
- case -90:
- $tx = -$tpl['box']['lly'];
- $ty = $tpl['box']['urx'];
- break;
- case -180:
- $tx = $tpl['box']['urx'];
- $ty = $tpl['box']['ury'];
- break;
- case -270:
- $tx = $tpl['box']['ury'];
- $ty = 0;
- break;
- }
- }
- } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
- $tx = -$tpl['x']*2;
- $ty = $tpl['y']*2;
- }
-
- $tx *= $this->k;
- $ty *= $this->k;
-
- if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
- $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
- $c, $s, -$s, $c, $tx, $ty
- ));
- }
-
- $this->_out('/Resources ');
-
- if (isset($tpl['resources'])) {
- $this->current_parser =& $tpl['parser'];
- $this->pdf_write_value($tpl['resources']); // "n" will be changed
- } else {
- $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
- if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
- $this->_out('/Font <<');
- foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
- $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
- $this->_out('>>');
- }
- if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
- isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
- {
- $this->_out('/XObject <<');
- if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
- foreach($this->_res['tpl'][$tplidx]['images'] as $image)
- $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
- }
- if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
- foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
- $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
- }
- $this->_out('>>');
- }
- $this->_out('>>');
- }
-
- $nN = $this->n; // TCPDF: rem new "n"
- $this->n = $cN; // TCPDF: reset to current "n"
- $this->_out('/Length '.strlen($p).' >>');
- $this->_putstream($p);
- $this->_out('endobj');
- $this->n = $nN; // TCPDF: reset to new "n"
- }
-
- $this->_putimportedobjects();
- }
-
- /**
- * Rewritten to handle existing own defined objects
- */
- function _newobj($obj_id=false,$onlynewobj=false) {
- if (!$obj_id) {
- $obj_id = ++$this->n;
- }
-
- //Begin a new object
- if (!$onlynewobj) {
- $this->offsets[$obj_id] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
- $this->_out($obj_id.' 0 obj');
- $this->_current_obj_id = $obj_id; // for later use with encryption
- }
- }
-
- /**
- * Writes a value
- * Needed to rebuild the source document
- *
- * @param mixed $value A PDF-Value. Structure of values see cases in this method
- */
- function pdf_write_value(&$value)
- {
- if (is_subclass_of($this, 'TCPDF')) {
- parent::pdf_write_value($value);
- }
-
- switch ($value[0]) {
-
- case PDF_TYPE_TOKEN :
- $this->_straightOut($value[1] . ' ');
- break;
- case PDF_TYPE_NUMERIC :
- case PDF_TYPE_REAL :
- if (is_float($value[1]) && $value[1] != 0) {
- $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') .' ');
- } else {
- $this->_straightOut($value[1] . ' ');
- }
- break;
-
- case PDF_TYPE_ARRAY :
-
- // An array. Output the proper
- // structure and move on.
-
- $this->_straightOut('[');
- for ($i = 0; $i < count($value[1]); $i++) {
- $this->pdf_write_value($value[1][$i]);
- }
-
- $this->_out(']');
- break;
-
- case PDF_TYPE_DICTIONARY :
-
- // A dictionary.
- $this->_straightOut('<<');
-
- reset ($value[1]);
-
- while (list($k, $v) = each($value[1])) {
- $this->_straightOut($k . ' ');
- $this->pdf_write_value($v);
- }
-
- $this->_straightOut('>>');
- break;
-
- case PDF_TYPE_OBJREF :
-
- // An indirect object reference
- // Fill the object stack if needed
- $cpfn =& $this->current_parser->filename;
-
- if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
- $this->_newobj(false,true);
- $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
- $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value); // Value is maybee obsolete!!!
- }
- $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
-
- $this->_out($objid.' 0 R');
- break;
-
- case PDF_TYPE_STRING :
-
- // A string.
- $this->_straightOut('('.$value[1].')');
-
- break;
-
- case PDF_TYPE_STREAM :
-
- // A stream. First, output the
- // stream dictionary, then the
- // stream data itself.
- $this->pdf_write_value($value[1]);
- $this->_out('stream');
- $this->_out($value[2][1]);
- $this->_out('endstream');
- break;
- case PDF_TYPE_HEX :
- $this->_straightOut('<'.$value[1].'>');
- break;
-
- case PDF_TYPE_BOOLEAN :
- $this->_straightOut($value[1] ? 'true ' : 'false ');
- break;
-
- case PDF_TYPE_NULL :
- // The null object.
-
- $this->_straightOut('null ');
- break;
- }
- }
-
-
- /**
- * Modified so not each call will add a newline to the output.
- */
- function _straightOut($s) {
- if (!is_subclass_of($this, 'TCPDF')) {
- if($this->state==2)
- $this->pages[$this->page] .= $s;
- else
- $this->buffer .= $s;
- } else {
- if ($this->state == 2) {
- if (isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
- // puts data before page footer
- $page = substr($this->getPageBuffer($this->page), 0, -$this->footerlen[$this->page]);
- $footer = substr($this->getPageBuffer($this->page), -$this->footerlen[$this->page]);
- $this->setPageBuffer($this->page, $page.' '.$s."\n".$footer);
- } else {
- $this->setPageBuffer($this->page, $s, true);
- }
- } else {
- $this->setBuffer($s);
- }
- }
- }
-
- /**
- * rewritten to close opened parsers
- *
- */
- function _enddoc() {
- parent::_enddoc();
- $this->_closeParsers();
- }
-
- /**
- * close all files opened by parsers
- */
- function _closeParsers() {
- if ($this->state > 2 && count($this->parsers) > 0) {
- foreach ($this->parsers as $k => $_){
- $this->parsers[$k]->closeFile();
- $this->parsers[$k] = null;
- unset($this->parsers[$k]);
- }
- return true;
- }
- return false;
- }
-
-}
\ No newline at end of file
Deleted: trunk/fpdi/fpdi2tcpdf_bridge.php
===================================================================
--- trunk/fpdi/fpdi2tcpdf_bridge.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi2tcpdf_bridge.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,171 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-/**
- * This class is used as a bridge between TCPDF and FPDI
- * and will create the possibility to use both FPDF and TCPDF
- * via one FPDI version.
- *
- * We'll simply remap TCPDF to FPDF again.
- *
- * It'll be loaded and extended by FPDF_TPL.
- */
-class FPDF extends TCPDF {
-
- function __get($name) {
- switch ($name) {
- case 'PDFVersion':
- return $this->PDFVersion;
- case 'k':
- return $this->k;
- default:
- // Error handling
- $this->Error('Cannot access protected property '.get_class($this).':$'.$name.' / Undefined property: '.get_class($this).'::$'.$name);
- }
- }
-
- function __set($name, $value) {
- switch ($name) {
- case 'PDFVersion':
- $this->PDFVersion = $value;
- break;
- default:
- // Error handling
- $this->Error('Cannot access protected property '.get_class($this).':$'.$name.' / Undefined property: '.get_class($this).'::$'.$name);
- }
- }
-
- /**
- * Encryption of imported data by FPDI
- *
- * @param array $value
- */
- function pdf_write_value(&$value) {
- switch ($value[0]) {
- case PDF_TYPE_STRING :
- if ($this->encrypted) {
- $value[1] = $this->_unescape($value[1]);
- $value[1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[1]);
- $value[1] = $this->_escape($value[1]);
- }
- break;
-
- case PDF_TYPE_STREAM :
- if ($this->encrypted) {
- $value[2][1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[2][1]);
- }
- break;
-
- case PDF_TYPE_HEX :
- if ($this->encrypted) {
- $value[1] = $this->hex2str($value[1]);
- $value[1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[1]);
-
- // remake hexstring of encrypted string
- $value[1] = $this->str2hex($value[1]);
- }
- break;
- }
- }
-
- /**
- * Unescapes a PDF string
- *
- * @param string $s
- * @return string
- */
- function _unescape($s) {
- $out = '';
- for ($count = 0, $n = strlen($s); $count < $n; $count++) {
- if ($s[$count] != '\\' || $count == $n-1) {
- $out .= $s[$count];
- } else {
- switch ($s[++$count]) {
- case ')':
- case '(':
- case '\\':
- $out .= $s[$count];
- break;
- case 'f':
- $out .= chr(0x0C);
- break;
- case 'b':
- $out .= chr(0x08);
- break;
- case 't':
- $out .= chr(0x09);
- break;
- case 'r':
- $out .= chr(0x0D);
- break;
- case 'n':
- $out .= chr(0x0A);
- break;
- case "\r":
- if ($count != $n-1 && $s[$count+1] == "\n")
- $count++;
- break;
- case "\n":
- break;
- default:
- // Octal-Values
- if (ord($s[$count]) >= ord('0') &&
- ord($s[$count]) <= ord('9')) {
- $oct = ''. $s[$count];
-
- if (ord($s[$count+1]) >= ord('0') &&
- ord($s[$count+1]) <= ord('9')) {
- $oct .= $s[++$count];
-
- if (ord($s[$count+1]) >= ord('0') &&
- ord($s[$count+1]) <= ord('9')) {
- $oct .= $s[++$count];
- }
- }
-
- $out .= chr(octdec($oct));
- } else {
- $out .= $s[$count];
- }
- }
- }
- }
- return $out;
- }
-
- /**
- * Hexadecimal to string
- *
- * @param string $hex
- * @return string
- */
- function hex2str($hex) {
- return pack('H*', str_replace(array("\r", "\n", ' '), '', $hex));
- }
-
- /**
- * String to hexadecimal
- *
- * @param string $str
- * @return string
- */
- function str2hex($str) {
- return current(unpack('H*', $str));
- }
-}
\ No newline at end of file
Deleted: trunk/fpdi/fpdi_pdf_parser.php
===================================================================
--- trunk/fpdi/fpdi_pdf_parser.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi_pdf_parser.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,384 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-require_once('pdf_parser.php');
-
-class fpdi_pdf_parser extends pdf_parser {
-
- /**
- * Pages
- * Index beginns at 0
- *
- * @var array
- */
- var $pages;
-
- /**
- * Page count
- * @var integer
- */
- var $page_count;
-
- /**
- * actual page number
- * @var integer
- */
- var $pageno;
-
- /**
- * PDF Version of imported Document
- * @var string
- */
- var $pdfVersion;
-
- /**
- * FPDI Reference
- * @var object
- */
- var $fpdi;
-
- /**
- * Available BoxTypes
- *
- * @var array
- */
- var $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
-
- /**
- * Constructor
- *
- * @param string $filename Source-Filename
- * @param object $fpdi Object of type fpdi
- */
- function fpdi_pdf_parser($filename, &$fpdi) {
- $this->fpdi =& $fpdi;
-
- parent::pdf_parser($filename);
-
- // resolve Pages-Dictonary
- $pages = $this->pdf_resolve_object($this->c, $this->root[1][1]['/Pages']);
-
- // Read pages
- $this->read_pages($this->c, $pages, $this->pages);
-
- // count pages;
- $this->page_count = count($this->pages);
- }
-
- /**
- * Overwrite parent::error()
- *
- * @param string $msg Error-Message
- */
- function error($msg) {
- $this->fpdi->error($msg);
- }
-
- /**
- * Get pagecount from sourcefile
- *
- * @return int
- */
- function getPageCount() {
- return $this->page_count;
- }
-
-
- /**
- * Set pageno
- *
- * @param int $pageno Pagenumber to use
- */
- function setPageno($pageno) {
- $pageno = ((int) $pageno) - 1;
-
- if ($pageno < 0 || $pageno >= $this->getPageCount()) {
- $this->fpdi->error('Pagenumber is wrong!');
- }
-
- $this->pageno = $pageno;
- }
-
- /**
- * Get page-resources from current page
- *
- * @return array
- */
- function getPageResources() {
- return $this->_getPageResources($this->pages[$this->pageno]);
- }
-
- /**
- * Get page-resources from /Page
- *
- * @param array $obj Array of pdf-data
- */
- function _getPageResources ($obj) { // $obj = /Page
- $obj = $this->pdf_resolve_object($this->c, $obj);
-
- // If the current object has a resources
- // dictionary associated with it, we use
- // it. Otherwise, we move back to its
- // parent object.
- if (isset ($obj[1][1]['/Resources'])) {
- $res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Resources']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- } else {
- if (!isset ($obj[1][1]['/Parent'])) {
- return false;
- } else {
- $res = $this->_getPageResources($obj[1][1]['/Parent']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- }
- }
- }
-
-
- /**
- * Get content of current page
- *
- * If more /Contents is an array, the streams are concated
- *
- * @return string
- */
- function getContent() {
- $buffer = '';
-
- if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
- $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
- foreach($contents AS $tmp_content) {
- $buffer .= $this->_rebuildContentStream($tmp_content).' ';
- }
- }
-
- return $buffer;
- }
-
-
- /**
- * Resolve all content-objects
- *
- * @param array $content_ref
- * @return array
- */
- function _getPageContent($content_ref) {
- $contents = array();
-
- if ($content_ref[0] == PDF_TYPE_OBJREF) {
- $content = $this->pdf_resolve_object($this->c, $content_ref);
- if ($content[1][0] == PDF_TYPE_ARRAY) {
- $contents = $this->_getPageContent($content[1]);
- } else {
- $contents[] = $content;
- }
- } else if ($content_ref[0] == PDF_TYPE_ARRAY) {
- foreach ($content_ref[1] AS $tmp_content_ref) {
- $contents = array_merge($contents,$this->_getPageContent($tmp_content_ref));
- }
- }
-
- return $contents;
- }
-
-
- /**
- * Rebuild content-streams
- *
- * @param array $obj
- * @return string
- */
- function _rebuildContentStream($obj) {
- $filters = array();
-
- if (isset($obj[1][1]['/Filter'])) {
- $_filter = $obj[1][1]['/Filter'];
-
- if ($_filter[0] == PDF_TYPE_TOKEN) {
- $filters[] = $_filter;
- } else if ($_filter[0] == PDF_TYPE_ARRAY) {
- $filters = $_filter[1];
- }
- }
-
- $stream = $obj[2][1];
-
- foreach ($filters AS $_filter) {
- switch ($_filter[1]) {
- case '/FlateDecode':
- if (function_exists('gzuncompress')) {
- $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
- } else {
- $this->fpdi->error(sprintf('To handle %s filter, please compile php with zlib support.',$_filter[1]));
- }
- if ($stream === false) {
- $this->fpdi->error('Error while decompressing stream.');
- }
- break;
- case null:
- $stream = $stream;
- break;
- default:
- if (preg_match('/^\/[a-z85]*$/i', $_filter[1], $filterName) && @include_once('decoders'.$_filter[1].'.php')) {
- $filterName = substr($_filter[1],1);
- if (class_exists($filterName)) {
- $decoder =& new $filterName($this->fpdi);
- $stream = $decoder->decode($stream);
- } else {
- $this->fpdi->error(sprintf('Unsupported Filter: %s',$_filter[1]));
- }
- } else {
- $this->fpdi->error(sprintf('Unsupported Filter: %s',$_filter[1]));
- }
- }
- }
-
- return $stream;
- }
-
-
- /**
- * Get a Box from a page
- * Arrayformat is same as used by fpdf_tpl
- *
- * @param array $page a /Page
- * @param string $box_index Type of Box @see $availableBoxes
- * @return array
- */
- function getPageBox($page, $box_index) {
- $page = $this->pdf_resolve_object($this->c,$page);
- $box = null;
- if (isset($page[1][1][$box_index]))
- $box =& $page[1][1][$box_index];
-
- if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
- $tmp_box = $this->pdf_resolve_object($this->c,$box);
- $box = $tmp_box[1];
- }
-
- if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
- $b =& $box[1];
- return array('x' => $b[0][1]/$this->fpdi->k,
- 'y' => $b[1][1]/$this->fpdi->k,
- 'w' => abs($b[0][1]-$b[2][1])/$this->fpdi->k,
- 'h' => abs($b[1][1]-$b[3][1])/$this->fpdi->k,
- 'llx' => $b[0][1]/$this->fpdi->k,
- 'lly' => $b[1][1]/$this->fpdi->k,
- 'urx' => $b[2][1]/$this->fpdi->k,
- 'ury' => $b[3][1]/$this->fpdi->k,
- );
- } else if (!isset ($page[1][1]['/Parent'])) {
- return false;
- } else {
- return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index);
- }
- }
-
- function getPageBoxes($pageno) {
- return $this->_getPageBoxes($this->pages[$pageno-1]);
- }
-
- /**
- * Get all Boxes from /Page
- *
- * @param array a /Page
- * @return array
- */
- function _getPageBoxes($page) {
- $boxes = array();
-
- foreach($this->availableBoxes AS $box) {
- if ($_box = $this->getPageBox($page,$box)) {
- $boxes[$box] = $_box;
- }
- }
-
- return $boxes;
- }
-
- /**
- * Get the page rotation by pageno
- *
- * @param integer $pageno
- * @return array
- */
- function getPageRotation($pageno) {
- return $this->_getPageRotation($this->pages[$pageno-1]);
- }
-
- function _getPageRotation ($obj) { // $obj = /Page
- $obj = $this->pdf_resolve_object($this->c, $obj);
- if (isset ($obj[1][1]['/Rotate'])) {
- $res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Rotate']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- } else {
- if (!isset ($obj[1][1]['/Parent'])) {
- return false;
- } else {
- $res = $this->_getPageRotation($obj[1][1]['/Parent']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- }
- }
- }
-
- /**
- * Read all /Page(es)
- *
- * @param object pdf_context
- * @param array /Pages
- * @param array the result-array
- */
- function read_pages (&$c, &$pages, &$result) {
- // Get the kids dictionary
- $kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
-
- if (!is_array($kids))
- $this->fpdi->Error('Cannot find /Kids in current /Page-Dictionary');
- foreach ($kids[1] as $v) {
- $pg = $this->pdf_resolve_object ($c, $v);
- if ($pg[1][1]['/Type'][1] === '/Pages') {
- // If one of the kids is an embedded
- // /Pages array, resolve it as well.
- $this->read_pages ($c, $pg, $result);
- } else {
- $result[] = $pg;
- }
- }
- }
-
-
-
- /**
- * Get PDF-Version
- *
- * And reset the PDF Version used in FPDI if needed
- */
- function getPDFVersion() {
- parent::getPDFVersion();
- $this->fpdi->PDFVersion = max($this->fpdi->PDFVersion, $this->pdfVersion);
- }
-
-}
\ No newline at end of file
Deleted: trunk/fpdi/pdf_context.php
===================================================================
--- trunk/fpdi/pdf_context.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/pdf_context.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,97 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-class pdf_context {
-
- /**
- * Modi
- *
- * @var integer 0 = file | 1 = string
- */
- var $_mode = 0;
-
- var $file;
- var $buffer;
- var $offset;
- var $length;
-
- var $stack;
-
- // Constructor
-
- function pdf_context(&$f) {
- $this->file =& $f;
- if (is_string($this->file))
- $this->_mode = 1;
- $this->reset();
- }
-
- // Optionally move the file
- // pointer to a new location
- // and reset the buffered data
-
- function reset($pos = null, $l = 100) {
- if ($this->_mode == 0) {
- if (!is_null ($pos)) {
- fseek ($this->file, $pos);
- }
-
- $this->buffer = $l > 0 ? fread($this->file, $l) : '';
- $this->length = strlen($this->buffer);
- if ($this->length < $l)
- $this->increase_length($l - $this->length);
- } else {
- $this->buffer = $this->file;
- $this->length = strlen($this->buffer);
- }
- $this->offset = 0;
- $this->stack = array();
- }
-
- // Make sure that there is at least one
- // character beyond the current offset in
- // the buffer to prevent the tokenizer
- // from attempting to access data that does
- // not exist
-
- function ensure_content() {
- if ($this->offset >= $this->length - 1) {
- return $this->increase_length();
- } else {
- return true;
- }
- }
-
- // Forcefully read more data into the buffer
-
- function increase_length($l=100) {
- if ($this->_mode == 0 && feof($this->file)) {
- return false;
- } else if ($this->_mode == 0) {
- $totalLength = $this->length + $l;
- do {
- $this->buffer .= fread($this->file, $totalLength-$this->length);
- } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
-
- return true;
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
Deleted: trunk/fpdi/pdf_parser.php
===================================================================
--- trunk/fpdi/pdf_parser.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/pdf_parser.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,694 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-if (!defined ('PDF_TYPE_NULL'))
- define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
- define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
- define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
- define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
- define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
- define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
- define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
- define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
- define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
- define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
- define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
- define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
- define ('PDF_TYPE_REAL', 12);
-
-require_once('pdf_context.php');
-
-class pdf_parser {
-
- /**
- * Filename
- * @var string
- */
- var $filename;
-
- /**
- * File resource
- * @var resource
- */
- var $f;
-
- /**
- * PDF Context
- * @var object pdf_context-Instance
- */
- var $c;
-
- /**
- * xref-Data
- * @var array
- */
- var $xref;
-
- /**
- * root-Object
- * @var array
- */
- var $root;
-
- /**
- * PDF version of the loaded document
- * @var string
- */
- var $pdfVersion;
-
- /**
- * Constructor
- *
- * @param string $filename Source-Filename
- */
- function pdf_parser($filename) {
- $this->filename = $filename;
-
- $this->f = @fopen($this->filename, 'rb');
-
- if (!$this->f)
- $this->error(sprintf('Cannot open %s !', $filename));
-
- $this->getPDFVersion();
-
- $this->c =& new pdf_context($this->f);
-
- // Read xref-Data
- $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
-
- // Check for Encryption
- $this->getEncryption();
-
- // Read root
- $this->pdf_read_root();
- }
-
- /**
- * Close the opened file
- */
- function closeFile() {
- if (isset($this->f)) {
- fclose($this->f);
- unset($this->f);
- }
- }
-
- /**
- * Print Error and die
- *
- * @param string $msg Error-Message
- */
- function error($msg) {
- die('<b>PDF-Parser Error:</b> '.$msg);
- }
-
- /**
- * Check Trailer for Encryption
- */
- function getEncryption() {
- if (isset($this->xref['trailer'][1]['/Encrypt'])) {
- $this->error('File is encrypted!');
- }
- }
-
- /**
- * Find/Return /Root
- *
- * @return array
- */
- function pdf_find_root() {
- if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
- $this->error('Wrong Type of Root-Element! Must be an indirect reference');
- }
- return $this->xref['trailer'][1]['/Root'];
- }
-
- /**
- * Read the /Root
- */
- function pdf_read_root() {
- // read root
- $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
- }
-
- /**
- * Get PDF-Version
- *
- * And reset the PDF Version used in FPDI if needed
- */
- function getPDFVersion() {
- fseek($this->f, 0);
- preg_match('/\d\.\d/',fread($this->f,16),$m);
- if (isset($m[0]))
- $this->pdfVersion = $m[0];
- return $this->pdfVersion;
- }
-
- /**
- * Find the xref-Table
- */
- function pdf_find_xref() {
- $toRead = 1500;
-
- $stat = fseek ($this->f, -$toRead, SEEK_END);
- if ($stat === -1) {
- fseek ($this->f, 0);
- }
- $data = fread($this->f, $toRea...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-20 02:51:11
|
Revision: 4515
http://web-erp.svn.sourceforge.net/web-erp/?rev=4515&view=rev
Author: daintree
Date: 2011-03-20 02:51:01 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
remove redundant files
Modified Paths:
--------------
trunk/UserSettings.php
trunk/WWW_Users.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/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
Removed Paths:
-------------
trunk/fpdi/decoders/
trunk/fpdi/fpdf_tpl.php
trunk/fpdi/fpdi.php
trunk/fpdi/fpdi2tcpdf_bridge.php
trunk/fpdi/fpdi_pdf_parser.php
trunk/fpdi/pdf_context.php
trunk/fpdi/pdf_parser.php
trunk/fpdi/wrapper_functions-borrar.php
trunk/sql/mysql/weberp313iso-demo.sql
trunk/sql/mysql/weberp313iso-new.sql
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/UserSettings.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -130,7 +130,6 @@
if (is_dir('locale/' . $LanguageEntry)
AND $LanguageEntry != '..'
- AND $LanguageEntry != 'CVS'
AND $LanguageEntry != '.svn'
AND $LanguageEntry!='.'){
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/WWW_Users.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -79,7 +79,7 @@
}
//comment out except for demo! Do not want anyone modifying demo user.
/*
- elseif ($_POST['UserID'] == 'demo') {
+ elseif ($_POST['UserID'] == 'admin') {
prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
$InputError = 1;
}
@@ -215,7 +215,7 @@
// comment out except for demo! Do not want anyopne deleting demo user.
/*
- if ($SelectedUser == 'demo') {
+ if ($SelectedUser == 'admin') {
prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
} else {
*/
Deleted: trunk/fpdi/fpdf_tpl.php
===================================================================
--- trunk/fpdi/fpdf_tpl.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdf_tpl.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,409 +0,0 @@
-<?php
-//
-// FPDF_TPL - Version 1.1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-class FPDF_TPL extends FPDF {
- /**
- * Array of Tpl-Data
- * @var array
- */
- var $tpls = array();
-
- /**
- * Current Template-ID
- * @var int
- */
- var $tpl = 0;
-
- /**
- * "In Template"-Flag
- * @var boolean
- */
- var $_intpl = false;
-
- /**
- * Nameprefix of Templates used in Resources-Dictonary
- * @var string A String defining the Prefix used as Template-Object-Names. Have to beginn with an /
- */
- var $tplprefix = "/TPL";
-
- /**
- * Resources used By Templates and Pages
- * @var array
- */
- var $_res = array();
-
- /**
- * Last used Template data
- *
- * @var array
- */
- var $lastUsedTemplateData = array();
-
- /**
- * Start a Template
- *
- * This method starts a template. You can give own coordinates to build an own sized
- * Template. Pay attention, that the margins are adapted to the new templatesize.
- * If you want to write outside the template, for example to build a clipped Template,
- * you have to set the Margins and "Cursor"-Position manual after beginTemplate-Call.
- *
- * If no parameter is given, the template uses the current page-size.
- * The Method returns an ID of the current Template. This ID is used later for using this template.
- * Warning: A created Template is used in PDF at all events. Still if you don't use it after creation!
- *
- * @param int $x The x-coordinate given in user-unit
- * @param int $y The y-coordinate given in user-unit
- * @param int $w The width given in user-unit
- * @param int $h The height given in user-unit
- * @return int The ID of new created Template
- */
- function beginTemplate($x=null, $y=null, $w=null, $h=null) {
- if ($this->page <= 0)
- $this->error("You have to add a page to fpdf first!");
-
- if ($x == null)
- $x = 0;
- if ($y == null)
- $y = 0;
- if ($w == null)
- $w = $this->w;
- if ($h == null)
- $h = $this->h;
-
- // Save settings
- $this->tpl++;
- $tpl =& $this->tpls[$this->tpl];
- $tpl = array(
- 'o_x' => $this->x,
- 'o_y' => $this->y,
- 'o_AutoPageBreak' => $this->AutoPageBreak,
- 'o_bMargin' => $this->bMargin,
- 'o_tMargin' => $this->tMargin,
- 'o_lMargin' => $this->lMargin,
- 'o_rMargin' => $this->rMargin,
- 'o_h' => $this->h,
- 'o_w' => $this->w,
- 'buffer' => '',
- 'x' => $x,
- 'y' => $y,
- 'w' => $w,
- 'h' => $h
- );
-
- $this->SetAutoPageBreak(false);
-
- // Define own high and width to calculate possitions correct
- $this->h = $h;
- $this->w = $w;
-
- $this->_intpl = true;
- $this->SetXY($x+$this->lMargin, $y+$this->tMargin);
- $this->SetRightMargin($this->w-$w+$this->rMargin);
-
- return $this->tpl;
- }
-
- /**
- * End Template
- *
- * This method ends a template and reset initiated variables on beginTemplate.
- *
- * @return mixed If a template is opened, the ID is returned. If not a false is returned.
- */
- function endTemplate() {
- if ($this->_intpl) {
- $this->_intpl = false;
- $tpl =& $this->tpls[$this->tpl];
- $this->SetXY($tpl['o_x'], $tpl['o_y']);
- $this->tMargin = $tpl['o_tMargin'];
- $this->lMargin = $tpl['o_lMargin'];
- $this->rMargin = $tpl['o_rMargin'];
- $this->h = $tpl['o_h'];
- $this->w = $tpl['o_w'];
- $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
-
- return $this->tpl;
- } else {
- return false;
- }
- }
-
- /**
- * Use a Template in current Page or other Template
- *
- * You can use a template in a page or in another template.
- * You can give the used template a new size like you use the Image()-method.
- * All parameters are optional. The width or height is calculated automaticaly
- * if one is given. If no parameter is given the origin size as defined in
- * beginTemplate() is used.
- * The calculated or used width and height are returned as an array.
- *
- * @param int $tplidx A valid template-Id
- * @param int $_x The x-position
- * @param int $_y The y-position
- * @param int $_w The new width of the template
- * @param int $_h The new height of the template
- * @retrun array The height and width of the template
- */
- function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0) {
- if ($this->page <= 0)
- $this->error("You have to add a page to fpdf first!");
-
- if (!isset($this->tpls[$tplidx]))
- $this->error("Template does not exist!");
-
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
- }
-
- $tpl =& $this->tpls[$tplidx];
- $w = $tpl['w'];
- $h = $tpl['h'];
-
- if ($_x == null)
- $_x = 0;
- if ($_y == null)
- $_y = 0;
-
- $_x += $tpl['x'];
- $_y += $tpl['y'];
-
- $wh = $this->getTemplateSize($tplidx, $_w, $_h);
- $_w = $wh['w'];
- $_h = $wh['h'];
-
- $tData = array(
- 'x' => $this->x,
- 'y' => $this->y,
- 'w' => $_w,
- 'h' => $_h,
- 'scaleX' => ($_w/$w),
- 'scaleY' => ($_h/$h),
- 'tx' => $_x,
- 'ty' => ($this->h-$_y-$_h),
- 'lty' => ($this->h-$_y-$_h) - ($this->h-$h) * ($_h/$h)
- );
-
- $this->_out(sprintf("q %.4F 0 0 %.4F %.4F %.4F cm", $tData['scaleX'], $tData['scaleY'], $tData['tx']*$this->k, $tData['ty']*$this->k)); // Translate
- $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
-
- $this->lastUsedTemplateData = $tData;
-
- return array("w" => $_w, "h" => $_h);
- }
-
- /**
- * Get The calculated Size of a Template
- *
- * If one size is given, this method calculates the other one.
- *
- * @param int $tplidx A valid template-Id
- * @param int $_w The width of the template
- * @param int $_h The height of the template
- * @return array The height and width of the template
- */
- function getTemplateSize($tplidx, $_w=0, $_h=0) {
- if (!$this->tpls[$tplidx])
- return false;
-
- $tpl =& $this->tpls[$tplidx];
- $w = $tpl['w'];
- $h = $tpl['h'];
-
- if ($_w == 0 and $_h == 0) {
- $_w = $w;
- $_h = $h;
- }
-
- if($_w==0)
- $_w = $_h*$w/$h;
- if($_h==0)
- $_h = $_w*$h/$w;
-
- return array("w" => $_w, "h" => $_h);
- }
-
- /**
- * See FPDF/TCPDF-Documentation ;-)
- */
- function SetFont($family, $style='', $size=0, $fontfile='') {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 3) {
- $this->Error('More than 3 arguments for the SetFont method are only available in TCPDF.');
- }
- /**
- * force the resetting of font changes in a template
- */
- if ($this->_intpl)
- $this->FontFamily = '';
-
- parent::SetFont($family, $style, $size, $fontfile);
-
- $fontkey = $this->FontFamily.$this->FontStyle;
-
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
- } else {
- $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
- }
- }
-
- /**
- * See FPDF/TCPDF-Documentation ;-)
- */
- function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false) {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 7) {
- $this->Error('More than 7 arguments for the Image method are only available in TCPDF.');
- }
-
- parent::Image($file, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $ismask, $imgmask, $border, $fitbox, $hidden, $fitonpage);
- if ($this->_intpl) {
- $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
- } else {
- $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
- }
- }
-
- /**
- * See FPDF-Documentation ;-)
- *
- * AddPage is not available when you're "in" a template.
- */
- function AddPage($orientation='', $format='', $keepmargins=false) {
- if ($this->_intpl)
- $this->Error('Adding pages in templates isn\'t possible!');
- parent::AddPage($orientation, $format);
- }
-
- /**
- * Preserve adding Links in Templates ...won't work
- */
- function Link($x, $y, $w, $h, $link, $spaces=0) {
- if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 5) {
- $this->Error('More than 7 arguments for the Image method are only available in TCPDF.');
- }
-
- if ($this->_intpl)
- $this->Error('Using links in templates aren\'t possible!');
- parent::Link($x, $y, $w, $h, $link, $spaces);
- }
-
- function AddLink() {
- if ($this->_intpl)
- $this->Error('Adding links in templates aren\'t possible!');
- return parent::AddLink();
- }
-
- function SetLink($link, $y=0, $page=-1) {
- if ($this->_intpl)
- $this->Error('Setting links in templates aren\'t possible!');
- parent::SetLink($link, $y, $page);
- }
-
- /**
- * Private Method that writes the form xobjects
- */
- function _putformxobjects() {
- $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
- reset($this->tpls);
- foreach($this->tpls AS $tplidx => $tpl) {
-
- $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
- $this->_newobj();
- $this->tpls[$tplidx]['n'] = $this->n;
- $this->_out('<<'.$filter.'/Type /XObject');
- $this->_out('/Subtype /Form');
- $this->_out('/FormType 1');
- $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
- // llx
- $tpl['x'],
- // lly
- -$tpl['y'],
- // urx
- ($tpl['w']+$tpl['x'])*$this->k,
- // ury
- ($tpl['h']-$tpl['y'])*$this->k
- ));
-
- if ($tpl['x'] != 0 || $tpl['y'] != 0) {
- $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
- -$tpl['x']*$this->k*2, $tpl['y']*$this->k*2
- ));
- }
-
- $this->_out('/Resources ');
-
- $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
- if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
- $this->_out('/Font <<');
- foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
- $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
- $this->_out('>>');
- }
- if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
- isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
- {
- $this->_out('/XObject <<');
- if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
- foreach($this->_res['tpl'][$tplidx]['images'] as $image)
- $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
- }
- if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
- foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
- $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
- }
- $this->_out('>>');
- }
- $this->_out('>>');
-
- $this->_out('/Length '.strlen($p).' >>');
- $this->_putstream($p);
- $this->_out('endobj');
- }
- }
-
- /**
- * Overwritten to add _putformxobjects() after _putimages()
- *
- */
- function _putimages() {
- parent::_putimages();
- $this->_putformxobjects();
- }
-
- function _putxobjectdict() {
- parent::_putxobjectdict();
-
- if (count($this->tpls)) {
- foreach($this->tpls as $tplidx => $tpl) {
- $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
- }
- }
- }
-
- /**
- * Private Method
- */
- function _out($s) {
- if ($this->state==2 && $this->_intpl) {
- $this->tpls[$this->tpl]['buffer'] .= $s."\n";
- } else {
- parent::_out($s);
- }
- }
-}
Deleted: trunk/fpdi/fpdi.php
===================================================================
--- trunk/fpdi/fpdi.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,504 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-define('FPDI_VERSION','1.3');
-
-// Check for TCPDF and remap TCPDF to FPDF
-if (class_exists('TCPDF')) {
- require_once('fpdi2tcpdf_bridge.php');
-}
-
-require_once('fpdf_tpl.php');
-require_once('fpdi_pdf_parser.php');
-
-
-class FPDI extends FPDF_TPL {
- /**
- * Actual filename
- * @var string
- */
- var $current_filename;
-
- /**
- * Parser-Objects
- * @var array
- */
- var $parsers;
-
- /**
- * Current parser
- * @var object
- */
- var $current_parser;
-
- /**
- * object stack
- * @var array
- */
- var $_obj_stack;
-
- /**
- * done object stack
- * @var array
- */
- var $_don_obj_stack;
-
- /**
- * Current Object Id.
- * @var integer
- */
- var $_current_obj_id;
-
- /**
- * The name of the last imported page box
- * @var string
- */
- var $lastUsedPageBox;
-
- var $_importedPages = array();
-
-
- /**
- * Set a source-file
- *
- * @param string $filename a valid filename
- * @return int number of available pages
- */
- function setSourceFile($filename) {
- $this->current_filename = $filename;
- $fn =& $this->current_filename;
-
- if (!isset($this->parsers[$fn]))
- $this->parsers[$fn] = new fpdi_pdf_parser($fn, $this);
- $this->current_parser =& $this->parsers[$fn];
-
- return $this->parsers[$fn]->getPageCount();
- }
-
- /**
- * Import a page
- *
- * @param int $pageno pagenumber
- * @return int Index of imported page - to use with fpdf_tpl::useTemplate()
- */
- function importPage($pageno, $boxName='/CropBox') {
- if ($this->_intpl) {
- return $this->error('Please import the desired pages before creating a new template.');
- }
-
- $fn =& $this->current_filename;
-
- // check if page already imported
- $pageKey = $fn.((int)$pageno).$boxName;
- if (isset($this->_importedPages[$pageKey]))
- return $this->_importedPages[$pageKey];
-
- $parser =& $this->parsers[$fn];
- $parser->setPageno($pageno);
-
- $this->tpl++;
- $this->tpls[$this->tpl] = array();
- $tpl =& $this->tpls[$this->tpl];
- $tpl['parser'] =& $parser;
- $tpl['resources'] = $parser->getPageResources();
- $tpl['buffer'] = $parser->getContent();
-
- if (!in_array($boxName, $parser->availableBoxes))
- return $this->Error(sprintf('Unknown box: %s', $boxName));
- $pageboxes = $parser->getPageBoxes($pageno);
-
- /**
- * MediaBox
- * CropBox: Default -> MediaBox
- * BleedBox: Default -> CropBox
- * TrimBox: Default -> CropBox
- * ArtBox: Default -> CropBox
- */
- if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
- $boxName = '/CropBox';
- if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
- $boxName = '/MediaBox';
-
- if (!isset($pageboxes[$boxName]))
- return false;
- $this->lastUsedPageBox = $boxName;
-
- $box = $pageboxes[$boxName];
- $tpl['box'] = $box;
-
- // To build an array that can be used by PDF_TPL::useTemplate()
- $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl],$box);
-
- // An imported page will start at 0,0 everytime. Translation will be set in _putformxobjects()
- $tpl['x'] = 0;
- $tpl['y'] = 0;
-
- $page =& $parser->pages[$parser->pageno];
-
- // handle rotated pages
- $rotation = $parser->getPageRotation($pageno);
- $tpl['_rotationAngle'] = 0;
- if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
- $steps = $angle / 90;
-
- $_w = $tpl['w'];
- $_h = $tpl['h'];
- $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
- $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
-
- $tpl['_rotationAngle'] = $angle*-1;
- }
-
- $this->_importedPages[$pageKey] = $this->tpl;
-
- return $this->tpl;
- }
-
- function getLastUsedPageBox() {
- return $this->lastUsedPageBox;
- }
-
- function useTemplate($tplidx, $_x=null, $_y=null, $_w=0, $_h=0, $adjustPageSize=false) {
- if ($adjustPageSize == true && is_null($_x) && is_null($_y)) {
- $size = $this->getTemplateSize($tplidx, $_w, $_h);
- $format = array($size['w'], $size['h']);
- if ($format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1]) {
- $this->w=$format[0];
- $this->h=$format[1];
- $this->wPt=$this->w*$this->k;
- $this->hPt=$this->h*$this->k;
- $this->PageBreakTrigger=$this->h-$this->bMargin;
- $this->CurPageFormat=$format;
- $this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
- }
- }
-
- $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
- $s = parent::useTemplate($tplidx, $_x, $_y, $_w, $_h);
- $this->_out('Q');
- return $s;
- }
-
- /**
- * Private method, that rebuilds all needed objects of source files
- */
- function _putimportedobjects() {
- if (is_array($this->parsers) && count($this->parsers) > 0) {
- foreach($this->parsers AS $filename => $p) {
- $this->current_parser =& $this->parsers[$filename];
- if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
- while(($n = key($this->_obj_stack[$filename])) !== null) {
- $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c,$this->_obj_stack[$filename][$n][1]);
-
- $this->_newobj($this->_obj_stack[$filename][$n][0]);
-
- if ($nObj[0] == PDF_TYPE_STREAM) {
- $this->pdf_write_value ($nObj);
- } else {
- $this->pdf_write_value ($nObj[1]);
- }
-
- $this->_out('endobj');
- $this->_obj_stack[$filename][$n] = null; // free memory
- unset($this->_obj_stack[$filename][$n]);
- reset($this->_obj_stack[$filename]);
- }
- }
- }
- }
- }
-
-
- /**
- * Private Method that writes the form xobjects
- */
- function _putformxobjects() {
- $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
- reset($this->tpls);
- foreach($this->tpls AS $tplidx => $tpl) {
- $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
- $this->_newobj();
- $cN = $this->n; // TCPDF/Protection: rem current "n"
-
- $this->tpls[$tplidx]['n'] = $this->n;
- $this->_out('<<'.$filter.'/Type /XObject');
- $this->_out('/Subtype /Form');
- $this->_out('/FormType 1');
-
- $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
- (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x'])*$this->k,
- (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y'])*$this->k,
- (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x'])*$this->k,
- (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h']-$tpl['y'])*$this->k
- ));
-
- $c = 1;
- $s = 0;
- $tx = 0;
- $ty = 0;
-
- if (isset($tpl['box'])) {
- $tx = -$tpl['box']['llx'];
- $ty = -$tpl['box']['lly'];
-
- if ($tpl['_rotationAngle'] <> 0) {
- $angle = $tpl['_rotationAngle'] * M_PI/180;
- $c=cos($angle);
- $s=sin($angle);
-
- switch($tpl['_rotationAngle']) {
- case -90:
- $tx = -$tpl['box']['lly'];
- $ty = $tpl['box']['urx'];
- break;
- case -180:
- $tx = $tpl['box']['urx'];
- $ty = $tpl['box']['ury'];
- break;
- case -270:
- $tx = $tpl['box']['ury'];
- $ty = 0;
- break;
- }
- }
- } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
- $tx = -$tpl['x']*2;
- $ty = $tpl['y']*2;
- }
-
- $tx *= $this->k;
- $ty *= $this->k;
-
- if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
- $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
- $c, $s, -$s, $c, $tx, $ty
- ));
- }
-
- $this->_out('/Resources ');
-
- if (isset($tpl['resources'])) {
- $this->current_parser =& $tpl['parser'];
- $this->pdf_write_value($tpl['resources']); // "n" will be changed
- } else {
- $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
- if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
- $this->_out('/Font <<');
- foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
- $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
- $this->_out('>>');
- }
- if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
- isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
- {
- $this->_out('/XObject <<');
- if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
- foreach($this->_res['tpl'][$tplidx]['images'] as $image)
- $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
- }
- if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
- foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
- $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
- }
- $this->_out('>>');
- }
- $this->_out('>>');
- }
-
- $nN = $this->n; // TCPDF: rem new "n"
- $this->n = $cN; // TCPDF: reset to current "n"
- $this->_out('/Length '.strlen($p).' >>');
- $this->_putstream($p);
- $this->_out('endobj');
- $this->n = $nN; // TCPDF: reset to new "n"
- }
-
- $this->_putimportedobjects();
- }
-
- /**
- * Rewritten to handle existing own defined objects
- */
- function _newobj($obj_id=false,$onlynewobj=false) {
- if (!$obj_id) {
- $obj_id = ++$this->n;
- }
-
- //Begin a new object
- if (!$onlynewobj) {
- $this->offsets[$obj_id] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
- $this->_out($obj_id.' 0 obj');
- $this->_current_obj_id = $obj_id; // for later use with encryption
- }
- }
-
- /**
- * Writes a value
- * Needed to rebuild the source document
- *
- * @param mixed $value A PDF-Value. Structure of values see cases in this method
- */
- function pdf_write_value(&$value)
- {
- if (is_subclass_of($this, 'TCPDF')) {
- parent::pdf_write_value($value);
- }
-
- switch ($value[0]) {
-
- case PDF_TYPE_TOKEN :
- $this->_straightOut($value[1] . ' ');
- break;
- case PDF_TYPE_NUMERIC :
- case PDF_TYPE_REAL :
- if (is_float($value[1]) && $value[1] != 0) {
- $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') .' ');
- } else {
- $this->_straightOut($value[1] . ' ');
- }
- break;
-
- case PDF_TYPE_ARRAY :
-
- // An array. Output the proper
- // structure and move on.
-
- $this->_straightOut('[');
- for ($i = 0; $i < count($value[1]); $i++) {
- $this->pdf_write_value($value[1][$i]);
- }
-
- $this->_out(']');
- break;
-
- case PDF_TYPE_DICTIONARY :
-
- // A dictionary.
- $this->_straightOut('<<');
-
- reset ($value[1]);
-
- while (list($k, $v) = each($value[1])) {
- $this->_straightOut($k . ' ');
- $this->pdf_write_value($v);
- }
-
- $this->_straightOut('>>');
- break;
-
- case PDF_TYPE_OBJREF :
-
- // An indirect object reference
- // Fill the object stack if needed
- $cpfn =& $this->current_parser->filename;
-
- if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
- $this->_newobj(false,true);
- $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
- $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value); // Value is maybee obsolete!!!
- }
- $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
-
- $this->_out($objid.' 0 R');
- break;
-
- case PDF_TYPE_STRING :
-
- // A string.
- $this->_straightOut('('.$value[1].')');
-
- break;
-
- case PDF_TYPE_STREAM :
-
- // A stream. First, output the
- // stream dictionary, then the
- // stream data itself.
- $this->pdf_write_value($value[1]);
- $this->_out('stream');
- $this->_out($value[2][1]);
- $this->_out('endstream');
- break;
- case PDF_TYPE_HEX :
- $this->_straightOut('<'.$value[1].'>');
- break;
-
- case PDF_TYPE_BOOLEAN :
- $this->_straightOut($value[1] ? 'true ' : 'false ');
- break;
-
- case PDF_TYPE_NULL :
- // The null object.
-
- $this->_straightOut('null ');
- break;
- }
- }
-
-
- /**
- * Modified so not each call will add a newline to the output.
- */
- function _straightOut($s) {
- if (!is_subclass_of($this, 'TCPDF')) {
- if($this->state==2)
- $this->pages[$this->page] .= $s;
- else
- $this->buffer .= $s;
- } else {
- if ($this->state == 2) {
- if (isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
- // puts data before page footer
- $page = substr($this->getPageBuffer($this->page), 0, -$this->footerlen[$this->page]);
- $footer = substr($this->getPageBuffer($this->page), -$this->footerlen[$this->page]);
- $this->setPageBuffer($this->page, $page.' '.$s."\n".$footer);
- } else {
- $this->setPageBuffer($this->page, $s, true);
- }
- } else {
- $this->setBuffer($s);
- }
- }
- }
-
- /**
- * rewritten to close opened parsers
- *
- */
- function _enddoc() {
- parent::_enddoc();
- $this->_closeParsers();
- }
-
- /**
- * close all files opened by parsers
- */
- function _closeParsers() {
- if ($this->state > 2 && count($this->parsers) > 0) {
- foreach ($this->parsers as $k => $_){
- $this->parsers[$k]->closeFile();
- $this->parsers[$k] = null;
- unset($this->parsers[$k]);
- }
- return true;
- }
- return false;
- }
-
-}
\ No newline at end of file
Deleted: trunk/fpdi/fpdi2tcpdf_bridge.php
===================================================================
--- trunk/fpdi/fpdi2tcpdf_bridge.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi2tcpdf_bridge.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,171 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-/**
- * This class is used as a bridge between TCPDF and FPDI
- * and will create the possibility to use both FPDF and TCPDF
- * via one FPDI version.
- *
- * We'll simply remap TCPDF to FPDF again.
- *
- * It'll be loaded and extended by FPDF_TPL.
- */
-class FPDF extends TCPDF {
-
- function __get($name) {
- switch ($name) {
- case 'PDFVersion':
- return $this->PDFVersion;
- case 'k':
- return $this->k;
- default:
- // Error handling
- $this->Error('Cannot access protected property '.get_class($this).':$'.$name.' / Undefined property: '.get_class($this).'::$'.$name);
- }
- }
-
- function __set($name, $value) {
- switch ($name) {
- case 'PDFVersion':
- $this->PDFVersion = $value;
- break;
- default:
- // Error handling
- $this->Error('Cannot access protected property '.get_class($this).':$'.$name.' / Undefined property: '.get_class($this).'::$'.$name);
- }
- }
-
- /**
- * Encryption of imported data by FPDI
- *
- * @param array $value
- */
- function pdf_write_value(&$value) {
- switch ($value[0]) {
- case PDF_TYPE_STRING :
- if ($this->encrypted) {
- $value[1] = $this->_unescape($value[1]);
- $value[1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[1]);
- $value[1] = $this->_escape($value[1]);
- }
- break;
-
- case PDF_TYPE_STREAM :
- if ($this->encrypted) {
- $value[2][1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[2][1]);
- }
- break;
-
- case PDF_TYPE_HEX :
- if ($this->encrypted) {
- $value[1] = $this->hex2str($value[1]);
- $value[1] = $this->_RC4($this->_objectkey($this->_current_obj_id), $value[1]);
-
- // remake hexstring of encrypted string
- $value[1] = $this->str2hex($value[1]);
- }
- break;
- }
- }
-
- /**
- * Unescapes a PDF string
- *
- * @param string $s
- * @return string
- */
- function _unescape($s) {
- $out = '';
- for ($count = 0, $n = strlen($s); $count < $n; $count++) {
- if ($s[$count] != '\\' || $count == $n-1) {
- $out .= $s[$count];
- } else {
- switch ($s[++$count]) {
- case ')':
- case '(':
- case '\\':
- $out .= $s[$count];
- break;
- case 'f':
- $out .= chr(0x0C);
- break;
- case 'b':
- $out .= chr(0x08);
- break;
- case 't':
- $out .= chr(0x09);
- break;
- case 'r':
- $out .= chr(0x0D);
- break;
- case 'n':
- $out .= chr(0x0A);
- break;
- case "\r":
- if ($count != $n-1 && $s[$count+1] == "\n")
- $count++;
- break;
- case "\n":
- break;
- default:
- // Octal-Values
- if (ord($s[$count]) >= ord('0') &&
- ord($s[$count]) <= ord('9')) {
- $oct = ''. $s[$count];
-
- if (ord($s[$count+1]) >= ord('0') &&
- ord($s[$count+1]) <= ord('9')) {
- $oct .= $s[++$count];
-
- if (ord($s[$count+1]) >= ord('0') &&
- ord($s[$count+1]) <= ord('9')) {
- $oct .= $s[++$count];
- }
- }
-
- $out .= chr(octdec($oct));
- } else {
- $out .= $s[$count];
- }
- }
- }
- }
- return $out;
- }
-
- /**
- * Hexadecimal to string
- *
- * @param string $hex
- * @return string
- */
- function hex2str($hex) {
- return pack('H*', str_replace(array("\r", "\n", ' '), '', $hex));
- }
-
- /**
- * String to hexadecimal
- *
- * @param string $str
- * @return string
- */
- function str2hex($str) {
- return current(unpack('H*', $str));
- }
-}
\ No newline at end of file
Deleted: trunk/fpdi/fpdi_pdf_parser.php
===================================================================
--- trunk/fpdi/fpdi_pdf_parser.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/fpdi_pdf_parser.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,384 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-require_once('pdf_parser.php');
-
-class fpdi_pdf_parser extends pdf_parser {
-
- /**
- * Pages
- * Index beginns at 0
- *
- * @var array
- */
- var $pages;
-
- /**
- * Page count
- * @var integer
- */
- var $page_count;
-
- /**
- * actual page number
- * @var integer
- */
- var $pageno;
-
- /**
- * PDF Version of imported Document
- * @var string
- */
- var $pdfVersion;
-
- /**
- * FPDI Reference
- * @var object
- */
- var $fpdi;
-
- /**
- * Available BoxTypes
- *
- * @var array
- */
- var $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
-
- /**
- * Constructor
- *
- * @param string $filename Source-Filename
- * @param object $fpdi Object of type fpdi
- */
- function fpdi_pdf_parser($filename, &$fpdi) {
- $this->fpdi =& $fpdi;
-
- parent::pdf_parser($filename);
-
- // resolve Pages-Dictonary
- $pages = $this->pdf_resolve_object($this->c, $this->root[1][1]['/Pages']);
-
- // Read pages
- $this->read_pages($this->c, $pages, $this->pages);
-
- // count pages;
- $this->page_count = count($this->pages);
- }
-
- /**
- * Overwrite parent::error()
- *
- * @param string $msg Error-Message
- */
- function error($msg) {
- $this->fpdi->error($msg);
- }
-
- /**
- * Get pagecount from sourcefile
- *
- * @return int
- */
- function getPageCount() {
- return $this->page_count;
- }
-
-
- /**
- * Set pageno
- *
- * @param int $pageno Pagenumber to use
- */
- function setPageno($pageno) {
- $pageno = ((int) $pageno) - 1;
-
- if ($pageno < 0 || $pageno >= $this->getPageCount()) {
- $this->fpdi->error('Pagenumber is wrong!');
- }
-
- $this->pageno = $pageno;
- }
-
- /**
- * Get page-resources from current page
- *
- * @return array
- */
- function getPageResources() {
- return $this->_getPageResources($this->pages[$this->pageno]);
- }
-
- /**
- * Get page-resources from /Page
- *
- * @param array $obj Array of pdf-data
- */
- function _getPageResources ($obj) { // $obj = /Page
- $obj = $this->pdf_resolve_object($this->c, $obj);
-
- // If the current object has a resources
- // dictionary associated with it, we use
- // it. Otherwise, we move back to its
- // parent object.
- if (isset ($obj[1][1]['/Resources'])) {
- $res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Resources']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- } else {
- if (!isset ($obj[1][1]['/Parent'])) {
- return false;
- } else {
- $res = $this->_getPageResources($obj[1][1]['/Parent']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- }
- }
- }
-
-
- /**
- * Get content of current page
- *
- * If more /Contents is an array, the streams are concated
- *
- * @return string
- */
- function getContent() {
- $buffer = '';
-
- if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
- $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
- foreach($contents AS $tmp_content) {
- $buffer .= $this->_rebuildContentStream($tmp_content).' ';
- }
- }
-
- return $buffer;
- }
-
-
- /**
- * Resolve all content-objects
- *
- * @param array $content_ref
- * @return array
- */
- function _getPageContent($content_ref) {
- $contents = array();
-
- if ($content_ref[0] == PDF_TYPE_OBJREF) {
- $content = $this->pdf_resolve_object($this->c, $content_ref);
- if ($content[1][0] == PDF_TYPE_ARRAY) {
- $contents = $this->_getPageContent($content[1]);
- } else {
- $contents[] = $content;
- }
- } else if ($content_ref[0] == PDF_TYPE_ARRAY) {
- foreach ($content_ref[1] AS $tmp_content_ref) {
- $contents = array_merge($contents,$this->_getPageContent($tmp_content_ref));
- }
- }
-
- return $contents;
- }
-
-
- /**
- * Rebuild content-streams
- *
- * @param array $obj
- * @return string
- */
- function _rebuildContentStream($obj) {
- $filters = array();
-
- if (isset($obj[1][1]['/Filter'])) {
- $_filter = $obj[1][1]['/Filter'];
-
- if ($_filter[0] == PDF_TYPE_TOKEN) {
- $filters[] = $_filter;
- } else if ($_filter[0] == PDF_TYPE_ARRAY) {
- $filters = $_filter[1];
- }
- }
-
- $stream = $obj[2][1];
-
- foreach ($filters AS $_filter) {
- switch ($_filter[1]) {
- case '/FlateDecode':
- if (function_exists('gzuncompress')) {
- $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
- } else {
- $this->fpdi->error(sprintf('To handle %s filter, please compile php with zlib support.',$_filter[1]));
- }
- if ($stream === false) {
- $this->fpdi->error('Error while decompressing stream.');
- }
- break;
- case null:
- $stream = $stream;
- break;
- default:
- if (preg_match('/^\/[a-z85]*$/i', $_filter[1], $filterName) && @include_once('decoders'.$_filter[1].'.php')) {
- $filterName = substr($_filter[1],1);
- if (class_exists($filterName)) {
- $decoder =& new $filterName($this->fpdi);
- $stream = $decoder->decode($stream);
- } else {
- $this->fpdi->error(sprintf('Unsupported Filter: %s',$_filter[1]));
- }
- } else {
- $this->fpdi->error(sprintf('Unsupported Filter: %s',$_filter[1]));
- }
- }
- }
-
- return $stream;
- }
-
-
- /**
- * Get a Box from a page
- * Arrayformat is same as used by fpdf_tpl
- *
- * @param array $page a /Page
- * @param string $box_index Type of Box @see $availableBoxes
- * @return array
- */
- function getPageBox($page, $box_index) {
- $page = $this->pdf_resolve_object($this->c,$page);
- $box = null;
- if (isset($page[1][1][$box_index]))
- $box =& $page[1][1][$box_index];
-
- if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
- $tmp_box = $this->pdf_resolve_object($this->c,$box);
- $box = $tmp_box[1];
- }
-
- if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
- $b =& $box[1];
- return array('x' => $b[0][1]/$this->fpdi->k,
- 'y' => $b[1][1]/$this->fpdi->k,
- 'w' => abs($b[0][1]-$b[2][1])/$this->fpdi->k,
- 'h' => abs($b[1][1]-$b[3][1])/$this->fpdi->k,
- 'llx' => $b[0][1]/$this->fpdi->k,
- 'lly' => $b[1][1]/$this->fpdi->k,
- 'urx' => $b[2][1]/$this->fpdi->k,
- 'ury' => $b[3][1]/$this->fpdi->k,
- );
- } else if (!isset ($page[1][1]['/Parent'])) {
- return false;
- } else {
- return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index);
- }
- }
-
- function getPageBoxes($pageno) {
- return $this->_getPageBoxes($this->pages[$pageno-1]);
- }
-
- /**
- * Get all Boxes from /Page
- *
- * @param array a /Page
- * @return array
- */
- function _getPageBoxes($page) {
- $boxes = array();
-
- foreach($this->availableBoxes AS $box) {
- if ($_box = $this->getPageBox($page,$box)) {
- $boxes[$box] = $_box;
- }
- }
-
- return $boxes;
- }
-
- /**
- * Get the page rotation by pageno
- *
- * @param integer $pageno
- * @return array
- */
- function getPageRotation($pageno) {
- return $this->_getPageRotation($this->pages[$pageno-1]);
- }
-
- function _getPageRotation ($obj) { // $obj = /Page
- $obj = $this->pdf_resolve_object($this->c, $obj);
- if (isset ($obj[1][1]['/Rotate'])) {
- $res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Rotate']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- } else {
- if (!isset ($obj[1][1]['/Parent'])) {
- return false;
- } else {
- $res = $this->_getPageRotation($obj[1][1]['/Parent']);
- if ($res[0] == PDF_TYPE_OBJECT)
- return $res[1];
- return $res;
- }
- }
- }
-
- /**
- * Read all /Page(es)
- *
- * @param object pdf_context
- * @param array /Pages
- * @param array the result-array
- */
- function read_pages (&$c, &$pages, &$result) {
- // Get the kids dictionary
- $kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
-
- if (!is_array($kids))
- $this->fpdi->Error('Cannot find /Kids in current /Page-Dictionary');
- foreach ($kids[1] as $v) {
- $pg = $this->pdf_resolve_object ($c, $v);
- if ($pg[1][1]['/Type'][1] === '/Pages') {
- // If one of the kids is an embedded
- // /Pages array, resolve it as well.
- $this->read_pages ($c, $pg, $result);
- } else {
- $result[] = $pg;
- }
- }
- }
-
-
-
- /**
- * Get PDF-Version
- *
- * And reset the PDF Version used in FPDI if needed
- */
- function getPDFVersion() {
- parent::getPDFVersion();
- $this->fpdi->PDFVersion = max($this->fpdi->PDFVersion, $this->pdfVersion);
- }
-
-}
\ No newline at end of file
Deleted: trunk/fpdi/pdf_context.php
===================================================================
--- trunk/fpdi/pdf_context.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/pdf_context.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,97 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-class pdf_context {
-
- /**
- * Modi
- *
- * @var integer 0 = file | 1 = string
- */
- var $_mode = 0;
-
- var $file;
- var $buffer;
- var $offset;
- var $length;
-
- var $stack;
-
- // Constructor
-
- function pdf_context(&$f) {
- $this->file =& $f;
- if (is_string($this->file))
- $this->_mode = 1;
- $this->reset();
- }
-
- // Optionally move the file
- // pointer to a new location
- // and reset the buffered data
-
- function reset($pos = null, $l = 100) {
- if ($this->_mode == 0) {
- if (!is_null ($pos)) {
- fseek ($this->file, $pos);
- }
-
- $this->buffer = $l > 0 ? fread($this->file, $l) : '';
- $this->length = strlen($this->buffer);
- if ($this->length < $l)
- $this->increase_length($l - $this->length);
- } else {
- $this->buffer = $this->file;
- $this->length = strlen($this->buffer);
- }
- $this->offset = 0;
- $this->stack = array();
- }
-
- // Make sure that there is at least one
- // character beyond the current offset in
- // the buffer to prevent the tokenizer
- // from attempting to access data that does
- // not exist
-
- function ensure_content() {
- if ($this->offset >= $this->length - 1) {
- return $this->increase_length();
- } else {
- return true;
- }
- }
-
- // Forcefully read more data into the buffer
-
- function increase_length($l=100) {
- if ($this->_mode == 0 && feof($this->file)) {
- return false;
- } else if ($this->_mode == 0) {
- $totalLength = $this->length + $l;
- do {
- $this->buffer .= fread($this->file, $totalLength-$this->length);
- } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
-
- return true;
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
Deleted: trunk/fpdi/pdf_parser.php
===================================================================
--- trunk/fpdi/pdf_parser.php 2011-03-18 22:51:07 UTC (rev 4514)
+++ trunk/fpdi/pdf_parser.php 2011-03-20 02:51:01 UTC (rev 4515)
@@ -1,694 +0,0 @@
-<?php
-//
-// FPDI - Version 1.3
-//
-// Copyright 2004-2009 Setasign - Jan Slabon
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-if (!defined ('PDF_TYPE_NULL'))
- define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
- define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
- define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
- define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
- define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
- define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
- define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
- define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
- define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
- define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
- define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
- define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
- define ('PDF_TYPE_REAL', 12);
-
-require_once('pdf_context.php');
-
-class pdf_parser {
-
- /**
- * Filename
- * @var string
- */
- var $filename;
-
- /**
- * File resource
- * @var resource
- */
- var $f;
-
- /**
- * PDF Context
- * @var object pdf_context-Instance
- */
- var $c;
-
- /**
- * xref-Data
- * @var array
- */
- var $xref;
-
- /**
- * root-Object
- * @var array
- */
- var $root;
-
- /**
- * PDF version of the loaded document
- * @var string
- */
- var $pdfVersion;
-
- /**
- * Constructor
- *
- * @param string $filename Source-Filename
- */
- function pdf_parser($filename) {
- $this->filename = $filename;
-
- $this->f = @fopen($this->filename, 'rb');
-
- if (!$this->f)
- $this->error(sprintf('Cannot open %s !', $filename));
-
- $this->getPDFVersion();
-
- $this->c =& new pdf_context($this->f);
-
- // Read xref-Data
- $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
-
- // Check for Encryption
- $this->getEncryption();
-
- // Read root
- $this->pdf_read_root();
- }
-
- /**
- * Close the opened file
- */
- function closeFile() {
- if (isset($this->f)) {
- fclose($this->f);
- unset($this->f);
- }
- }
-
- /**
- * Print Error and die
- *
- * @param string $msg Error-Message
- */
- function error($msg) {
- die('<b>PDF-Parser Error:</b> '.$msg);
- }
-
- /**
- * Check Trailer for Encryption
- */
- function getEncryption() {
- if (isset($this->xref['trailer'][1]['/Encrypt'])) {
- $this->error('File is encrypted!');
- }
- }
-
- /**
- * Find/Return /Root
- *
- * @return array
- */
- function pdf_find_root() {
- if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
- $this->error('Wrong Type of Root-Element! Must be an indirect reference');
- }
- return $this->xref['trailer'][1]['/Root'];
- }
-
- /**
- * Read the /Root
- */
- function pdf_read_root() {
- // read root
- $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
- }
-
- /**
- * Get PDF-Version
- *
- * And reset the PDF Version used in FPDI if needed
- */
- function getPDFVersion() {
- fseek($this->f, 0);
- preg_match('/\d\.\d/',fread($this->f,16),$m);
- if (isset($m[0]))
- $this->pdfVersion = $m[0];
- return $this->pdfVersion;
- }
-
- /**
- * Find the xref-Table
- */
- function pdf_find_xref() {
- $toRead = 1500;
-
- $stat = fseek ($this->f, -$toRead, SEEK_END);
- if ($stat === -1) {
- fseek ($this->f, 0);
- }
- $data = fread($this->f, $toRea...
[truncated message content] |
|
From: <dai...@us...> - 2011-03-18 22:51:14
|
Revision: 4514
http://web-erp.svn.sourceforge.net/web-erp/?rev=4514&view=rev
Author: daintree
Date: 2011-03-18 22:51:07 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
add country to packing slips
Modified Paths:
--------------
trunk/PrintCustOrder_generic.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log.html
trunk/includes/PDFOrderPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/PrintCustOrder_generic.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -4,8 +4,6 @@
/* $Revision: 1.20 $ */
-//$PageSecurity = 2;
-
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -14,12 +12,12 @@
If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
$title = _('Select Order To Print');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Select an Order Number to Print before calling this page') , 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php?">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
}
@@ -65,12 +63,12 @@
if (DB_num_rows($result)==0){
$title = _('Print Packing Slip Error');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
@@ -85,17 +83,17 @@
echo '<p>';
prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' .
_('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) .
- '<br>' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
- echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
+ '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
+ echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
. _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed') . '</a><p>' .
- '<a href="' . $rootpath. '/PrintCustOrder_generic.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
+ '<a href="' . $rootpath. '/PrintCustOrder_generic.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
- echo '<br><br><br>';
+ echo '<br /><br /><br />';
echo _('Or select another Order Number to Print');
echo '<table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit;
@@ -115,8 +113,9 @@
$FontSize=12;
$line_height=24;
$PageNumber = 1;
+$Copy = 'Office';
-$ListCount = 0; // UldisN
+$ListCount = 0;
for ($i=1;$i<=2;$i++){ /*Print it out twice one copy for customer and one for office */
if ($i==2){
@@ -173,28 +172,15 @@
} /*end for loop to print the whole lot twice */
-//$pdfcode = $pdf->output();
-//$len = strlen($pdfcode);
-//if ($len<=20){
if ($ListCount == 0) { //UldisN
$title = _('Print Packing Slip Error');
include('includes/header.inc');
echo '<p>'. _('There were no outstanding items on the order to deliver') . '. ' . _('A packing slip cannot be printed').
- '<br><a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">'. _('Print Another Packing Slip/Order').
- '</a>' . '<br>'. '<a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
+ '<br /><a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Print Another Packing Slip/Order').
+ '</a>' . '<br />'. '<a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
-/* UldisN
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=PackingSlip.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('PrintCustOrder.pdf', 'I');
-*/
$pdf->OutputD($_SESSION['DatabaseName'] . '_PackingSlip_' . date('Y-m-d') . '.pdf');//UldisN
$pdf->__destruct(); //UldisN
$sql = "UPDATE salesorders SET printedpackingslip=1, datepackingslipprinted='" . Date('Y-m-d') . "' WHERE salesorders.orderno='" .$_GET['TransNo'] . "'";
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/SelectSalesOrder.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -885,7 +885,7 @@
}
$i++;
$j++;
- $TotalOrders += $myrow['ordervalue'];
+ $OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
$j=1;
echo $tableheader;
@@ -901,7 +901,7 @@
} else {
echo '<b>' . _('Total Quotation(s) Value in');
}
- echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($TotalOrders,2) . '</b></td></tr>
+ echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($OrdersTotal,2) . '</b></td></tr>
</table>';
} //end if there are some orders to show
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/doc/Change.log.html 2011-03-18 22:51:07 UTC (rev 4514)
@@ -1,7 +1,8 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
-<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php
-<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php
+<p>19/3/11: Phil added country to packing slips </p>
+<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php </p>
+<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php</p>
<p>18/3/11: Phil check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters</p>
<p>15/3/11: Phil PricesByCost.php - made it update prices where there is already a price starting on today's date</p>
<p>15/3/11: Phil SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.</p>
Modified: trunk/includes/PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -11,14 +11,14 @@
$pdf->addText($XPos, $YPos,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos = 510;
$pdf->addText($XPos, $YPos,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['deladd6']);
/*Print Dispatch Date - as current date
Modified: trunk/includes/PDFOrderPageHeader_generic.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -41,7 +41,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos -= 80;
@@ -49,7 +49,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['address6']);
$pdf->addText($XPos, $YPos-82,$FontSize, _('Customer No.'). ' : ' . $myrow['debtorno']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-18 22:51:14
|
Revision: 4514
http://web-erp.svn.sourceforge.net/web-erp/?rev=4514&view=rev
Author: daintree
Date: 2011-03-18 22:51:07 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
add country to packing slips
Modified Paths:
--------------
trunk/PrintCustOrder_generic.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log.html
trunk/includes/PDFOrderPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/PrintCustOrder_generic.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -4,8 +4,6 @@
/* $Revision: 1.20 $ */
-//$PageSecurity = 2;
-
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -14,12 +12,12 @@
If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
$title = _('Select Order To Print');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Select an Order Number to Print before calling this page') , 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php?">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
}
@@ -65,12 +63,12 @@
if (DB_num_rows($result)==0){
$title = _('Print Packing Slip Error');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
@@ -85,17 +83,17 @@
echo '<p>';
prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' .
_('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) .
- '<br>' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
- echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
+ '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
+ echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
. _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed') . '</a><p>' .
- '<a href="' . $rootpath. '/PrintCustOrder_generic.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
+ '<a href="' . $rootpath. '/PrintCustOrder_generic.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
- echo '<br><br><br>';
+ echo '<br /><br /><br />';
echo _('Or select another Order Number to Print');
echo '<table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit;
@@ -115,8 +113,9 @@
$FontSize=12;
$line_height=24;
$PageNumber = 1;
+$Copy = 'Office';
-$ListCount = 0; // UldisN
+$ListCount = 0;
for ($i=1;$i<=2;$i++){ /*Print it out twice one copy for customer and one for office */
if ($i==2){
@@ -173,28 +172,15 @@
} /*end for loop to print the whole lot twice */
-//$pdfcode = $pdf->output();
-//$len = strlen($pdfcode);
-//if ($len<=20){
if ($ListCount == 0) { //UldisN
$title = _('Print Packing Slip Error');
include('includes/header.inc');
echo '<p>'. _('There were no outstanding items on the order to deliver') . '. ' . _('A packing slip cannot be printed').
- '<br><a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">'. _('Print Another Packing Slip/Order').
- '</a>' . '<br>'. '<a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
+ '<br /><a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Print Another Packing Slip/Order').
+ '</a>' . '<br />'. '<a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
-/* UldisN
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=PackingSlip.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('PrintCustOrder.pdf', 'I');
-*/
$pdf->OutputD($_SESSION['DatabaseName'] . '_PackingSlip_' . date('Y-m-d') . '.pdf');//UldisN
$pdf->__destruct(); //UldisN
$sql = "UPDATE salesorders SET printedpackingslip=1, datepackingslipprinted='" . Date('Y-m-d') . "' WHERE salesorders.orderno='" .$_GET['TransNo'] . "'";
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/SelectSalesOrder.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -885,7 +885,7 @@
}
$i++;
$j++;
- $TotalOrders += $myrow['ordervalue'];
+ $OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
$j=1;
echo $tableheader;
@@ -901,7 +901,7 @@
} else {
echo '<b>' . _('Total Quotation(s) Value in');
}
- echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($TotalOrders,2) . '</b></td></tr>
+ echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($OrdersTotal,2) . '</b></td></tr>
</table>';
} //end if there are some orders to show
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/doc/Change.log.html 2011-03-18 22:51:07 UTC (rev 4514)
@@ -1,7 +1,8 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
-<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php
-<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php
+<p>19/3/11: Phil added country to packing slips </p>
+<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php </p>
+<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php</p>
<p>18/3/11: Phil check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters</p>
<p>15/3/11: Phil PricesByCost.php - made it update prices where there is already a price starting on today's date</p>
<p>15/3/11: Phil SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.</p>
Modified: trunk/includes/PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -11,14 +11,14 @@
$pdf->addText($XPos, $YPos,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos = 510;
$pdf->addText($XPos, $YPos,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['deladd6']);
/*Print Dispatch Date - as current date
Modified: trunk/includes/PDFOrderPageHeader_generic.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -41,7 +41,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos -= 80;
@@ -49,7 +49,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['address6']);
$pdf->addText($XPos, $YPos-82,$FontSize, _('Customer No.'). ' : ' . $myrow['debtorno']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-18 05:48:29
|
Revision: 4513
http://web-erp.svn.sourceforge.net/web-erp/?rev=4513&view=rev
Author: daintree
Date: 2011-03-18 05:48:23 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Trap codes with spaces
Modified Paths:
--------------
trunk/Stocks.php
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-03-18 05:45:21 UTC (rev 4512)
+++ trunk/Stocks.php 2011-03-18 05:48:23 UTC (rev 4513)
@@ -100,7 +100,7 @@
$Errors[$i] = 'StockID';
$i++;
}
- if (ContainsIllegalCharacters($StockID) OR strstr($StockID,' ')) {
+ if (ContainsIllegalCharacters($StockID) OR strpos($StockID,' ')) {
$InputError = 1;
prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
$Errors[$i] = 'StockID';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-18 05:48:29
|
Revision: 4513
http://web-erp.svn.sourceforge.net/web-erp/?rev=4513&view=rev
Author: daintree
Date: 2011-03-18 05:48:23 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Trap codes with spaces
Modified Paths:
--------------
trunk/Stocks.php
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-03-18 05:45:21 UTC (rev 4512)
+++ trunk/Stocks.php 2011-03-18 05:48:23 UTC (rev 4513)
@@ -100,7 +100,7 @@
$Errors[$i] = 'StockID';
$i++;
}
- if (ContainsIllegalCharacters($StockID) OR strstr($StockID,' ')) {
+ if (ContainsIllegalCharacters($StockID) OR strpos($StockID,' ')) {
$InputError = 1;
prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
$Errors[$i] = 'StockID';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-03-18 05:45:28
|
Revision: 4512
http://web-erp.svn.sourceforge.net/web-erp/?rev=4512&view=rev
Author: daintree
Date: 2011-03-18 05:45:21 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Marcos Change Supplier code
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/Stocks.php
trunk/UserSettings.php
trunk/Z_index.php
trunk/doc/Change.log.html
trunk/includes/ConnectDB.inc
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/CustomerBranches.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -52,7 +52,7 @@
$_POST['BranchCode'] = strtoupper($_POST['BranchCode']);
- if (strstr($_POST['BranchCode'],"'") OR strstr($_POST['BranchCode'],'"') OR strstr($_POST['BranchCode'],'&')) {
+ if (ContainsIllegalCharacters($_POST['BranchCode']) OR strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
$Errors[$i] = 'BranchCode';
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/Customers.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -41,7 +41,7 @@
prnMsg( _('The customer number already exists in the database'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
- } elseif (strlen($_POST['CustName']) > 40 OR strlen($_POST['CustName'])==0) {
+ }elseif (strlen($_POST['CustName']) > 40 OR strlen($_POST['CustName'])==0) {
$InputError = 1;
prnMsg( _('The customer name must be entered and be forty characters or less long'),'error');
$Errors[$i] = 'CustName';
@@ -51,7 +51,7 @@
prnMsg( _('The debtor code cannot be empty'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
- } elseif ($_SESSION['AutoDebtorNo']==0 AND ContainsIllegalCharacters($_POST['DebtorNo'])) {
+ } elseif ($_SESSION['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR strpos($_POST['DebtorNo'], ' '))) {
$InputError = 1;
prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'DebtorNo';
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/DailyBankTransactions.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -82,7 +82,8 @@
ON banktrans.type=systypes.typeid
WHERE bankact='".$_POST['BankAccount']."'
AND transdate>='" . FormatDateForSQL($_POST['FromTransDate']) . "'
- AND transdate<='" . FormatDateForSQL($_POST['ToTransDate']) . "'";
+ AND transdate<='" . FormatDateForSQL($_POST['ToTransDate']) . "'
+ ORDER BY banktrans.transdate";
$result = DB_query($sql, $db);
if (DB_num_rows($result)==0) {
prnMsg(_('There are no transactions for this account in the date range selected'), 'info');
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/Stocks.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -100,7 +100,7 @@
$Errors[$i] = 'StockID';
$i++;
}
- if (ContainsIllegalCharacters($StockID)) {
+ if (ContainsIllegalCharacters($StockID) OR strstr($StockID,' ')) {
$InputError = 1;
prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
$Errors[$i] = 'StockID';
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/UserSettings.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -10,8 +10,8 @@
_('User Settings') . '" alt="" />' . ' ' . _('User Settings') . '</p>';
$PDFLanguages = array(_('Latin Western Languages'),
- _('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
- _('Chinese'));
+ _('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
+ _('Chinese'));
if (isset($_POST['Modify'])) {
Modified: trunk/Z_index.php
===================================================================
--- trunk/Z_index.php 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/Z_index.php 2011-03-18 05:45:21 UTC (rev 4512)
@@ -13,6 +13,7 @@
echo "<p><a href='$rootpath/Z_ChangeCustomerCode.php?" . SID . "'>". _('Change A Customer Code') . '</a>';
echo "<p><a href='$rootpath/Z_ChangeBranchCode.php?" . SID . "'>" . _('Change A Customer Branch Code') . '</a>';
echo "<p><a href='$rootpath/Z_ChangeStockCode.php?" . SID . "'>" . _('Change An Inventory Item Code') . '</a>';
+ echo "<p><a href='$rootpath/Z_ChangeSupplierCode.php?" . SID . "'>" . _('Change A Supplier Code') . '</a>';
echo "<p><a href='$rootpath/Z_PriceChanges.php?" . SID . "'>" . _('Bulk Change Customer Pricing') . '</a>';
echo "<p><a href='$rootpath/Z_BottomUpCosts.php?" . SID . "'>" . _('Update costs for all BOM items, from the bottom up') . '</a>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/doc/Change.log.html 2011-03-18 05:45:21 UTC (rev 4512)
@@ -1,5 +1,8 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php
+<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php
+<p>18/3/11: Phil check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters</p>
<p>15/3/11: Phil PricesByCost.php - made it update prices where there is already a price starting on today's date</p>
<p>15/3/11: Phil SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.</p>
<p>15/3/11: Phil Locations.php new field for CounterSales branch code - instead of parsing it from a single field with a hyphen in it. CounterSales.php now uses the new field for customer branch</p>
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/includes/ConnectDB.inc 2011-03-18 05:45:21 UTC (rev 4512)
@@ -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.03.2'; //must update manually every time there is a DB change
+$Version='4.03.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-15 09:33:07 UTC (rev 4511)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-03-18 05:45:21 UTC (rev 4512)
@@ -833,4 +833,6 @@
UPDATE config SET confvalue='4.03.2' WHERE confname='VersionNumber';
ALTER TABLE locations ADD cashsalebranch varchar(10) DEFAULT '';
ALTER TABLE `locations` CHANGE `cashsalecustomer` `cashsalecustomer` VARCHAR( 10 ) DEFAULT '';
-UPDATE config SET confvalue='4.03.3' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.3' WHERE confname='VersionNumber';
+INSERT INTO `weberpdemo`.`scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_ChangeSupplierCode.php', '15', 'Script to change a supplier code accross all tables necessary');
+UPDATE config SET confvalue='4.03.4' WHERE confname='VersionNumber';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
15 messages has been excluded from this view by a project administrator.
