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-06-18 05:13:51
|
Revision: 4599
http://web-erp.svn.sourceforge.net/web-erp/?rev=4599&view=rev
Author: daintree
Date: 2011-06-18 05:13:36 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
doh
Modified Paths:
--------------
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04.4-4.04.5.sql
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-18 04:55:08 UTC (rev 4598)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-18 05:13:36 UTC (rev 4599)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-12 21:39+1200\n"
+"POT-Creation-Date: 2011-06-18 17:04+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -130,11 +130,11 @@
"pomocí této skupině"
#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:137
-#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:125
-#: Currencies.php:143 Currencies.php:151 Currencies.php:158
+#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:123
+#: Currencies.php:164 Currencies.php:172 Currencies.php:180
#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
-#: CustomerBranches.php:316 Customers.php:311 Customers.php:320
-#: Customers.php:328 Customers.php:336 CustomerTypes.php:147
+#: CustomerBranches.php:316 Customers.php:312 Customers.php:321
+#: Customers.php:329 Customers.php:337 CustomerTypes.php:147
#: CustomerTypes.php:157 Factors.php:134 FixedAssetCategories.php:130
#: GLAccounts.php:80 GLAccounts.php:94 Locations.php:244 Locations.php:252
#: Locations.php:261 Locations.php:269 Locations.php:277 Locations.php:285
@@ -193,12 +193,12 @@
msgstr "Nemohu získat účetní skupiny, protože"
#: AccountGroups.php:224 AccountSections.php:175 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:277
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:95 AgedDebtors.php:454 AgedSuppliers.php:268
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13
-#: BOMExtendedQty.php:272 BOMIndented.php:247 BOMIndentedReverse.php:246
-#: BOMInquiry.php:165 BOMListing.php:112 BOMs.php:208 BOMs.php:790
-#: COGSGLPostings.php:18 CompanyPreferences.php:155 CounterSales.php:1983
+#: BOMExtendedQty.php:259 BOMIndented.php:246 BOMIndentedReverse.php:236
+#: BOMInquiry.php:171 BOMListing.php:112 BOMs.php:208 BOMs.php:798
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:1983
#: CounterSales.php:2107 Credit_Invoice.php:255 CreditStatus.php:20
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:10
#: DebtorsAtPeriodEnd.php:124 DiscountCategories.php:10
@@ -218,7 +218,7 @@
#: RecurringSalesOrders.php:310 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:34
#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
-#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
+#: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
#: SelectOrderItems.php:1563 SelectProduct.php:485 SelectSalesOrder.php:454
@@ -231,7 +231,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:110 WorkCentres.php:157
#: WorkOrderCosting.php:12 WorkOrderEntry.php:10 WorkOrderIssue.php:20
#: WorkOrderReceive.php:13 WorkOrderStatus.php:41 WWW_Access.php:11
-#: WWW_Users.php:31 Z_BottomUpCosts.php:51
+#: WWW_Users.php:32 Z_BottomUpCosts.php:51
msgid "Search"
msgstr "Vyhledávání"
@@ -258,19 +258,18 @@
msgstr "Rodičovská skupina"
#: AccountGroups.php:248 AccountGroups.php:251 AccountGroups.php:381
-#: AccountGroups.php:383 BankAccounts.php:212 BankAccounts.php:356
-#: BankAccounts.php:358 BankAccounts.php:362 BOMs.php:122 BOMs.php:709
-#: BOMs.php:711 CompanyPreferences.php:439 CompanyPreferences.php:441
-#: CompanyPreferences.php:452 CompanyPreferences.php:454
-#: CompanyPreferences.php:465 CompanyPreferences.php:467
-#: ContractCosting.php:174 CustLoginSetup.php:578 CustLoginSetup.php:580
-#: CustomerBranches.php:410 Customers.php:595 Customers.php:863
-#: Customers.php:871 Customers.php:874 DeliveryDetails.php:1064
-#: DeliveryDetails.php:1104 DeliveryDetails.php:1107 GLTransInquiry.php:69
-#: MRPCalendar.php:220 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: PaymentMethods.php:199 PaymentMethods.php:200 PaymentMethods.php:201
-#: PaymentMethods.php:264 PaymentMethods.php:270 PaymentMethods.php:276
-#: PcAuthorizeExpenses.php:239 PDFChequeListing.php:62
+#: AccountGroups.php:383 BankAccounts.php:211 BankAccounts.php:366
+#: BankAccounts.php:370 BankAccounts.php:374 BOMs.php:122 BOMs.php:717
+#: BOMs.php:719 CompanyPreferences.php:443 CompanyPreferences.php:445
+#: CompanyPreferences.php:456 CompanyPreferences.php:458
+#: CompanyPreferences.php:469 CompanyPreferences.php:471
+#: ContractCosting.php:176 CustomerBranches.php:410 Customers.php:597
+#: Customers.php:865 Customers.php:873 Customers.php:876
+#: DeliveryDetails.php:1064 DeliveryDetails.php:1104 DeliveryDetails.php:1107
+#: GLTransInquiry.php:69 MRPCalendar.php:220 MRP.php:527 MRP.php:531
+#: MRP.php:535 MRP.php:539 PaymentMethods.php:199 PaymentMethods.php:200
+#: PaymentMethods.php:201 PaymentMethods.php:264 PaymentMethods.php:270
+#: PaymentMethods.php:276 PcAuthorizeExpenses.php:239 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
#: PO_Header.php:761 PO_PDFPurchOrder.php:360 PO_PDFPurchOrder.php:363
@@ -290,24 +289,23 @@
#: SystemParameters.php:893 SystemParameters.php:895 SystemParameters.php:905
#: SystemParameters.php:907 SystemParameters.php:961 SystemParameters.php:973
#: SystemParameters.php:975 TaxGroups.php:293 TaxGroups.php:296
-#: TaxGroups.php:345 WWW_Users.php:605 WWW_Users.php:607
+#: TaxGroups.php:345 WWW_Users.php:592 WWW_Users.php:594
msgid "Yes"
msgstr "Ano"
#: AccountGroups.php:254 AccountGroups.php:386 AccountGroups.php:388
-#: BankAccounts.php:210 BankAccounts.php:356 BankAccounts.php:358
-#: BankAccounts.php:363 BOMs.php:124 BOMs.php:708 BOMs.php:712
-#: CompanyPreferences.php:438 CompanyPreferences.php:442
-#: CompanyPreferences.php:451 CompanyPreferences.php:455
-#: CompanyPreferences.php:464 CompanyPreferences.php:468
-#: ContractCosting.php:172 CustLoginSetup.php:577 CustLoginSetup.php:581
-#: CustomerBranches.php:410 Customers.php:594 Customers.php:859
-#: Customers.php:870 Customers.php:873 DeliveryDetails.php:1065
-#: DeliveryDetails.php:1105 DeliveryDetails.php:1108 GLTransInquiry.php:123
-#: MRPCalendar.php:222 MRP.php:525 MRP.php:529 MRP.php:533 MRP.php:537
-#: PaymentMethods.php:199 PaymentMethods.php:200 PaymentMethods.php:201
-#: PaymentMethods.php:265 PaymentMethods.php:271 PaymentMethods.php:277
-#: PcAuthorizeExpenses.php:237 PDFChequeListing.php:61
+#: BankAccounts.php:209 BankAccounts.php:367 BankAccounts.php:369
+#: BankAccounts.php:375 BOMs.php:124 BOMs.php:716 BOMs.php:720
+#: CompanyPreferences.php:442 CompanyPreferences.php:446
+#: CompanyPreferences.php:455 CompanyPreferences.php:459
+#: CompanyPreferences.php:468 CompanyPreferences.php:472
+#: ContractCosting.php:174 CustomerBranches.php:410 Customers.php:596
+#: Customers.php:861 Customers.php:872 Customers.php:875
+#: DeliveryDetails.php:1065 DeliveryDetails.php:1105 DeliveryDetails.php:1108
+#: GLTransInquiry.php:123 MRPCalendar.php:222 MRP.php:525 MRP.php:529
+#: MRP.php:533 MRP.php:537 PaymentMethods.php:199 PaymentMethods.php:200
+#: PaymentMethods.php:201 PaymentMethods.php:265 PaymentMethods.php:271
+#: PaymentMethods.php:277 PcAuthorizeExpenses.php:237 PDFChequeListing.php:61
#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
#: PO_Header.php:760 PO_PDFPurchOrder.php:361 PO_PDFPurchOrder.php:364
@@ -327,17 +325,17 @@
#: SystemParameters.php:892 SystemParameters.php:896 SystemParameters.php:904
#: SystemParameters.php:908 SystemParameters.php:962 SystemParameters.php:972
#: SystemParameters.php:976 TaxGroups.php:294 TaxGroups.php:297
-#: TaxGroups.php:347 WWW_Users.php:604 WWW_Users.php:608
+#: TaxGroups.php:347 WWW_Users.php:591 WWW_Users.php:595
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "Ne"
-#: AccountGroups.php:263 AccountSections.php:195 AddCustomerContacts.php:131
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:164
-#: BankAccounts.php:221 BOMs.php:144 COGSGLPostings.php:108
-#: COGSGLPostings.php:211 CreditStatus.php:174 Currencies.php:238
-#: CustLoginSetup.php:307 CustomerBranches.php:414 Customers.php:917
-#: Customers.php:949 CustomerTypes.php:202 EDIMessageFormat.php:150
+#: AccountGroups.php:263 AccountSections.php:196 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:132 AddCustomerTypeNotes.php:123 Areas.php:164
+#: BankAccounts.php:220 BOMs.php:144 COGSGLPostings.php:107
+#: COGSGLPostings.php:204 CreditStatus.php:172 Currencies.php:269
+#: CustLoginSetup.php:219 CustomerBranches.php:414 Customers.php:940
+#: Customers.php:973 CustomerTypes.php:202 EDIMessageFormat.php:150
#: Factors.php:299 FixedAssetCategories.php:180 FixedAssetLocations.php:102
#: FreightCosts.php:240 GeocodeSetup.php:170 GLAccounts.php:308 GLTags.php:82
#: Labels.php:414 Locations.php:377 MRPDemands.php:303 MRPDemandTypes.php:120
@@ -346,26 +344,26 @@
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:219
-#: SalesTypes.php:216 SecurityTokens.php:110 SelectCustomer.php:613
-#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
-#: SelectCustomer.php:694 SelectCustomer.php:710 Shippers.php:144
+#: SalesTypes.php:216 SecurityTokens.php:110 SelectCustomer.php:614
+#: SelectCustomer.php:632 SelectCustomer.php:656 SelectCustomer.php:673
+#: SelectCustomer.php:696 SelectCustomer.php:712 Shippers.php:144
#: StockCategories.php:240 SupplierContacts.php:157 SupplierTypes.php:189
#: SuppLoginSetup.php:271 SuppTransGLAnalysis.php:118 TaxAuthorities.php:172
#: TaxCategories.php:182 TaxGroups.php:178 TaxProvinces.php:176
#: UnitsOfMeasure.php:188 WorkCentres.php:137 WWW_Access.php:123
-#: WWW_Users.php:305 includes/InputSerialItems.php:88
+#: WWW_Users.php:306 includes/InputSerialItems.php:88
#: includes/OutputSerialItems.php:21
#, php-format
msgid "Edit"
msgstr "Upravit"
-#: AccountGroups.php:264 AccountSections.php:199 AddCustomerContacts.php:132
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:165
-#: BankAccounts.php:222 BOMs.php:146 COGSGLPostings.php:109
-#: COGSGLPostings.php:212 ContractBOM.php:270 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:175
-#: Currencies.php:241 CustLoginSetup.php:308 CustomerReceipt.php:863
-#: Customers.php:950 CustomerTypes.php:203 DiscountCategories.php:215
+#: AccountGroups.php:264 AccountSections.php:200 AddCustomerContacts.php:150
+#: AddCustomerNotes.php:133 AddCustomerTypeNotes.php:124 Areas.php:165
+#: BankAccounts.php:221 BOMs.php:146 COGSGLPostings.php:108
+#: COGSGLPostings.php:205 ContractBOM.php:268 ContractOtherReqts.php:117
+#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:173
+#: Currencies.php:272 CustLoginSetup.php:220 CustomerReceipt.php:863
+#: Customers.php:974 CustomerTypes.php:203 DiscountCategories.php:215
#: DiscountMatrix.php:173 EDIMessageFormat.php:151
#: FixedAssetCategories.php:181 FixedAssetJournal.php:393 FreightCosts.php:241
#: GeocodeSetup.php:171 GLAccounts.php:309 GLJournal.php:382 GLTags.php:83
@@ -377,9 +375,9 @@
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:220 SalesTypes.php:217
-#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:614
-#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
-#: SelectCustomer.php:695 SelectCustomer.php:711 SelectOrderItems.php:1370
+#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:615
+#: SelectCustomer.php:633 SelectCustomer.php:657 SelectCustomer.php:674
+#: SelectCustomer.php:697 SelectCustomer.php:713 SelectOrderItems.php:1370
#: Shipments.php:423 Shippers.php:145 SpecialOrder.php:581
#: StockCategories.php:241 StockCategories.php:535 SuppContractChgs.php:91
#: SuppCreditGRNs.php:92 SuppFixedAssetChgs.php:84 SuppInvGRNs.php:132
@@ -387,7 +385,7 @@
#: SuppShiptChgs.php:89 SuppTransGLAnalysis.php:119 TaxAuthorities.php:173
#: TaxCategories.php:183 TaxGroups.php:179 TaxProvinces.php:177
#: UnitsOfMeasure.php:189 WorkCentres.php:138 WOSerialNos.php:303
-#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:59
+#: WWW_Access.php:124 WWW_Users.php:307 includes/InputSerialItemsKeyed.php:59
#: includes/OutputSerialItems.php:98
#, php-format
msgid "Delete"
@@ -430,10 +428,10 @@
msgid "Section In Accounts"
msgstr "Sekce v účtech"
-#: AccountGroups.php:398 AccountSections.php:263 AddCustomerContacts.php:208
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:220
-#: BankAccounts.php:369 BOMs.php:722 COGSGLPostings.php:349
-#: CreditStatus.php:246 Currencies.php:345 CustLoginSetup.php:599
+#: AccountGroups.php:398 AccountSections.php:264 AddCustomerContacts.php:244
+#: AddCustomerNotes.php:211 AddCustomerTypeNotes.php:191 Areas.php:220
+#: BankAccounts.php:381 BOMs.php:730 COGSGLPostings.php:342
+#: CreditStatus.php:250 Currencies.php:393 CustLoginSetup.php:439
#: DiscountMatrix.php:136 EDIMessageFormat.php:247
#: FixedAssetCategories.php:322 FixedAssetLocations.php:148
#: FreightCosts.php:339 GeocodeSetup.php:267 GLAccounts.php:258
@@ -444,7 +442,7 @@
#: SalesPeople.php:329 Shippers.php:196 StockCategories.php:557
#: SupplierContacts.php:258 SuppLoginSetup.php:529 TaxAuthorities.php:312
#: TaxCategories.php:233 TaxProvinces.php:227 UnitsOfMeasure.php:240
-#: WorkCentres.php:261 WWW_Users.php:638
+#: WorkCentres.php:261 WWW_Users.php:625
msgid "Enter Information"
msgstr "Vložit informace"
@@ -489,42 +487,44 @@
msgid "Could not get account group sections because"
msgstr "Nelze získat body účet skupiny, protože"
-#: AccountSections.php:179 AccountSections.php:237 AccountSections.php:255
+#: AccountSections.php:180 AccountSections.php:238 AccountSections.php:256
msgid "Section Number"
msgstr "Číslo sekce"
-#: AccountSections.php:180 AccountSections.php:259
+#: AccountSections.php:181 AccountSections.php:260
msgid "Section Description"
msgstr "Popis sekce"
-#: AccountSections.php:197
+#: AccountSections.php:198
msgid "Restricted"
msgstr "Omezeno"
-#: AccountSections.php:208
+#: AccountSections.php:209
msgid "Review Account Sections"
msgstr "Přezkoumání účtu Sekce"
-#: AccountSections.php:226
+#: AccountSections.php:227
msgid "Could not retrieve the requested section please try again."
msgstr "Nepodařilo se získat požadovanou sekci prosím zkuste to znovu."
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:607
-#: SelectCustomer.php:637
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:61 SelectCustomer.php:607
+#: SelectCustomer.php:639
msgid "Customer Contacts"
msgstr "Zákazník Kontakty"
-#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:22
+#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:11
#: Z_CheckDebtorsControl.php:20
msgid "Back to Customers"
msgstr "Zpět k zákazníkům"
#: AddCustomerContacts.php:26
-msgid "Contacts for Customer: <b>"
+#, fuzzy
+msgid "Contacts for Customer:"
msgstr "Kontakt pro zákazníky:"
#: AddCustomerContacts.php:29
-msgid "Edit contact for <b>"
+#, fuzzy
+msgid "Edit contact for"
msgstr "Upravit kontakt"
#: AddCustomerContacts.php:41
@@ -542,8 +542,15 @@
msgid "The contact name may not be empty"
msgstr "Jméno kontaktu nesmí být prázdný"
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
+#: AddCustomerContacts.php:50
+#, fuzzy
+msgid "The contact email address is not a valid email address"
+msgstr ""
+"E-mailová adresa se nezdá být platnou e-mailovou adresu. Transakce nebyla e-"
+"mailem"
+
+#: AddCustomerContacts.php:61 AddCustomerNotes.php:50
+#: AddCustomerTypeNotes.php:48 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
@@ -552,56 +559,77 @@
msgid "has been updated"
msgstr "byla aktualizována"
-#: AddCustomerContacts.php:70
+#: AddCustomerContacts.php:76
msgid "The contact record has been added"
msgstr "Kontakt záznam byl přidán"
-#: AddCustomerContacts.php:98
+#: AddCustomerContacts.php:105
msgid "The contact record has been deleted"
msgstr "Kontakt záznam byl odstraněn"
-#: AddCustomerContacts.php:112 CompanyPreferences.php:224
-#: CustomerBranches.php:368 Customers.php:907 Customers.php:913
-#: Customers.php:978 SalesPeople.php:191 SelectCustomer.php:609
-#: StockDispatch.php:185 StockDispatch.php:197 SupplierContacts.php:145
-#: SupplierCredit.php:441 SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
+#: AddCustomerContacts.php:128 CompanyPreferences.php:222
+#: CustomerBranches.php:368 Customers.php:928 Customers.php:935
+#: SalesPeople.php:191 SelectCustomer.php:609 StockDispatch.php:185
+#: StockDispatch.php:197 SupplierContacts.php:145 SupplierCredit.php:441
+#: SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
#: includes/PDFTaxPageHeader.inc:37
msgid "Name"
msgstr "Název"
-#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:908
-#: Customers.php:914 Customers.php:980 SelectCustomer.php:610
-#: WWW_Access.php:107 WWW_Access.php:168
+#: AddCustomerContacts.php:129 AddCustomerContacts.php:220 Customers.php:929
+#: Customers.php:936 SelectCustomer.php:610 WWW_Access.php:107
+#: WWW_Access.php:168
msgid "Role"
msgstr "Roli"
-#: AddCustomerContacts.php:114 Customers.php:982
+#: AddCustomerContacts.php:130
msgid "Phone no"
msgstr "Telefonní číslo"
-#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:910
-#: Customers.php:916 Customers.php:984 PcAssignCashToTab.php:220
-#: PcAssignCashToTab.php:346 PcAuthorizeExpenses.php:91
-#: PcClaimExpensesFromTab.php:214 PcClaimExpensesFromTab.php:372
-#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:319
-#: WOSerialNos.php:280 WOSerialNos.php:282
+#: AddCustomerContacts.php:131 AddCustomerContacts.php:232
+#: CustLoginSetup.php:193 CustomerBranches.php:374 CustomerBranches.php:716
+#: CustomerInquiry.php:249 Customers.php:931 Customers.php:938
+#: EmailCustTrans.php:15 EmailCustTrans.php:63 Factors.php:226 Factors.php:263
+#: Locations.php:533 OrderDetails.php:105 PDFRemittanceAdvice.php:251
+#: PO_PDFPurchOrder.php:347 PO_PDFPurchOrder.php:350 PrintCustTrans.php:664
+#: PrintCustTrans.php:884 PrintCustTrans.php:931
+#: PrintCustTransPortrait.php:715 PrintCustTransPortrait.php:935
+#: PrintCustTransPortrait.php:979 SelectCustomer.php:612
+#: SupplierContacts.php:149 SupplierContacts.php:253 SuppLoginSetup.php:237
+#: UserSettings.php:180 WWW_Users.php:262 includes/PDFPickingListHeader.inc:25
+#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
+#: includes/PDFTransPageHeaderPortrait.inc:109
+#: includes/PO_PDFOrderPageHeader.inc:29
+msgid "Email"
+msgstr "E-mail"
+
+#: AddCustomerContacts.php:132 AddCustomerContacts.php:238 Customers.php:932
+#: Customers.php:939 PcAssignCashToTab.php:220 PcAssignCashToTab.php:346
+#: PcAuthorizeExpenses.php:91 PcClaimExpensesFromTab.php:214
+#: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:613
+#: SystemParameters.php:319 WOSerialNos.php:280 WOSerialNos.php:282
msgid "Notes"
msgstr "Bere na vědomí"
-#: AddCustomerContacts.php:149
+#: AddCustomerContacts.php:150 SupplierContacts.php:158
+#, php-format
+msgid "Are you sure you wish to delete this contact?"
+msgstr "Jste si jisti, že chcete smazat tento kontakt?"
+
+#: AddCustomerContacts.php:169
msgid "Review all contacts for this Customer"
msgstr "Přezkoumání všech kontaktů pro tohoto zákazníka"
-#: AddCustomerContacts.php:179
+#: AddCustomerContacts.php:206
msgid "Contact Code"
msgstr "Kontakt kód"
-#: AddCustomerContacts.php:184 Factors.php:220 SupplierContacts.php:225
+#: AddCustomerContacts.php:214 Factors.php:220 SupplierContacts.php:225
msgid "Contact Name"
msgstr "Jméno kontaktní osoby"
-#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
+#: AddCustomerContacts.php:226 Contracts.php:777 PDFRemittanceAdvice.php:247
#: PO_Header.php:965 PO_Header.php:1035 SelectCreditItems.php:223
#: SelectCustomer.php:463 SelectOrderItems.php:646
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81
@@ -609,45 +637,45 @@
msgid "Phone"
msgstr "Telefon"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:647
-#: SelectCustomer.php:678
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:50 SelectCustomer.php:649
+#: SelectCustomer.php:680
msgid "Customer Notes"
msgstr "Zákazník bere na vědomí"
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
msgid "Back to Select Customer"
msgstr "Zpět na výběr zákazníka"
-#: AddCustomerNotes.php:31
+#: AddCustomerNotes.php:32
msgid "The contact priority must be an integer."
msgstr "Kontakt priorita musí být celé číslo."
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+#: AddCustomerNotes.php:35 AddCustomerTypeNotes.php:33
msgid "The contact's notes must be two hundred characters or less long"
msgstr "Kontaktu poznámky musí být dvě stovky postav či méně dlouhou"
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+#: AddCustomerNotes.php:38 AddCustomerTypeNotes.php:36
msgid "The contact's notes may not be empty"
msgstr "Kontaktu poznámky nesmí být prázdný"
-#: AddCustomerNotes.php:60
+#: AddCustomerNotes.php:63
msgid "The contact notes record has been added"
msgstr "Kontakt poznámky záznam byl přidán"
-#: AddCustomerNotes.php:87
+#: AddCustomerNotes.php:91
msgid "The contact note record has been deleted"
msgstr "Kontakt na vědomí záznam byl odstraněn"
-#: AddCustomerNotes.php:98
+#: AddCustomerNotes.php:102
msgid "Notes for Customer"
msgstr "Poznámky pro zákazníka"
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
-#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
-#: BankMatching.php:228 BankReconciliation.php:194 BankReconciliation.php:266
-#: ContractCosting.php:149 CustomerAllocations.php:331
+#: AddCustomerNotes.php:113 AddCustomerNotes.php:199
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:185
+#: BankMatching.php:231 BankReconciliation.php:198 BankReconciliation.php:270
+#: ContractCosting.php:151 CustomerAllocations.php:331
#: CustomerAllocations.php:357 CustomerInquiry.php:192
-#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154 GLAccountReportphp:157
+#: CustomerTransInquiry.php:90 GLAccountInquiry.php:154 GLAccountReportphp:157
#: GLAccountReport.php:369 GLTransInquiry.php:41 MRPCalendar.php:215
#: PaymentAllocations.php:77 PcAssignCashToTab.php:216
#: PcAuthorizeExpenses.php:87 PDFRemittanceAdvice.php:308
@@ -665,10 +693,10 @@
msgid "Date"
msgstr "Datum"
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:169 UpgradeDatabase.php:172
-#: UpgradeDatabase.php:175 UpgradeDatabase.php:178 UpgradeDatabase.php:181
-#: UpgradeDatabase.php:184 UpgradeDatabase.php:187 UpgradeDatabase.php:190
+#: AddCustomerNotes.php:114 AddCustomerTypeNotes.php:105 PcReportTab.php:173
+#: Stocks.php:882 UpgradeDatabase.php:171 UpgradeDatabase.php:174
+#: UpgradeDatabase.php:177 UpgradeDatabase.php:180 UpgradeDatabase.php:183
+#: UpgradeDatabase.php:186 UpgradeDatabase.php:189 UpgradeDatabase.php:192
#: 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
@@ -677,48 +705,48 @@
msgid "Note"
msgstr "Poznámka:"
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
+#: AddCustomerNotes.php:115 AddCustomerNotes.php:193
msgid "WWW"
msgstr "WWW"
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
-#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
+#: AddCustomerNotes.php:116 AddCustomerNotes.php:205
+#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:188
msgid "Priority"
msgstr "Prioritních"
-#: AddCustomerNotes.php:143
+#: AddCustomerNotes.php:150
msgid "Review all notes for this Customer"
msgstr "Zkontrolovat všechny poznámky pro tohoto zákazníka"
-#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
+#: AddCustomerNotes.php:180 AddCustomerTypeNotes.php:170
msgid "Note ID"
msgstr "Poznámka: ID"
-#: AddCustomerNotes.php:177
+#: AddCustomerNotes.php:187
msgid "Contact Note"
msgstr "Kontakt Poznámka:"
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:687
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:689
msgid "Customer Type (Group) Notes"
msgstr "Typ zákazníka (Group) Poznámky"
-#: AddCustomerTypeNotes.php:31
+#: AddCustomerTypeNotes.php:30
msgid "The Contact priority must be an integer."
msgstr "Prioritou Kontakt musí být celé číslo."
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:717
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:719
msgid "Customer Group Notes"
msgstr "Zákaznická skupina bere na vědomí"
-#: AddCustomerTypeNotes.php:60
+#: AddCustomerTypeNotes.php:61
msgid "The contact group notes record has been added"
msgstr "Kontaktní skupina bere na vědomí záznam byl přidán"
-#: AddCustomerTypeNotes.php:84
+#: AddCustomerTypeNotes.php:85
msgid "The contact group note record has been deleted"
msgstr "Kontaktní skupina na vědomí záznam byl odstraněn"
-#: AddCustomerTypeNotes.php:95
+#: AddCustomerTypeNotes.php:96
msgid "Notes for Customer Type"
msgstr "Poznámky pro zákazníka typu"
@@ -726,15 +754,20 @@
msgid "href"
msgstr "href"
+#: AddCustomerTypeNotes.php:124
+#, fuzzy, php-format
+msgid "Are you sure you wish to delete this customer type note?"
+msgstr "Jste si jisti, že chcete smazat tento typ zákazníka?"
+
#: AddCustomerTypeNotes.php:141
msgid "Review all notes for this Customer Type"
msgstr "Zkontrolovat všechny poznámky tohoto typu zákazníka"
-#: AddCustomerTypeNotes.php:182
+#: AddCustomerTypeNotes.php:181
msgid "Contact Group Note"
msgstr "Kontaktní skupina Poznámka:"
-#: AddCustomerTypeNotes.php:184
+#: AddCustomerTypeNotes.php:183
msgid "Web site"
msgstr "Webové stránky"
@@ -751,8 +784,8 @@
msgstr "Ve věku od zákaznického účtu analýza"
#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434
-#: AgedSuppliers.php:105 BOMExtendedQty.php:159 BOMIndented.php:150
-#: BOMIndentedReverse.php:151 BOMListing.php:44 BOMListing.php:55
+#: AgedSuppliers.php:107 BOMExtendedQty.php:149 BOMIndented.php:150
+#: BOMIndentedReverse.php:141 BOMListing.php:44 BOMListing.php:55
#: DebtorsAtPeriodEnd.php:56 DebtorsAtPeriodEnd.php:68 GLBalanceSheet.php:90
#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:172
#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
@@ -780,9 +813,9 @@
msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože"
#: AgedDebtors.php:273 AgedDebtors.php:372 AgedDebtors.php:440
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:162
-#: BOMExtendedQty.php:259 BOMIndented.php:153 BOMIndented.php:234
-#: BOMIndentedReverse.php:154 BOMIndentedReverse.php:232 BOMListing.php:47
+#: AgedSuppliers.php:110 AgedSuppliers.php:192 BOMExtendedQty.php:152
+#: BOMExtendedQty.php:246 BOMIndented.php:153 BOMIndented.php:234
+#: BOMIndentedReverse.php:145 BOMIndentedReverse.php:222 BOMListing.php:47
#: Credit_Invoice.php:184 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
#: FTP_RadioBeacon.php:187 GetStockImage.php:154 GLBalanceSheet.php:93
#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
@@ -798,7 +831,7 @@
#: InventoryValuation.php:92 MailInventoryValuation.php:118
#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:117
#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
-#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:316 MRPReport.php:39
+#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:306 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:233
@@ -834,7 +867,7 @@
msgid "The details of outstanding transactions for customer"
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
-#: AgedDebtors.php:371 AgedSuppliers.php:189 GLAccountCSV.php:168
+#: AgedDebtors.php:371 AgedSuppliers.php:191 GLAccountCSV.php:168
#: GLAccountInquiry.php:145 GLAccountReportphp:149 GLAccountReport.php:93
#: PO_Items.php:416 PO_Items.php:538 PO_Items.php:562
#: SalesAnalReptCols.php:356 SpecialOrder.php:370
@@ -843,12 +876,12 @@
msgid "could not be retrieved because"
msgstr "se nepodařilo získat, protože"
-#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
-#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
-#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
+#: AgedDebtors.php:374 AgedSuppliers.php:194 Areas.php:95
+#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:957
+#: ConfirmDispatch_Invoice.php:971 Contracts.php:581 CounterSales.php:1323
#: CounterSales.php:1337 Credit_Invoice.php:703 Credit_Invoice.php:725
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
-#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
+#: CustomerTransInquiry.php:82 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
#: PurchData.php:95 PurchData.php:113 PurchData.php:245 ReverseGRN.php:191
#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1372
@@ -887,7 +920,7 @@
msgid "To Customer Code"
msgstr "Do kódu zákazníka"
-#: AgedDebtors.php:471 AgedSuppliers.php:293
+#: AgedDebtors.php:471 AgedSuppliers.php:285
msgid "All balances or overdues only"
msgstr "Všechny zůstatky nebo overdues pouze"
@@ -895,7 +928,7 @@
msgid "All customers with balances"
msgstr "Všichni zákazníci s bilancí"
-#: AgedDebtors.php:474 AgedSuppliers.php:296
+#: AgedDebtors.php:474 AgedSuppliers.php:288
msgid "Overdue accounts only"
msgstr "Po lhůtě splatnosti účtů"
@@ -907,28 +940,33 @@
msgid "Only Show Customers Of"
msgstr "Zobrazit jen zákazníky"
-#: AgedDebtors.php:493
+#: AgedDebtors.php:486
+#, fuzzy
+msgid "All Sales people"
+msgstr "Všechny Prodejci"
+
+#: AgedDebtors.php:492
msgid "Only show customers trading in"
msgstr "Zobrazovat pouze zákazníkům obchodování"
-#: AgedDebtors.php:508
+#: AgedDebtors.php:507
msgid "Summary or detailed report"
msgstr "Souhrn nebo podrobné zprávy"
-#: AgedDebtors.php:510 AgedSuppliers.php:316 InventoryValuation.php:247
+#: AgedDebtors.php:509 AgedSuppliers.php:308 InventoryValuation.php:247
msgid "Summary Report"
msgstr "Souhrnná zpráva"
-#: AgedDebtors.php:511 AgedSuppliers.php:317 InventoryValuation.php:248
+#: AgedDebtors.php:510 AgedSuppliers.php:309 InventoryValuation.php:248
msgid "Detailed Report"
msgstr "Podrobná zpráva"
-#: AgedDebtors.php:516 AgedSuppliers.php:320 BOMExtendedQty.php:286
-#: BOMIndented.php:271 BOMIndentedReverse.php:255 BOMListing.php:132
+#: AgedDebtors.php:515 AgedSuppliers.php:312 BOMExtendedQty.php:282
+#: BOMIndented.php:272 BOMIndentedReverse.php:250 BOMListing.php:132
#: DebtorsAtPeriodEnd.php:156 InventoryPlanning.php:442
#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:187
#: InventoryValuation.php:251 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:290
+#: MRPPlannedWorkOrders.php:335 MRPReschedules.php:140 MRPShortages.php:290
#: OutstandingGRNs.php:162 PDFCustomerList.php:410 PDFLowGP.php:145
#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
#: PDFStockCheckComparison.php:379 PrintCustTrans.php:506
@@ -937,53 +975,53 @@
msgid "Print PDF"
msgstr "Tisknout PDF"
-#: AgedSuppliers.php:18
+#: AgedSuppliers.php:15
msgid "Aged Supplier Listing"
msgstr "Dodavatel ve věku Výpis"
-#: AgedSuppliers.php:19
+#: AgedSuppliers.php:16
msgid "Aged Suppliers"
msgstr "Ve věku od dodavatelů"
-#: AgedSuppliers.php:105
+#: AgedSuppliers.php:107
msgid "Aged Supplier Account Analysis"
msgstr "Dodavatel ve věku účtu analýza"
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:55
+#: AgedSuppliers.php:109 SupplierBalsAtPeriodEnd.php:55
msgid "The Supplier details could not be retrieved by the SQL because"
msgstr "Dodavatel údaje se nepodařilo získat do SQL, protože"
-#: AgedSuppliers.php:187
+#: AgedSuppliers.php:189
msgid "Aged Supplier Account Analysis - Problem Report"
msgstr "Dodavatel ve věku účtu analýza - nahlášení problému"
-#: AgedSuppliers.php:189
+#: AgedSuppliers.php:191
msgid "The details of outstanding transactions for Supplier"
msgstr "Podrobnosti o nesplacených transakcí pro dodavatele"
-#: AgedSuppliers.php:273
+#: AgedSuppliers.php:264
msgid "Aged Supplier Analysis"
msgstr "Dodavatel ve věku analýza"
-#: AgedSuppliers.php:286 OutstandingGRNs.php:157 PDFRemittanceAdvice.php:138
+#: AgedSuppliers.php:278 OutstandingGRNs.php:157 PDFRemittanceAdvice.php:138
#: SupplierBalsAtPeriodEnd.php:131 SuppPaymentRun.php:259
msgid "From Supplier Code"
msgstr "Od kódu dodavatele"
-#: AgedSuppliers.php:289 OutstandingGRNs.php:159 PDFRemittanceAdvice.php:140
+#: AgedSuppliers.php:281 OutstandingGRNs.php:159 PDFRemittanceAdvice.php:140
#: SupplierBalsAtPeriodEnd.php:133 SuppPaymentRun.php:261
msgid "To Supplier Code"
msgstr "Do kódu dodavatele"
-#: AgedSuppliers.php:295
+#: AgedSuppliers.php:287
msgid "All suppliers with balances"
msgstr "Všem dodavatelům s bilancí"
-#: AgedSuppliers.php:299
+#: AgedSuppliers.php:291
msgid "For suppliers trading in"
msgstr "Pro dodavatele obchodování"
-#: AgedSuppliers.php:314 InventoryValuation.php:245
+#: AgedSuppliers.php:306 InventoryValuation.php:245
msgid "Summary or Detailed Report"
msgstr "Souhrnné nebo podrobné zprávy"
@@ -1090,25 +1128,25 @@
msgid "Incorrect date format used, please re-enter"
msgstr "Nesprávné datum používaného formátu, prosím, re-zadání"
-#: AuditTrail.php:35 BOMIndented.php:309 BOMIndentedReverse.php:294
+#: AuditTrail.php:35 BOMIndented.php:310 BOMIndentedReverse.php:289
#: MRPCalendar.php:258
msgid "From Date"
msgstr "Od data"
-#: AuditTrail.php:37 BOMIndented.php:310 BOMIndentedReverse.php:295
+#: AuditTrail.php:37 BOMIndented.php:311 BOMIndentedReverse.php:290
#: MRPCalendar.php:260
msgid "To Date"
msgstr "To Date"
#: AuditTrail.php:41 PO_AuthorisationLevels.php:123
#: PO_AuthorisationLevels.php:170 PO_AuthorisationLevels.php:173
-#: UserSettings.php:109
+#: UserSettings.php:110
msgid "User ID"
msgstr "ID uživatele"
-#: AuditTrail.php:43 AuditTrail.php:56 ContractBOM.php:297
-#: CounterSales.php:2113 CounterSales.php:2116 DailySalesInquiry.php:41
-#: DailySalesInquiry.php:43 FixedAssetRegister.php:56
+#: AuditTrail.php:43 AuditTrail.php:56 ContractBOM.php:300
+#: CounterSales.php:2113 CounterSales.php:2116 CustomerTransInquiry.php:29
+#: DailySalesInquiry.php:41 DailySalesInquiry.php:43 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:153
#: InventoryQuantities.php:175 InventoryQuantities.php:177 MRP.php:562
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:135
@@ -1136,7 +1174,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:739
+#: SelectContract.php:193 SelectProduct.php:739
msgid "View"
msgstr "Zobrazit"
@@ -1148,9 +1186,9 @@
msgid "User"
msgstr "Uživatel"
-#: AuditTrail.php:146 BankReconciliation.php:195 BankReconciliation.php:267
+#: AuditTrail.php:146 BankReconciliation.php:199 BankReconciliation.php:271
#: CustomerAllocations.php:355 CustomerInquiry.php:190
-#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
+#: CustomerTransInquiry.php:18 CustomerTransInquiry.php:88
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
#: GLJournal.php:240 MRPReschedules.php:178 SalesByTypePeriodInquiry.php:327
@@ -1258,35 +1296,35 @@
msgid "Bank account deleted"
msgstr "Bankovní účet smazán"
-#: BankAccounts.php:184
+#: BankAccounts.php:183
msgid "The bank accounts set up could not be retrieved because"
msgstr "Bankovní účty zřízené se nepodařilo získat, protože"
-#: BankAccounts.php:185
+#: BankAccounts.php:184
msgid "The SQL used to retrieve the bank account details was"
msgstr "SQL používá k načtení údaje o bankovním účtu bylo"
-#: BankAccounts.php:191 GLJournal.php:264
+#: BankAccounts.php:190 GLJournal.php:264
msgid "GL Account Code"
msgstr "GL kódu účtu"
-#: BankAccounts.php:192 BankAccounts.php:321
+#: BankAccounts.php:191 BankAccounts.php:323
msgid "Bank Account Name"
msgstr "Název bankovního účtu"
-#: BankAccounts.php:193 BankAccounts.php:323
+#: BankAccounts.php:192 BankAccounts.php:325
msgid "Bank Account Code"
msgstr "Bankovní účet kódu"
-#: BankAccounts.php:194 BankAccounts.php:325
+#: BankAccounts.php:193 BankAccounts.php:327
msgid "Bank Account Number"
msgstr "Číslo bankovního účtu"
-#: BankAccounts.php:195 BankAccounts.php:327
+#: BankAccounts.php:194 BankAccounts.php:329
msgid "Bank Address"
msgstr "Adresa banky"
-#: BankAccounts.php:196 CustomerReceipt.php:753 CustomerTransInquiry.php:95
+#: BankAccounts.php:195 CustomerReceipt.php:753 CustomerTransInquiry.php:98
#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:206 PcTabs.php:349
#: PDFPrintLabel.php:93 PO_AuthorisationLevels.php:125
#: PO_AuthorisationLevels.php:205 PO_AuthorisationLevels.php:210
@@ -1301,19 +1339,24 @@
msgid "Currency"
msgstr "Měna"
-#: BankAccounts.php:197 BankAccounts.php:346
+#: BankAccounts.php:196 BankAccounts.php:352
msgid "Default for Invoices"
msgstr "Výchozí pro Faktury"
-#: BankAccounts.php:246
+#: BankAccounts.php:221
+#, fuzzy, php-format
+msgid "Are you sure you wish to delete this bank account?"
+msgstr "Jste si jisti, že chcete smazat tento obor?"
+
+#: BankAccounts.php:245
msgid "Show All Bank Accounts Defined"
msgstr "Zobrazit všechny bankovní účty definované"
-#: BankAccounts.php:279 BankAccounts.php:282
+#: BankAccounts.php:279 BankAccounts.php:284
msgid "Bank Account GL Code"
msgstr "Bankovní účet GL kód"
-#: BankAccounts.php:329
+#: BankAccounts.php:331
msgid "Currency Of Account"
msgstr "Měna účtu"
@@ -1358,16 +1401,16 @@
msgid "Could not match off this payment because"
msgstr "Nemohl zápas z této platby, protože"
-#: BankMatching.php:63
+#: BankMatching.php:64
msgid "Could not update the amount matched off this bank transaction because"
msgstr ""
"Nepodařilo se aktualizovat částku uzavřeno z této banky, protože transakce"
-#: BankMatching.php:69
+#: BankMatching.php:70
msgid "Could not unclear this bank transaction because"
msgstr "Nemohu nejasné tento bankovní transakci, protože"
-#: BankMatching.php:77
+#: BankMatching.php:78
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 "
@@ -1377,24 +1420,24 @@
"účtu. Zkontrolujte, zda vaše bankovní výpis a klikněte na check-box, když "
"zjistíte, odpovídající transakce."
-#: BankMatching.php:85 BankReconciliation.php:99 CustomerReceipt.php:726
+#: BankMatching.php:87 BankReconciliation.php:101 CustomerReceipt.php:726
#: DailyBankTransactions.php:29 Payments.php:737 PDFChequeListing.php:44
#: TaxAuthorities.php:149 TaxAuthorities.php:305
msgid "Bank Account"
msgstr "Bankovní účet"
-#: BankMatching.php:107
+#: BankMatching.php:110
msgid "Show"
msgstr "Zobrazit"
-#: BankMatching.php:107 CreditItemsControlled.php:78 FreightCosts.php:267
+#: BankMatching.php:110 CreditItemsControlled.php:78 FreightCosts.php:267
#: GoodsReceivedControlled.php:65 GoodsReceived.php:65
#: StockLocTransferReceive.php:426 SupplierAllocations.php:434
#: SuppShiptChgs.php:129
msgid "from"
msgstr "od"
-#: BankMatching.php:110 ConfirmDispatchControlled_Invoice.php:58
+#: BankMatching.php:113 ConfirmDispatchControlled_Invoice.php:58
#: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
#: GLAccountCSV.php:171 GLAccountReport.php:102 Payments.php:717
#: PcReportTab.php:102 PDFChequeListing.php:107 PDFChequeListing.php:117
@@ -1424,29 +1467,29 @@
msgid "to"
msgstr "na"
-#: BankMatching.php:112
+#: BankMatching.php:115
msgid "Choose outstanding"
msgstr "Zvolte vynikající"
-#: BankMatching.php:112
+#: BankMatching.php:115
msgid "only or all"
msgstr "jen nebo všechny"
-#: BankMatching.php:112 BankMatching.php:116 BankMatching.php:119
-#: BankMatching.php:127 BankMatching.php:130
+#: BankMatching.php:115 BankMatching.php:119 BankMatching.php:122
+#: BankMatching.php:130 BankMatching.php:133
msgid "in the date range"
msgstr "v rozmezí dat"
-#: BankMatching.php:116 BankMatching.php:119 BankMatching.php:127
-#: BankMatching.php:130
+#: BankMatching.php:119 BankMatching.php:122 BankMatching.php:130
+#: BankMatching.php:133
msgid "Show all"
msgstr "Zobrazit všechny"
-#: BankMatching.php:117 BankMatching.php:120
+#: BankMatching.php:120 BankMatching.php:123
msgid "Show unmatched"
msgstr "Zobrazit bezkonkurenční"
-#: BankMatching.php:117 BankMatching.php:120 ReverseGRN.php:103
+#: BankMatching.php:120 BankMatching.php:123 ReverseGRN.php:103
#: includes/PDFCustomerListPageHeader.inc:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:24
#: includes/PDFDIFOTPageHeader.inc:24
@@ -1455,62 +1498,62 @@
msgid "only"
msgstr "jen"
-#: BankMatching.php:124
+#: BankMatching.php:127
msgid "Choose to display only the first 20 matching"
msgstr "Vyberte, zda chcete zobrazit pouze prvních 20 odpovídající"
-#: BankMatching.php:125
+#: BankMatching.php:128
msgid "or all"
msgstr "nebo všechny"
-#: BankMatching.php:125
+#: BankMatching.php:128
msgid "meeting the criteria"
msgstr "splňující kritéria"
-#: BankMatching.php:128 BankMatching.php:131
+#: BankMatching.php:131 BankMatching.php:134
msgid "Show only the first 20"
msgstr "Zobrazit jen prvních 20"
-#: BankMatching.php:136
+#: BankMatching.php:139
msgid "Show selected"
msgstr "Zobrazit vybrané"
-#: BankMatching.php:137
+#: BankMatching.php:140
msgid "Show reconciliation"
msgstr "Zobrazit usmíření"
-#: BankMatching.php:143 BankMatching.php:149
+#: BankMatching.php:146 BankMatching.php:152
msgid "The date entered for the field to show"
msgstr "Datum vstoupil na pole show"
-#: BankMatching.php:143
+#: BankMatching.php:146
msgid "before"
msgstr "před"
-#: BankMatching.php:144 BankMatching.php:150
+#: BankMatching.php:147 BankMatching.php:153
msgid "is not entered in a recognised date format"
msgstr "není zapsán v uznávané formátu data"
-#: BankMatching.php:144 BankMatching.php:150
+#: BankMatching.php:147 BankMatching.php:153
msgid "Entry is expected in the format"
msgstr "Vstup se očekává ve formátu"
-#: BankMatching.php:149
+#: BankMatching.php:152
msgid "after"
msgstr "po"
-#: BankMatching.php:223
+#: BankMatching.php:226
msgid "The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
-#: BankMatching.php:226 ShipmentCosting.php:507 ShipmentCosting.php:578
+#: BankMatching.php:229 ShipmentCosting.php:507 ShipmentCosting.php:578
#: SupplierAllocations.php:455
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
+#: BankMatching.php:232 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
#: CustomerAllocations.php:358 CustomerReceipt.php:842
-#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
+#: CustomerTransInquiry.php:97 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
#: PcAssignCashToTab.php:218 PcAssignCashToTab.php:339
#: PcAuthorizeExpenses.php:89 PcClaimExpensesFromTab.php:212
@@ -1528,7 +1571,7 @@
msgid "Amount"
msgstr "Částka"
-#: BankMatching.php:230 BankReconciliation.php:199 BankReconciliation.php:271
+#: BankMatching.php:233 BankReconciliation.php:203 BankReconciliation.php:275
#: PDFOrdersInvoiced.php:345 PDFOrderStatus.php:319
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:180
#: Shipt_Select.php:182 SuppCreditGRNs.php:227
@@ -1537,15 +1580,15 @@
msgid "Outstanding"
msgstr "Vynikající"
-#: BankMatching.php:231
+#: BankMatching.php:234
msgid "Clear"
msgstr "Jasný"
-#: BankMatching.php:231 BankMatching.php:259
+#: BankMatching.php:234 BankMatching.php:262
msgid "Unclear"
msgstr "Nejasný"
-#: BankMatching.php:305
+#: BankMatching.php:308
msgid "Update Matching"
msgstr "Odpovídající aktualizace"
@@ -1563,86 +1606,86 @@
"měly být zaneseny. Kurzových rozdílů nebyla vypočtena žádná obecná a knihy "
"časopis byl vytvořen"
-#: BankReconciliation.php:33
+#: BankReconciliation.php:34
msgid "Could not retrieve the exchange rate for the selected bank account"
msgstr "Nepodařilo se načíst směnný kurz pro vybrané bankovní účet"
-#: BankReconciliation.php:63 BankReconciliation.php:81
+#: BankReconciliation.php:65 BankReconciliation.php:83
msgid "reconciliation on"
msgstr "usmíření, na"
-#: BankReconciliation.php:66
+#: BankReconciliation.php:68
msgid "Cannot insert a GL entry for the exchange difference because"
msgstr "Nelze vložit záznam GL pro výměnu rozdíl, protože"
-#: BankReconciliation.php:67
+#: BankReconciliation.php:69
msgid "The SQL that failed to insert the exchange difference GL entry was"
msgstr "SQL, které se nepodařilo vložit kurzový rozdíl GL vstup"
-#: BankReconciliation.php:87
+#: BankReconciliation.php:89
msgid "Exchange difference of"
msgstr "Kurzových rozdílů z"
-#: BankReconciliation.php:87
+#: BankReconciliation.php:89
msgid "has been posted"
msgstr "byl vyslán"
-#: BankReconciliation.php:95 SuppPaymentRun.php:300
+#: BankReconciliation.php:97 SuppPaymentRun.php:300
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr "Bankovní účty se nepodařilo získat na SQL, protože"
-#: BankReconciliation.php:96 CustomerReceipt.php:717
+#: BankReconciliation.php:98 CustomerReceipt.php:717
#: DailyBankTransactions.php:26 Payments.php:734 SuppPaymentRun.php:302
msgid "The SQL used to retrieve the bank accounts was"
msgstr "SQL slouží k získání bankovní účty byly"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
msgid "Bank Accounts have not yet been defined"
msgstr "Bankovní účty dosud nebyly definovány"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
msgid "You must first"
msgstr "Musíte nejprve"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
#: DailyBankTransactions.php:34 Payments.php:742 SuppPaymentRun.php:310
msgid "define the bank accounts"
msgstr "definovat bankovních účtů"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
#: DailyBankTransactions.php:34 Payments.php:742 SuppPaymentRun.php:310
msgid "and general ledger accounts to be affected"
msgstr "a účtů hlavní knihy mohly být postiženy"
-#: BankReconciliation.php:125
+#: BankReconciliation.php:128
msgid "Show bank reconciliation statement"
msgstr "Zobrazit bankovní prohlášení o smíření"
-#: BankReconciliation.php:144
+#: BankReconciliation.php:147
msgid "The bank account balance could not be returned by the SQL because"
msgstr "Bankovního účtu nemůže být vrácen, protože SQL"
-#: BankReconciliation.php:157
+#: BankReconciliation.php:160
msgid ""
"Could not retrieve the currency and exchange rate for the selected bank "
"account"
msgstr "Nepodařilo se načíst měny a směnného kurzu pro zvolený bankovní účet"
-#: BankReconciliation.php:165
+#: BankReconciliation.php:168
msgid "Balance as at"
msgstr "Zůstatek k"
-#: BankReconciliation.php:188
+#: BankReconciliation.php:192
msgid "The unpresented cheques could not be retrieved by the SQL because"
msgstr "Unpresented Kontroly se nepodařilo získat do SQL, protože"
-#: BankReconciliation.php:191
+#: BankReconciliation.php:195
msgid "Add back unpresented cheques"
msgstr "Přidat zpět unpresented kontroly"
-#: BankReconciliation.php:196 BankReconciliation.php:268
+#: BankReconciliation.php:200 BankReconciliation.php:272
#: CustomerAllocations.php:330 CustomerAllocations.php:356
-#: CustomerInquiry.php:191 CustomerTransInquiry.php:86 CustWhereAlloc.php:89
+#: CustomerInquiry.php:191 CustomerTransInquiry.php:89 CustWhereAlloc.php:89
#: EmailCustTrans.php:15 GLAccountInquiry.php:153 GLAccountReportphp:156
#: PrintCustTrans.php:450 PrintCustTrans.php:651 PrintCustTrans.php:871
#: PrintCustTrans.php:918 PrintCustTransPortrait.php:502
@@ -1659,8 +1702,8 @@
msgid "Number"
msgstr "Číslo"
-#: BankReconciliation.php:197 BankReconciliation.php:269
-#: ContractCosting.php:148 CustomerInquiry.php:194 CustomerTransInquiry.php:90
+#: BankReconciliation.php:201 BankReconciliation.php:273
+#: ContractCosting.php:150 CustomerInquiry.php:194 CustomerTransInquiry.php:93
#: CustWhereAlloc.php:90 DailyBankTransactions.php:105 GLAccountReport.php:368
#: PaymentAllocations.php:75 PaymentAllocations.php:76
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
@@ -1676,39 +1719,39 @@
msgid "Reference"
msgstr "Reference"
-#: BankReconciliation.php:198 BankReconciliation.php:270
+#: BankReconciliation.php:202 BankReconciliation.php:274
msgid "Orig Amount"
msgstr "Orig Částka"
-#: BankReconciliation.php:241
+#: BankReconciliation.php:245
msgid "Total of all unpresented cheques"
msgstr "Celkem ze všech kontrol unpresented"
-#: BankReconciliation.php:259
+#: BankReconciliation.php:263
msgid "The uncleared deposits could not be retrieved by the SQL because"
msgstr "Uncleared vklady se nepodařilo získat do SQL, protože"
-#: BankReconciliation.php:263
+#: BankReconciliation.php:267
msgid "Less deposits not cleared"
msgstr "Méně vklady nejsou schváleny"
-#: BankReconciliation.php:313
+#: BankReconciliation.php:318
msgid "Total of all uncleared deposits"
msgstr "Souhrn všech vkladů uncleared"
-#: BankReconciliation.php:315
+#: BankReconciliation.php:324
msgid "Bank statement balance should be"
msgstr "Bankovní výpis bilance by měla být"
-#: BankReconciliation.php:319
+#: BankReconciliation.php:329
msgid "Enter the actual bank statement balance"
msgstr "Zadejte aktuální výpis z účtu zůstatek"
-#: BankReconciliation.php:321 BankReconciliation.php:331
+#: BankReconciliation.php:331 BankReconciliation.php:341
msgid "Calculate and Post Exchange Difference"
msgstr "Vypočítat a příspěvek kurzových rozdílů"
-#: BankReconciliation.php:321
+#: BankReconciliation.php:331
msgid ""
"This will create a general ledger journal to write off the exchange "
"difference in the current balance of the account. It is important that the "
@@ -1718,13 +1761,13 @@
"zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu "
"měny bankovního účtu"
-#: BankReconciliation.php:321 CounterSales.php:781 Customers.php:1024
+#: BankReconciliation.php:331 CounterSales.php:781 Customers.php:1000
#: SelectOrderItems.php:1381 Stocks.php:1041 WorkOrderCosting.php:517
#: WorkOrderEntry.php:548
msgid "Are You Sure?"
msgstr "Opravdu provést?"
-#: BankReconciliation.php:330
+#: BankReconciliation.php:340
msgid ""
"It is normal for foreign currency accounts to have exchange differences that "
"need to be reflected as the exchange rate varies. This reconciliation is "
@@ -1741,58 +1784,58 @@
"vytvořit časopis, aby odrážely kurzový rozdíl na základě aktuálního směnného "
"kurzu k opravě k usmíření skutečného stavu bankovního výpisu klikněte níže."
-#: BankReconciliation.php:338 BankReconciliation.php:341
+#: BankReconciliation.php:348 BankReconciliation.php:351
msgid "Match off cleared payments"
msgstr "Utkání vypnutí vymazány plateb"
-#: BankReconciliation.php:339 BankReconciliation.php:342
+#: BankReconciliation.php:349 BankReconciliation.php:352
msgid "Match off cleared deposits"
msgstr "Utkání vypnutí vymazány vklady"
-#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:269
+#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:149
+#: BOMExtendedQty.php:256
msgid "Quantity Extended BOM Listing"
msgstr "Množství Rozšířené kusovníku Výpis"
-#: BOMExtendedQty.php:32 BOMIndentedReverse.php:29 MRPCalendar.php:85
+#: BOMExtendedQty.php:29 BOMIndentedReverse.php:26 MRPCalendar.php:85
#: MRP.php:27
msgid "The SQL to to create passbom failed with the message"
msgstr "SQL k vytvoření passbom nepodařilo se zprávou"
-#: BOMExtendedQty.php:45 BOMIndented.php:40 BOMIndentedReverse.php:42
+#: BOMExtendedQty.php:42 BOMIndented.php:40 BOMIndentedReverse.php:39
#: MRP.php:34
msgid "Create of tempbom failed because"
msgstr "Vytvořit z tempbom se nezdařila, protože"
-#: BOMExtendedQty.php:161
+#: BOMExtendedQty.php:151
msgid ""
"The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
msgstr "Quantiy Rozšířená rozpisky Výpis se nepodařilo získat na SQL, protože"
-#: BOMExtendedQty.php:256 BOMIndented.php:231
+#: BOMExtendedQty.php:243 BOMIndented.php:231
msgid "Print Indented BOM Listing Error"
msgstr "Tisk Odsazené kusovníku výpis chyby"
-#: BOMExtendedQty.php:258 BOMIndented.php:233
+#: BOMExtendedQty.php:245 BOMIndented.php:233
msgid "There were no items for the selected assembly"
msgstr "Nebyly zjištěny žádné položky pro vybraný montáž"
-#: BOMExtendedQty.php:276 BOMIndented.php:252 BOMIndentedReverse.php:249
+#: BOMExtendedQty.php:263 BOMIndented.php:253 BOMIndentedReverse.php:242
msgid "Part"
msgstr "Část"
-#: BOMExtendedQty.php:277 BOMExtendedQty.php:328 BOMExtendedQty.php:329
-#: BOMExtendedQty.php:330 BOMExtendedQty.php:331 BOMIndented.php:308
-#: BOMIndentedReverse.php:293 BOMInquiry.php:173 BOMs.php:516 BOMs.php:677
-#: ContractBOM.php:241 ContractBOM.php:344 ContractCosting.php:74
-#: ContractCosting.php:80 ContractCosting.php:131 ContractOtherReqts.php:95
-#: Contracts.php:932 Contracts.php:956 CounterSales.php:701
+#: BOMExtendedQty.php:265 BOMExtendedQty.php:325 BOMExtendedQty.php:326
+#: BOMExtendedQty.php:327 BOMExtendedQty.php:328 BOMIndented.php:309
+#: BOMIndentedReverse.php:288 BOMInquiry.php:178 BOMs.php:522 BOMs.php:685
+#: ContractBOM.php:239 ContractBOM.php:347 ContractCosting.php:73
+#: ContractCosting.php:79 ContractCosting.php:130 ContractOtherReqts.php:92
+#: Contracts.php:938 Contracts.php:963 CounterSales.php:701
#: CounterSales.php:1994 CounterSales.php:2174 CounterSales.php:2302
#: Credit_Invoice.php:273 DeliveryDetails.php:822 DeliveryDetails.php:887
#: GoodsReceived.php:88 GoodsReceived.php:92 GoodsReceived.php:95
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
-#: MRPPlannedWorkOrders.php:259 MRPPlannedWorkOrders.php:387 MRPReport.php:413
+#: MRPPlannedWorkOrders.php:258 MRPPlannedWorkOrders.php:379 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:179 OffersReceived.php:95
#: OffersReceived.php:197 OffersReceived.php:244 OrderDetails.php:155
#: PDFOrdersInvoiced.php:384 POReport.php:743 POReport.php:1428
@@ -1807,7 +1850,7 @@
#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
-#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
+#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:185
#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
@@ -1833,44 +1876,44 @@
msgid "Quantity"
msgstr "Množství"
-#: BOMExtendedQty.php:278
+#:...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-18 05:13:49
|
Revision: 4599
http://web-erp.svn.sourceforge.net/web-erp/?rev=4599&view=rev
Author: daintree
Date: 2011-06-18 05:13:36 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
doh
Modified Paths:
--------------
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04.4-4.04.5.sql
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-18 04:55:08 UTC (rev 4598)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-18 05:13:36 UTC (rev 4599)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-12 21:39+1200\n"
+"POT-Creation-Date: 2011-06-18 17:04+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -130,11 +130,11 @@
"pomocí této skupině"
#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:137
-#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:125
-#: Currencies.php:143 Currencies.php:151 Currencies.php:158
+#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:123
+#: Currencies.php:164 Currencies.php:172 Currencies.php:180
#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
-#: CustomerBranches.php:316 Customers.php:311 Customers.php:320
-#: Customers.php:328 Customers.php:336 CustomerTypes.php:147
+#: CustomerBranches.php:316 Customers.php:312 Customers.php:321
+#: Customers.php:329 Customers.php:337 CustomerTypes.php:147
#: CustomerTypes.php:157 Factors.php:134 FixedAssetCategories.php:130
#: GLAccounts.php:80 GLAccounts.php:94 Locations.php:244 Locations.php:252
#: Locations.php:261 Locations.php:269 Locations.php:277 Locations.php:285
@@ -193,12 +193,12 @@
msgstr "Nemohu získat účetní skupiny, protože"
#: AccountGroups.php:224 AccountSections.php:175 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:277
+#: AddCustomerContacts.php:28 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:95 AgedDebtors.php:454 AgedSuppliers.php:268
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13
-#: BOMExtendedQty.php:272 BOMIndented.php:247 BOMIndentedReverse.php:246
-#: BOMInquiry.php:165 BOMListing.php:112 BOMs.php:208 BOMs.php:790
-#: COGSGLPostings.php:18 CompanyPreferences.php:155 CounterSales.php:1983
+#: BOMExtendedQty.php:259 BOMIndented.php:246 BOMIndentedReverse.php:236
+#: BOMInquiry.php:171 BOMListing.php:112 BOMs.php:208 BOMs.php:798
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:1983
#: CounterSales.php:2107 Credit_Invoice.php:255 CreditStatus.php:20
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:10
#: DebtorsAtPeriodEnd.php:124 DiscountCategories.php:10
@@ -218,7 +218,7 @@
#: RecurringSalesOrders.php:310 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:34
#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
-#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
+#: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
#: SelectOrderItems.php:1563 SelectProduct.php:485 SelectSalesOrder.php:454
@@ -231,7 +231,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:110 WorkCentres.php:157
#: WorkOrderCosting.php:12 WorkOrderEntry.php:10 WorkOrderIssue.php:20
#: WorkOrderReceive.php:13 WorkOrderStatus.php:41 WWW_Access.php:11
-#: WWW_Users.php:31 Z_BottomUpCosts.php:51
+#: WWW_Users.php:32 Z_BottomUpCosts.php:51
msgid "Search"
msgstr "Vyhledávání"
@@ -258,19 +258,18 @@
msgstr "Rodičovská skupina"
#: AccountGroups.php:248 AccountGroups.php:251 AccountGroups.php:381
-#: AccountGroups.php:383 BankAccounts.php:212 BankAccounts.php:356
-#: BankAccounts.php:358 BankAccounts.php:362 BOMs.php:122 BOMs.php:709
-#: BOMs.php:711 CompanyPreferences.php:439 CompanyPreferences.php:441
-#: CompanyPreferences.php:452 CompanyPreferences.php:454
-#: CompanyPreferences.php:465 CompanyPreferences.php:467
-#: ContractCosting.php:174 CustLoginSetup.php:578 CustLoginSetup.php:580
-#: CustomerBranches.php:410 Customers.php:595 Customers.php:863
-#: Customers.php:871 Customers.php:874 DeliveryDetails.php:1064
-#: DeliveryDetails.php:1104 DeliveryDetails.php:1107 GLTransInquiry.php:69
-#: MRPCalendar.php:220 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: PaymentMethods.php:199 PaymentMethods.php:200 PaymentMethods.php:201
-#: PaymentMethods.php:264 PaymentMethods.php:270 PaymentMethods.php:276
-#: PcAuthorizeExpenses.php:239 PDFChequeListing.php:62
+#: AccountGroups.php:383 BankAccounts.php:211 BankAccounts.php:366
+#: BankAccounts.php:370 BankAccounts.php:374 BOMs.php:122 BOMs.php:717
+#: BOMs.php:719 CompanyPreferences.php:443 CompanyPreferences.php:445
+#: CompanyPreferences.php:456 CompanyPreferences.php:458
+#: CompanyPreferences.php:469 CompanyPreferences.php:471
+#: ContractCosting.php:176 CustomerBranches.php:410 Customers.php:597
+#: Customers.php:865 Customers.php:873 Customers.php:876
+#: DeliveryDetails.php:1064 DeliveryDetails.php:1104 DeliveryDetails.php:1107
+#: GLTransInquiry.php:69 MRPCalendar.php:220 MRP.php:527 MRP.php:531
+#: MRP.php:535 MRP.php:539 PaymentMethods.php:199 PaymentMethods.php:200
+#: PaymentMethods.php:201 PaymentMethods.php:264 PaymentMethods.php:270
+#: PaymentMethods.php:276 PcAuthorizeExpenses.php:239 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
#: PO_Header.php:761 PO_PDFPurchOrder.php:360 PO_PDFPurchOrder.php:363
@@ -290,24 +289,23 @@
#: SystemParameters.php:893 SystemParameters.php:895 SystemParameters.php:905
#: SystemParameters.php:907 SystemParameters.php:961 SystemParameters.php:973
#: SystemParameters.php:975 TaxGroups.php:293 TaxGroups.php:296
-#: TaxGroups.php:345 WWW_Users.php:605 WWW_Users.php:607
+#: TaxGroups.php:345 WWW_Users.php:592 WWW_Users.php:594
msgid "Yes"
msgstr "Ano"
#: AccountGroups.php:254 AccountGroups.php:386 AccountGroups.php:388
-#: BankAccounts.php:210 BankAccounts.php:356 BankAccounts.php:358
-#: BankAccounts.php:363 BOMs.php:124 BOMs.php:708 BOMs.php:712
-#: CompanyPreferences.php:438 CompanyPreferences.php:442
-#: CompanyPreferences.php:451 CompanyPreferences.php:455
-#: CompanyPreferences.php:464 CompanyPreferences.php:468
-#: ContractCosting.php:172 CustLoginSetup.php:577 CustLoginSetup.php:581
-#: CustomerBranches.php:410 Customers.php:594 Customers.php:859
-#: Customers.php:870 Customers.php:873 DeliveryDetails.php:1065
-#: DeliveryDetails.php:1105 DeliveryDetails.php:1108 GLTransInquiry.php:123
-#: MRPCalendar.php:222 MRP.php:525 MRP.php:529 MRP.php:533 MRP.php:537
-#: PaymentMethods.php:199 PaymentMethods.php:200 PaymentMethods.php:201
-#: PaymentMethods.php:265 PaymentMethods.php:271 PaymentMethods.php:277
-#: PcAuthorizeExpenses.php:237 PDFChequeListing.php:61
+#: BankAccounts.php:209 BankAccounts.php:367 BankAccounts.php:369
+#: BankAccounts.php:375 BOMs.php:124 BOMs.php:716 BOMs.php:720
+#: CompanyPreferences.php:442 CompanyPreferences.php:446
+#: CompanyPreferences.php:455 CompanyPreferences.php:459
+#: CompanyPreferences.php:468 CompanyPreferences.php:472
+#: ContractCosting.php:174 CustomerBranches.php:410 Customers.php:596
+#: Customers.php:861 Customers.php:872 Customers.php:875
+#: DeliveryDetails.php:1065 DeliveryDetails.php:1105 DeliveryDetails.php:1108
+#: GLTransInquiry.php:123 MRPCalendar.php:222 MRP.php:525 MRP.php:529
+#: MRP.php:533 MRP.php:537 PaymentMethods.php:199 PaymentMethods.php:200
+#: PaymentMethods.php:201 PaymentMethods.php:265 PaymentMethods.php:271
+#: PaymentMethods.php:277 PcAuthorizeExpenses.php:237 PDFChequeListing.php:61
#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
#: PO_Header.php:760 PO_PDFPurchOrder.php:361 PO_PDFPurchOrder.php:364
@@ -327,17 +325,17 @@
#: SystemParameters.php:892 SystemParameters.php:896 SystemParameters.php:904
#: SystemParameters.php:908 SystemParameters.php:962 SystemParameters.php:972
#: SystemParameters.php:976 TaxGroups.php:294 TaxGroups.php:297
-#: TaxGroups.php:347 WWW_Users.php:604 WWW_Users.php:608
+#: TaxGroups.php:347 WWW_Users.php:591 WWW_Users.php:595
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "Ne"
-#: AccountGroups.php:263 AccountSections.php:195 AddCustomerContacts.php:131
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:164
-#: BankAccounts.php:221 BOMs.php:144 COGSGLPostings.php:108
-#: COGSGLPostings.php:211 CreditStatus.php:174 Currencies.php:238
-#: CustLoginSetup.php:307 CustomerBranches.php:414 Customers.php:917
-#: Customers.php:949 CustomerTypes.php:202 EDIMessageFormat.php:150
+#: AccountGroups.php:263 AccountSections.php:196 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:132 AddCustomerTypeNotes.php:123 Areas.php:164
+#: BankAccounts.php:220 BOMs.php:144 COGSGLPostings.php:107
+#: COGSGLPostings.php:204 CreditStatus.php:172 Currencies.php:269
+#: CustLoginSetup.php:219 CustomerBranches.php:414 Customers.php:940
+#: Customers.php:973 CustomerTypes.php:202 EDIMessageFormat.php:150
#: Factors.php:299 FixedAssetCategories.php:180 FixedAssetLocations.php:102
#: FreightCosts.php:240 GeocodeSetup.php:170 GLAccounts.php:308 GLTags.php:82
#: Labels.php:414 Locations.php:377 MRPDemands.php:303 MRPDemandTypes.php:120
@@ -346,26 +344,26 @@
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:219
-#: SalesTypes.php:216 SecurityTokens.php:110 SelectCustomer.php:613
-#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
-#: SelectCustomer.php:694 SelectCustomer.php:710 Shippers.php:144
+#: SalesTypes.php:216 SecurityTokens.php:110 SelectCustomer.php:614
+#: SelectCustomer.php:632 SelectCustomer.php:656 SelectCustomer.php:673
+#: SelectCustomer.php:696 SelectCustomer.php:712 Shippers.php:144
#: StockCategories.php:240 SupplierContacts.php:157 SupplierTypes.php:189
#: SuppLoginSetup.php:271 SuppTransGLAnalysis.php:118 TaxAuthorities.php:172
#: TaxCategories.php:182 TaxGroups.php:178 TaxProvinces.php:176
#: UnitsOfMeasure.php:188 WorkCentres.php:137 WWW_Access.php:123
-#: WWW_Users.php:305 includes/InputSerialItems.php:88
+#: WWW_Users.php:306 includes/InputSerialItems.php:88
#: includes/OutputSerialItems.php:21
#, php-format
msgid "Edit"
msgstr "Upravit"
-#: AccountGroups.php:264 AccountSections.php:199 AddCustomerContacts.php:132
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:165
-#: BankAccounts.php:222 BOMs.php:146 COGSGLPostings.php:109
-#: COGSGLPostings.php:212 ContractBOM.php:270 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:175
-#: Currencies.php:241 CustLoginSetup.php:308 CustomerReceipt.php:863
-#: Customers.php:950 CustomerTypes.php:203 DiscountCategories.php:215
+#: AccountGroups.php:264 AccountSections.php:200 AddCustomerContacts.php:150
+#: AddCustomerNotes.php:133 AddCustomerTypeNotes.php:124 Areas.php:165
+#: BankAccounts.php:221 BOMs.php:146 COGSGLPostings.php:108
+#: COGSGLPostings.php:205 ContractBOM.php:268 ContractOtherReqts.php:117
+#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:173
+#: Currencies.php:272 CustLoginSetup.php:220 CustomerReceipt.php:863
+#: Customers.php:974 CustomerTypes.php:203 DiscountCategories.php:215
#: DiscountMatrix.php:173 EDIMessageFormat.php:151
#: FixedAssetCategories.php:181 FixedAssetJournal.php:393 FreightCosts.php:241
#: GeocodeSetup.php:171 GLAccounts.php:309 GLJournal.php:382 GLTags.php:83
@@ -377,9 +375,9 @@
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:220 SalesTypes.php:217
-#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:614
-#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
-#: SelectCustomer.php:695 SelectCustomer.php:711 SelectOrderItems.php:1370
+#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:615
+#: SelectCustomer.php:633 SelectCustomer.php:657 SelectCustomer.php:674
+#: SelectCustomer.php:697 SelectCustomer.php:713 SelectOrderItems.php:1370
#: Shipments.php:423 Shippers.php:145 SpecialOrder.php:581
#: StockCategories.php:241 StockCategories.php:535 SuppContractChgs.php:91
#: SuppCreditGRNs.php:92 SuppFixedAssetChgs.php:84 SuppInvGRNs.php:132
@@ -387,7 +385,7 @@
#: SuppShiptChgs.php:89 SuppTransGLAnalysis.php:119 TaxAuthorities.php:173
#: TaxCategories.php:183 TaxGroups.php:179 TaxProvinces.php:177
#: UnitsOfMeasure.php:189 WorkCentres.php:138 WOSerialNos.php:303
-#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:59
+#: WWW_Access.php:124 WWW_Users.php:307 includes/InputSerialItemsKeyed.php:59
#: includes/OutputSerialItems.php:98
#, php-format
msgid "Delete"
@@ -430,10 +428,10 @@
msgid "Section In Accounts"
msgstr "Sekce v účtech"
-#: AccountGroups.php:398 AccountSections.php:263 AddCustomerContacts.php:208
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:192 Areas.php:220
-#: BankAccounts.php:369 BOMs.php:722 COGSGLPostings.php:349
-#: CreditStatus.php:246 Currencies.php:345 CustLoginSetup.php:599
+#: AccountGroups.php:398 AccountSections.php:264 AddCustomerContacts.php:244
+#: AddCustomerNotes.php:211 AddCustomerTypeNotes.php:191 Areas.php:220
+#: BankAccounts.php:381 BOMs.php:730 COGSGLPostings.php:342
+#: CreditStatus.php:250 Currencies.php:393 CustLoginSetup.php:439
#: DiscountMatrix.php:136 EDIMessageFormat.php:247
#: FixedAssetCategories.php:322 FixedAssetLocations.php:148
#: FreightCosts.php:339 GeocodeSetup.php:267 GLAccounts.php:258
@@ -444,7 +442,7 @@
#: SalesPeople.php:329 Shippers.php:196 StockCategories.php:557
#: SupplierContacts.php:258 SuppLoginSetup.php:529 TaxAuthorities.php:312
#: TaxCategories.php:233 TaxProvinces.php:227 UnitsOfMeasure.php:240
-#: WorkCentres.php:261 WWW_Users.php:638
+#: WorkCentres.php:261 WWW_Users.php:625
msgid "Enter Information"
msgstr "Vložit informace"
@@ -489,42 +487,44 @@
msgid "Could not get account group sections because"
msgstr "Nelze získat body účet skupiny, protože"
-#: AccountSections.php:179 AccountSections.php:237 AccountSections.php:255
+#: AccountSections.php:180 AccountSections.php:238 AccountSections.php:256
msgid "Section Number"
msgstr "Číslo sekce"
-#: AccountSections.php:180 AccountSections.php:259
+#: AccountSections.php:181 AccountSections.php:260
msgid "Section Description"
msgstr "Popis sekce"
-#: AccountSections.php:197
+#: AccountSections.php:198
msgid "Restricted"
msgstr "Omezeno"
-#: AccountSections.php:208
+#: AccountSections.php:209
msgid "Review Account Sections"
msgstr "Přezkoumání účtu Sekce"
-#: AccountSections.php:226
+#: AccountSections.php:227
msgid "Could not retrieve the requested section please try again."
msgstr "Nepodařilo se získat požadovanou sekci prosím zkuste to znovu."
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:607
-#: SelectCustomer.php:637
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:61 SelectCustomer.php:607
+#: SelectCustomer.php:639
msgid "Customer Contacts"
msgstr "Zákazník Kontakty"
-#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:22
+#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:11
#: Z_CheckDebtorsControl.php:20
msgid "Back to Customers"
msgstr "Zpět k zákazníkům"
#: AddCustomerContacts.php:26
-msgid "Contacts for Customer: <b>"
+#, fuzzy
+msgid "Contacts for Customer:"
msgstr "Kontakt pro zákazníky:"
#: AddCustomerContacts.php:29
-msgid "Edit contact for <b>"
+#, fuzzy
+msgid "Edit contact for"
msgstr "Upravit kontakt"
#: AddCustomerContacts.php:41
@@ -542,8 +542,15 @@
msgid "The contact name may not be empty"
msgstr "Jméno kontaktu nesmí být prázdný"
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
+#: AddCustomerContacts.php:50
+#, fuzzy
+msgid "The contact email address is not a valid email address"
+msgstr ""
+"E-mailová adresa se nezdá být platnou e-mailovou adresu. Transakce nebyla e-"
+"mailem"
+
+#: AddCustomerContacts.php:61 AddCustomerNotes.php:50
+#: AddCustomerTypeNotes.php:48 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
@@ -552,56 +559,77 @@
msgid "has been updated"
msgstr "byla aktualizována"
-#: AddCustomerContacts.php:70
+#: AddCustomerContacts.php:76
msgid "The contact record has been added"
msgstr "Kontakt záznam byl přidán"
-#: AddCustomerContacts.php:98
+#: AddCustomerContacts.php:105
msgid "The contact record has been deleted"
msgstr "Kontakt záznam byl odstraněn"
-#: AddCustomerContacts.php:112 CompanyPreferences.php:224
-#: CustomerBranches.php:368 Customers.php:907 Customers.php:913
-#: Customers.php:978 SalesPeople.php:191 SelectCustomer.php:609
-#: StockDispatch.php:185 StockDispatch.php:197 SupplierContacts.php:145
-#: SupplierCredit.php:441 SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
+#: AddCustomerContacts.php:128 CompanyPreferences.php:222
+#: CustomerBranches.php:368 Customers.php:928 Customers.php:935
+#: SalesPeople.php:191 SelectCustomer.php:609 StockDispatch.php:185
+#: StockDispatch.php:197 SupplierContacts.php:145 SupplierCredit.php:441
+#: SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
#: includes/PDFTaxPageHeader.inc:37
msgid "Name"
msgstr "Název"
-#: AddCustomerContacts.php:113 AddCustomerContacts.php:190 Customers.php:908
-#: Customers.php:914 Customers.php:980 SelectCustomer.php:610
-#: WWW_Access.php:107 WWW_Access.php:168
+#: AddCustomerContacts.php:129 AddCustomerContacts.php:220 Customers.php:929
+#: Customers.php:936 SelectCustomer.php:610 WWW_Access.php:107
+#: WWW_Access.php:168
msgid "Role"
msgstr "Roli"
-#: AddCustomerContacts.php:114 Customers.php:982
+#: AddCustomerContacts.php:130
msgid "Phone no"
msgstr "Telefonní číslo"
-#: AddCustomerContacts.php:115 AddCustomerContacts.php:202 Customers.php:910
-#: Customers.php:916 Customers.php:984 PcAssignCashToTab.php:220
-#: PcAssignCashToTab.php:346 PcAuthorizeExpenses.php:91
-#: PcClaimExpensesFromTab.php:214 PcClaimExpensesFromTab.php:372
-#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:319
-#: WOSerialNos.php:280 WOSerialNos.php:282
+#: AddCustomerContacts.php:131 AddCustomerContacts.php:232
+#: CustLoginSetup.php:193 CustomerBranches.php:374 CustomerBranches.php:716
+#: CustomerInquiry.php:249 Customers.php:931 Customers.php:938
+#: EmailCustTrans.php:15 EmailCustTrans.php:63 Factors.php:226 Factors.php:263
+#: Locations.php:533 OrderDetails.php:105 PDFRemittanceAdvice.php:251
+#: PO_PDFPurchOrder.php:347 PO_PDFPurchOrder.php:350 PrintCustTrans.php:664
+#: PrintCustTrans.php:884 PrintCustTrans.php:931
+#: PrintCustTransPortrait.php:715 PrintCustTransPortrait.php:935
+#: PrintCustTransPortrait.php:979 SelectCustomer.php:612
+#: SupplierContacts.php:149 SupplierContacts.php:253 SuppLoginSetup.php:237
+#: UserSettings.php:180 WWW_Users.php:262 includes/PDFPickingListHeader.inc:25
+#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
+#: includes/PDFTransPageHeaderPortrait.inc:109
+#: includes/PO_PDFOrderPageHeader.inc:29
+msgid "Email"
+msgstr "E-mail"
+
+#: AddCustomerContacts.php:132 AddCustomerContacts.php:238 Customers.php:932
+#: Customers.php:939 PcAssignCashToTab.php:220 PcAssignCashToTab.php:346
+#: PcAuthorizeExpenses.php:91 PcClaimExpensesFromTab.php:214
+#: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:613
+#: SystemParameters.php:319 WOSerialNos.php:280 WOSerialNos.php:282
msgid "Notes"
msgstr "Bere na vědomí"
-#: AddCustomerContacts.php:149
+#: AddCustomerContacts.php:150 SupplierContacts.php:158
+#, php-format
+msgid "Are you sure you wish to delete this contact?"
+msgstr "Jste si jisti, že chcete smazat tento kontakt?"
+
+#: AddCustomerContacts.php:169
msgid "Review all contacts for this Customer"
msgstr "Přezkoumání všech kontaktů pro tohoto zákazníka"
-#: AddCustomerContacts.php:179
+#: AddCustomerContacts.php:206
msgid "Contact Code"
msgstr "Kontakt kód"
-#: AddCustomerContacts.php:184 Factors.php:220 SupplierContacts.php:225
+#: AddCustomerContacts.php:214 Factors.php:220 SupplierContacts.php:225
msgid "Contact Name"
msgstr "Jméno kontaktní osoby"
-#: AddCustomerContacts.php:196 Contracts.php:777 PDFRemittanceAdvice.php:247
+#: AddCustomerContacts.php:226 Contracts.php:777 PDFRemittanceAdvice.php:247
#: PO_Header.php:965 PO_Header.php:1035 SelectCreditItems.php:223
#: SelectCustomer.php:463 SelectOrderItems.php:646
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81
@@ -609,45 +637,45 @@
msgid "Phone"
msgstr "Telefon"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:647
-#: SelectCustomer.php:678
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:50 SelectCustomer.php:649
+#: SelectCustomer.php:680
msgid "Customer Notes"
msgstr "Zákazník bere na vědomí"
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
msgid "Back to Select Customer"
msgstr "Zpět na výběr zákazníka"
-#: AddCustomerNotes.php:31
+#: AddCustomerNotes.php:32
msgid "The contact priority must be an integer."
msgstr "Kontakt priorita musí být celé číslo."
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+#: AddCustomerNotes.php:35 AddCustomerTypeNotes.php:33
msgid "The contact's notes must be two hundred characters or less long"
msgstr "Kontaktu poznámky musí být dvě stovky postav či méně dlouhou"
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+#: AddCustomerNotes.php:38 AddCustomerTypeNotes.php:36
msgid "The contact's notes may not be empty"
msgstr "Kontaktu poznámky nesmí být prázdný"
-#: AddCustomerNotes.php:60
+#: AddCustomerNotes.php:63
msgid "The contact notes record has been added"
msgstr "Kontakt poznámky záznam byl přidán"
-#: AddCustomerNotes.php:87
+#: AddCustomerNotes.php:91
msgid "The contact note record has been deleted"
msgstr "Kontakt na vědomí záznam byl odstraněn"
-#: AddCustomerNotes.php:98
+#: AddCustomerNotes.php:102
msgid "Notes for Customer"
msgstr "Poznámky pro zákazníka"
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:189
-#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:186
-#: BankMatching.php:228 BankReconciliation.php:194 BankReconciliation.php:266
-#: ContractCosting.php:149 CustomerAllocations.php:331
+#: AddCustomerNotes.php:113 AddCustomerNotes.php:199
+#: AddCustomerTypeNotes.php:104 AddCustomerTypeNotes.php:185
+#: BankMatching.php:231 BankReconciliation.php:198 BankReconciliation.php:270
+#: ContractCosting.php:151 CustomerAllocations.php:331
#: CustomerAllocations.php:357 CustomerInquiry.php:192
-#: CustomerTransInquiry.php:87 GLAccountInquiry.php:154 GLAccountReportphp:157
+#: CustomerTransInquiry.php:90 GLAccountInquiry.php:154 GLAccountReportphp:157
#: GLAccountReport.php:369 GLTransInquiry.php:41 MRPCalendar.php:215
#: PaymentAllocations.php:77 PcAssignCashToTab.php:216
#: PcAuthorizeExpenses.php:87 PDFRemittanceAdvice.php:308
@@ -665,10 +693,10 @@
msgid "Date"
msgstr "Datum"
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:169 UpgradeDatabase.php:172
-#: UpgradeDatabase.php:175 UpgradeDatabase.php:178 UpgradeDatabase.php:181
-#: UpgradeDatabase.php:184 UpgradeDatabase.php:187 UpgradeDatabase.php:190
+#: AddCustomerNotes.php:114 AddCustomerTypeNotes.php:105 PcReportTab.php:173
+#: Stocks.php:882 UpgradeDatabase.php:171 UpgradeDatabase.php:174
+#: UpgradeDatabase.php:177 UpgradeDatabase.php:180 UpgradeDatabase.php:183
+#: UpgradeDatabase.php:186 UpgradeDatabase.php:189 UpgradeDatabase.php:192
#: 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
@@ -677,48 +705,48 @@
msgid "Note"
msgstr "Poznámka:"
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:183
+#: AddCustomerNotes.php:115 AddCustomerNotes.php:193
msgid "WWW"
msgstr "WWW"
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:195
-#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:189
+#: AddCustomerNotes.php:116 AddCustomerNotes.php:205
+#: AddCustomerTypeNotes.php:107 AddCustomerTypeNotes.php:188
msgid "Priority"
msgstr "Prioritních"
-#: AddCustomerNotes.php:143
+#: AddCustomerNotes.php:150
msgid "Review all notes for this Customer"
msgstr "Zkontrolovat všechny poznámky pro tohoto zákazníka"
-#: AddCustomerNotes.php:172 AddCustomerTypeNotes.php:171
+#: AddCustomerNotes.php:180 AddCustomerTypeNotes.php:170
msgid "Note ID"
msgstr "Poznámka: ID"
-#: AddCustomerNotes.php:177
+#: AddCustomerNotes.php:187
msgid "Contact Note"
msgstr "Kontakt Poznámka:"
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:687
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:689
msgid "Customer Type (Group) Notes"
msgstr "Typ zákazníka (Group) Poznámky"
-#: AddCustomerTypeNotes.php:31
+#: AddCustomerTypeNotes.php:30
msgid "The Contact priority must be an integer."
msgstr "Prioritou Kontakt musí být celé číslo."
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:717
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:719
msgid "Customer Group Notes"
msgstr "Zákaznická skupina bere na vědomí"
-#: AddCustomerTypeNotes.php:60
+#: AddCustomerTypeNotes.php:61
msgid "The contact group notes record has been added"
msgstr "Kontaktní skupina bere na vědomí záznam byl přidán"
-#: AddCustomerTypeNotes.php:84
+#: AddCustomerTypeNotes.php:85
msgid "The contact group note record has been deleted"
msgstr "Kontaktní skupina na vědomí záznam byl odstraněn"
-#: AddCustomerTypeNotes.php:95
+#: AddCustomerTypeNotes.php:96
msgid "Notes for Customer Type"
msgstr "Poznámky pro zákazníka typu"
@@ -726,15 +754,20 @@
msgid "href"
msgstr "href"
+#: AddCustomerTypeNotes.php:124
+#, fuzzy, php-format
+msgid "Are you sure you wish to delete this customer type note?"
+msgstr "Jste si jisti, že chcete smazat tento typ zákazníka?"
+
#: AddCustomerTypeNotes.php:141
msgid "Review all notes for this Customer Type"
msgstr "Zkontrolovat všechny poznámky tohoto typu zákazníka"
-#: AddCustomerTypeNotes.php:182
+#: AddCustomerTypeNotes.php:181
msgid "Contact Group Note"
msgstr "Kontaktní skupina Poznámka:"
-#: AddCustomerTypeNotes.php:184
+#: AddCustomerTypeNotes.php:183
msgid "Web site"
msgstr "Webové stránky"
@@ -751,8 +784,8 @@
msgstr "Ve věku od zákaznického účtu analýza"
#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434
-#: AgedSuppliers.php:105 BOMExtendedQty.php:159 BOMIndented.php:150
-#: BOMIndentedReverse.php:151 BOMListing.php:44 BOMListing.php:55
+#: AgedSuppliers.php:107 BOMExtendedQty.php:149 BOMIndented.php:150
+#: BOMIndentedReverse.php:141 BOMListing.php:44 BOMListing.php:55
#: DebtorsAtPeriodEnd.php:56 DebtorsAtPeriodEnd.php:68 GLBalanceSheet.php:90
#: GLBalanceSheet.php:128 GLProfit_Loss.php:157 GLTagProfit_Loss.php:172
#: GLTrialBalance.php:151 InventoryPlanning.php:99 InventoryPlanning.php:174
@@ -780,9 +813,9 @@
msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože"
#: AgedDebtors.php:273 AgedDebtors.php:372 AgedDebtors.php:440
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:162
-#: BOMExtendedQty.php:259 BOMIndented.php:153 BOMIndented.php:234
-#: BOMIndentedReverse.php:154 BOMIndentedReverse.php:232 BOMListing.php:47
+#: AgedSuppliers.php:110 AgedSuppliers.php:192 BOMExtendedQty.php:152
+#: BOMExtendedQty.php:246 BOMIndented.php:153 BOMIndented.php:234
+#: BOMIndentedReverse.php:145 BOMIndentedReverse.php:222 BOMListing.php:47
#: Credit_Invoice.php:184 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
#: FTP_RadioBeacon.php:187 GetStockImage.php:154 GLBalanceSheet.php:93
#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
@@ -798,7 +831,7 @@
#: InventoryValuation.php:92 MailInventoryValuation.php:118
#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:117
#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
-#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:316 MRPReport.php:39
+#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:306 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:233
@@ -834,7 +867,7 @@
msgid "The details of outstanding transactions for customer"
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
-#: AgedDebtors.php:371 AgedSuppliers.php:189 GLAccountCSV.php:168
+#: AgedDebtors.php:371 AgedSuppliers.php:191 GLAccountCSV.php:168
#: GLAccountInquiry.php:145 GLAccountReportphp:149 GLAccountReport.php:93
#: PO_Items.php:416 PO_Items.php:538 PO_Items.php:562
#: SalesAnalReptCols.php:356 SpecialOrder.php:370
@@ -843,12 +876,12 @@
msgid "could not be retrieved because"
msgstr "se nepodařilo získat, protože"
-#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
-#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
-#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
+#: AgedDebtors.php:374 AgedSuppliers.php:194 Areas.php:95
+#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:957
+#: ConfirmDispatch_Invoice.php:971 Contracts.php:581 CounterSales.php:1323
#: CounterSales.php:1337 Credit_Invoice.php:703 Credit_Invoice.php:725
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
-#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
+#: CustomerTransInquiry.php:82 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
#: PurchData.php:95 PurchData.php:113 PurchData.php:245 ReverseGRN.php:191
#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1372
@@ -887,7 +920,7 @@
msgid "To Customer Code"
msgstr "Do kódu zákazníka"
-#: AgedDebtors.php:471 AgedSuppliers.php:293
+#: AgedDebtors.php:471 AgedSuppliers.php:285
msgid "All balances or overdues only"
msgstr "Všechny zůstatky nebo overdues pouze"
@@ -895,7 +928,7 @@
msgid "All customers with balances"
msgstr "Všichni zákazníci s bilancí"
-#: AgedDebtors.php:474 AgedSuppliers.php:296
+#: AgedDebtors.php:474 AgedSuppliers.php:288
msgid "Overdue accounts only"
msgstr "Po lhůtě splatnosti účtů"
@@ -907,28 +940,33 @@
msgid "Only Show Customers Of"
msgstr "Zobrazit jen zákazníky"
-#: AgedDebtors.php:493
+#: AgedDebtors.php:486
+#, fuzzy
+msgid "All Sales people"
+msgstr "Všechny Prodejci"
+
+#: AgedDebtors.php:492
msgid "Only show customers trading in"
msgstr "Zobrazovat pouze zákazníkům obchodování"
-#: AgedDebtors.php:508
+#: AgedDebtors.php:507
msgid "Summary or detailed report"
msgstr "Souhrn nebo podrobné zprávy"
-#: AgedDebtors.php:510 AgedSuppliers.php:316 InventoryValuation.php:247
+#: AgedDebtors.php:509 AgedSuppliers.php:308 InventoryValuation.php:247
msgid "Summary Report"
msgstr "Souhrnná zpráva"
-#: AgedDebtors.php:511 AgedSuppliers.php:317 InventoryValuation.php:248
+#: AgedDebtors.php:510 AgedSuppliers.php:309 InventoryValuation.php:248
msgid "Detailed Report"
msgstr "Podrobná zpráva"
-#: AgedDebtors.php:516 AgedSuppliers.php:320 BOMExtendedQty.php:286
-#: BOMIndented.php:271 BOMIndentedReverse.php:255 BOMListing.php:132
+#: AgedDebtors.php:515 AgedSuppliers.php:312 BOMExtendedQty.php:282
+#: BOMIndented.php:272 BOMIndentedReverse.php:250 BOMListing.php:132
#: DebtorsAtPeriodEnd.php:156 InventoryPlanning.php:442
#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:187
#: InventoryValuation.php:251 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:290
+#: MRPPlannedWorkOrders.php:335 MRPReschedules.php:140 MRPShortages.php:290
#: OutstandingGRNs.php:162 PDFCustomerList.php:410 PDFLowGP.php:145
#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
#: PDFStockCheckComparison.php:379 PrintCustTrans.php:506
@@ -937,53 +975,53 @@
msgid "Print PDF"
msgstr "Tisknout PDF"
-#: AgedSuppliers.php:18
+#: AgedSuppliers.php:15
msgid "Aged Supplier Listing"
msgstr "Dodavatel ve věku Výpis"
-#: AgedSuppliers.php:19
+#: AgedSuppliers.php:16
msgid "Aged Suppliers"
msgstr "Ve věku od dodavatelů"
-#: AgedSuppliers.php:105
+#: AgedSuppliers.php:107
msgid "Aged Supplier Account Analysis"
msgstr "Dodavatel ve věku účtu analýza"
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:55
+#: AgedSuppliers.php:109 SupplierBalsAtPeriodEnd.php:55
msgid "The Supplier details could not be retrieved by the SQL because"
msgstr "Dodavatel údaje se nepodařilo získat do SQL, protože"
-#: AgedSuppliers.php:187
+#: AgedSuppliers.php:189
msgid "Aged Supplier Account Analysis - Problem Report"
msgstr "Dodavatel ve věku účtu analýza - nahlášení problému"
-#: AgedSuppliers.php:189
+#: AgedSuppliers.php:191
msgid "The details of outstanding transactions for Supplier"
msgstr "Podrobnosti o nesplacených transakcí pro dodavatele"
-#: AgedSuppliers.php:273
+#: AgedSuppliers.php:264
msgid "Aged Supplier Analysis"
msgstr "Dodavatel ve věku analýza"
-#: AgedSuppliers.php:286 OutstandingGRNs.php:157 PDFRemittanceAdvice.php:138
+#: AgedSuppliers.php:278 OutstandingGRNs.php:157 PDFRemittanceAdvice.php:138
#: SupplierBalsAtPeriodEnd.php:131 SuppPaymentRun.php:259
msgid "From Supplier Code"
msgstr "Od kódu dodavatele"
-#: AgedSuppliers.php:289 OutstandingGRNs.php:159 PDFRemittanceAdvice.php:140
+#: AgedSuppliers.php:281 OutstandingGRNs.php:159 PDFRemittanceAdvice.php:140
#: SupplierBalsAtPeriodEnd.php:133 SuppPaymentRun.php:261
msgid "To Supplier Code"
msgstr "Do kódu dodavatele"
-#: AgedSuppliers.php:295
+#: AgedSuppliers.php:287
msgid "All suppliers with balances"
msgstr "Všem dodavatelům s bilancí"
-#: AgedSuppliers.php:299
+#: AgedSuppliers.php:291
msgid "For suppliers trading in"
msgstr "Pro dodavatele obchodování"
-#: AgedSuppliers.php:314 InventoryValuation.php:245
+#: AgedSuppliers.php:306 InventoryValuation.php:245
msgid "Summary or Detailed Report"
msgstr "Souhrnné nebo podrobné zprávy"
@@ -1090,25 +1128,25 @@
msgid "Incorrect date format used, please re-enter"
msgstr "Nesprávné datum používaného formátu, prosím, re-zadání"
-#: AuditTrail.php:35 BOMIndented.php:309 BOMIndentedReverse.php:294
+#: AuditTrail.php:35 BOMIndented.php:310 BOMIndentedReverse.php:289
#: MRPCalendar.php:258
msgid "From Date"
msgstr "Od data"
-#: AuditTrail.php:37 BOMIndented.php:310 BOMIndentedReverse.php:295
+#: AuditTrail.php:37 BOMIndented.php:311 BOMIndentedReverse.php:290
#: MRPCalendar.php:260
msgid "To Date"
msgstr "To Date"
#: AuditTrail.php:41 PO_AuthorisationLevels.php:123
#: PO_AuthorisationLevels.php:170 PO_AuthorisationLevels.php:173
-#: UserSettings.php:109
+#: UserSettings.php:110
msgid "User ID"
msgstr "ID uživatele"
-#: AuditTrail.php:43 AuditTrail.php:56 ContractBOM.php:297
-#: CounterSales.php:2113 CounterSales.php:2116 DailySalesInquiry.php:41
-#: DailySalesInquiry.php:43 FixedAssetRegister.php:56
+#: AuditTrail.php:43 AuditTrail.php:56 ContractBOM.php:300
+#: CounterSales.php:2113 CounterSales.php:2116 CustomerTransInquiry.php:29
+#: DailySalesInquiry.php:41 DailySalesInquiry.php:43 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:153
#: InventoryQuantities.php:175 InventoryQuantities.php:177 MRP.php:562
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:135
@@ -1136,7 +1174,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:739
+#: SelectContract.php:193 SelectProduct.php:739
msgid "View"
msgstr "Zobrazit"
@@ -1148,9 +1186,9 @@
msgid "User"
msgstr "Uživatel"
-#: AuditTrail.php:146 BankReconciliation.php:195 BankReconciliation.php:267
+#: AuditTrail.php:146 BankReconciliation.php:199 BankReconciliation.php:271
#: CustomerAllocations.php:355 CustomerInquiry.php:190
-#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
+#: CustomerTransInquiry.php:18 CustomerTransInquiry.php:88
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
#: GLJournal.php:240 MRPReschedules.php:178 SalesByTypePeriodInquiry.php:327
@@ -1258,35 +1296,35 @@
msgid "Bank account deleted"
msgstr "Bankovní účet smazán"
-#: BankAccounts.php:184
+#: BankAccounts.php:183
msgid "The bank accounts set up could not be retrieved because"
msgstr "Bankovní účty zřízené se nepodařilo získat, protože"
-#: BankAccounts.php:185
+#: BankAccounts.php:184
msgid "The SQL used to retrieve the bank account details was"
msgstr "SQL používá k načtení údaje o bankovním účtu bylo"
-#: BankAccounts.php:191 GLJournal.php:264
+#: BankAccounts.php:190 GLJournal.php:264
msgid "GL Account Code"
msgstr "GL kódu účtu"
-#: BankAccounts.php:192 BankAccounts.php:321
+#: BankAccounts.php:191 BankAccounts.php:323
msgid "Bank Account Name"
msgstr "Název bankovního účtu"
-#: BankAccounts.php:193 BankAccounts.php:323
+#: BankAccounts.php:192 BankAccounts.php:325
msgid "Bank Account Code"
msgstr "Bankovní účet kódu"
-#: BankAccounts.php:194 BankAccounts.php:325
+#: BankAccounts.php:193 BankAccounts.php:327
msgid "Bank Account Number"
msgstr "Číslo bankovního účtu"
-#: BankAccounts.php:195 BankAccounts.php:327
+#: BankAccounts.php:194 BankAccounts.php:329
msgid "Bank Address"
msgstr "Adresa banky"
-#: BankAccounts.php:196 CustomerReceipt.php:753 CustomerTransInquiry.php:95
+#: BankAccounts.php:195 CustomerReceipt.php:753 CustomerTransInquiry.php:98
#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:206 PcTabs.php:349
#: PDFPrintLabel.php:93 PO_AuthorisationLevels.php:125
#: PO_AuthorisationLevels.php:205 PO_AuthorisationLevels.php:210
@@ -1301,19 +1339,24 @@
msgid "Currency"
msgstr "Měna"
-#: BankAccounts.php:197 BankAccounts.php:346
+#: BankAccounts.php:196 BankAccounts.php:352
msgid "Default for Invoices"
msgstr "Výchozí pro Faktury"
-#: BankAccounts.php:246
+#: BankAccounts.php:221
+#, fuzzy, php-format
+msgid "Are you sure you wish to delete this bank account?"
+msgstr "Jste si jisti, že chcete smazat tento obor?"
+
+#: BankAccounts.php:245
msgid "Show All Bank Accounts Defined"
msgstr "Zobrazit všechny bankovní účty definované"
-#: BankAccounts.php:279 BankAccounts.php:282
+#: BankAccounts.php:279 BankAccounts.php:284
msgid "Bank Account GL Code"
msgstr "Bankovní účet GL kód"
-#: BankAccounts.php:329
+#: BankAccounts.php:331
msgid "Currency Of Account"
msgstr "Měna účtu"
@@ -1358,16 +1401,16 @@
msgid "Could not match off this payment because"
msgstr "Nemohl zápas z této platby, protože"
-#: BankMatching.php:63
+#: BankMatching.php:64
msgid "Could not update the amount matched off this bank transaction because"
msgstr ""
"Nepodařilo se aktualizovat částku uzavřeno z této banky, protože transakce"
-#: BankMatching.php:69
+#: BankMatching.php:70
msgid "Could not unclear this bank transaction because"
msgstr "Nemohu nejasné tento bankovní transakci, protože"
-#: BankMatching.php:77
+#: BankMatching.php:78
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 "
@@ -1377,24 +1420,24 @@
"účtu. Zkontrolujte, zda vaše bankovní výpis a klikněte na check-box, když "
"zjistíte, odpovídající transakce."
-#: BankMatching.php:85 BankReconciliation.php:99 CustomerReceipt.php:726
+#: BankMatching.php:87 BankReconciliation.php:101 CustomerReceipt.php:726
#: DailyBankTransactions.php:29 Payments.php:737 PDFChequeListing.php:44
#: TaxAuthorities.php:149 TaxAuthorities.php:305
msgid "Bank Account"
msgstr "Bankovní účet"
-#: BankMatching.php:107
+#: BankMatching.php:110
msgid "Show"
msgstr "Zobrazit"
-#: BankMatching.php:107 CreditItemsControlled.php:78 FreightCosts.php:267
+#: BankMatching.php:110 CreditItemsControlled.php:78 FreightCosts.php:267
#: GoodsReceivedControlled.php:65 GoodsReceived.php:65
#: StockLocTransferReceive.php:426 SupplierAllocations.php:434
#: SuppShiptChgs.php:129
msgid "from"
msgstr "od"
-#: BankMatching.php:110 ConfirmDispatchControlled_Invoice.php:58
+#: BankMatching.php:113 ConfirmDispatchControlled_Invoice.php:58
#: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
#: GLAccountCSV.php:171 GLAccountReport.php:102 Payments.php:717
#: PcReportTab.php:102 PDFChequeListing.php:107 PDFChequeListing.php:117
@@ -1424,29 +1467,29 @@
msgid "to"
msgstr "na"
-#: BankMatching.php:112
+#: BankMatching.php:115
msgid "Choose outstanding"
msgstr "Zvolte vynikající"
-#: BankMatching.php:112
+#: BankMatching.php:115
msgid "only or all"
msgstr "jen nebo všechny"
-#: BankMatching.php:112 BankMatching.php:116 BankMatching.php:119
-#: BankMatching.php:127 BankMatching.php:130
+#: BankMatching.php:115 BankMatching.php:119 BankMatching.php:122
+#: BankMatching.php:130 BankMatching.php:133
msgid "in the date range"
msgstr "v rozmezí dat"
-#: BankMatching.php:116 BankMatching.php:119 BankMatching.php:127
-#: BankMatching.php:130
+#: BankMatching.php:119 BankMatching.php:122 BankMatching.php:130
+#: BankMatching.php:133
msgid "Show all"
msgstr "Zobrazit všechny"
-#: BankMatching.php:117 BankMatching.php:120
+#: BankMatching.php:120 BankMatching.php:123
msgid "Show unmatched"
msgstr "Zobrazit bezkonkurenční"
-#: BankMatching.php:117 BankMatching.php:120 ReverseGRN.php:103
+#: BankMatching.php:120 BankMatching.php:123 ReverseGRN.php:103
#: includes/PDFCustomerListPageHeader.inc:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:24
#: includes/PDFDIFOTPageHeader.inc:24
@@ -1455,62 +1498,62 @@
msgid "only"
msgstr "jen"
-#: BankMatching.php:124
+#: BankMatching.php:127
msgid "Choose to display only the first 20 matching"
msgstr "Vyberte, zda chcete zobrazit pouze prvních 20 odpovídající"
-#: BankMatching.php:125
+#: BankMatching.php:128
msgid "or all"
msgstr "nebo všechny"
-#: BankMatching.php:125
+#: BankMatching.php:128
msgid "meeting the criteria"
msgstr "splňující kritéria"
-#: BankMatching.php:128 BankMatching.php:131
+#: BankMatching.php:131 BankMatching.php:134
msgid "Show only the first 20"
msgstr "Zobrazit jen prvních 20"
-#: BankMatching.php:136
+#: BankMatching.php:139
msgid "Show selected"
msgstr "Zobrazit vybrané"
-#: BankMatching.php:137
+#: BankMatching.php:140
msgid "Show reconciliation"
msgstr "Zobrazit usmíření"
-#: BankMatching.php:143 BankMatching.php:149
+#: BankMatching.php:146 BankMatching.php:152
msgid "The date entered for the field to show"
msgstr "Datum vstoupil na pole show"
-#: BankMatching.php:143
+#: BankMatching.php:146
msgid "before"
msgstr "před"
-#: BankMatching.php:144 BankMatching.php:150
+#: BankMatching.php:147 BankMatching.php:153
msgid "is not entered in a recognised date format"
msgstr "není zapsán v uznávané formátu data"
-#: BankMatching.php:144 BankMatching.php:150
+#: BankMatching.php:147 BankMatching.php:153
msgid "Entry is expected in the format"
msgstr "Vstup se očekává ve formátu"
-#: BankMatching.php:149
+#: BankMatching.php:152
msgid "after"
msgstr "po"
-#: BankMatching.php:223
+#: BankMatching.php:226
msgid "The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
-#: BankMatching.php:226 ShipmentCosting.php:507 ShipmentCosting.php:578
+#: BankMatching.php:229 ShipmentCosting.php:507 ShipmentCosting.php:578
#: SupplierAllocations.php:455
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
+#: BankMatching.php:232 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
#: CustomerAllocations.php:358 CustomerReceipt.php:842
-#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
+#: CustomerTransInquiry.php:97 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
#: PcAssignCashToTab.php:218 PcAssignCashToTab.php:339
#: PcAuthorizeExpenses.php:89 PcClaimExpensesFromTab.php:212
@@ -1528,7 +1571,7 @@
msgid "Amount"
msgstr "Částka"
-#: BankMatching.php:230 BankReconciliation.php:199 BankReconciliation.php:271
+#: BankMatching.php:233 BankReconciliation.php:203 BankReconciliation.php:275
#: PDFOrdersInvoiced.php:345 PDFOrderStatus.php:319
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:180
#: Shipt_Select.php:182 SuppCreditGRNs.php:227
@@ -1537,15 +1580,15 @@
msgid "Outstanding"
msgstr "Vynikající"
-#: BankMatching.php:231
+#: BankMatching.php:234
msgid "Clear"
msgstr "Jasný"
-#: BankMatching.php:231 BankMatching.php:259
+#: BankMatching.php:234 BankMatching.php:262
msgid "Unclear"
msgstr "Nejasný"
-#: BankMatching.php:305
+#: BankMatching.php:308
msgid "Update Matching"
msgstr "Odpovídající aktualizace"
@@ -1563,86 +1606,86 @@
"měly být zaneseny. Kurzových rozdílů nebyla vypočtena žádná obecná a knihy "
"časopis byl vytvořen"
-#: BankReconciliation.php:33
+#: BankReconciliation.php:34
msgid "Could not retrieve the exchange rate for the selected bank account"
msgstr "Nepodařilo se načíst směnný kurz pro vybrané bankovní účet"
-#: BankReconciliation.php:63 BankReconciliation.php:81
+#: BankReconciliation.php:65 BankReconciliation.php:83
msgid "reconciliation on"
msgstr "usmíření, na"
-#: BankReconciliation.php:66
+#: BankReconciliation.php:68
msgid "Cannot insert a GL entry for the exchange difference because"
msgstr "Nelze vložit záznam GL pro výměnu rozdíl, protože"
-#: BankReconciliation.php:67
+#: BankReconciliation.php:69
msgid "The SQL that failed to insert the exchange difference GL entry was"
msgstr "SQL, které se nepodařilo vložit kurzový rozdíl GL vstup"
-#: BankReconciliation.php:87
+#: BankReconciliation.php:89
msgid "Exchange difference of"
msgstr "Kurzových rozdílů z"
-#: BankReconciliation.php:87
+#: BankReconciliation.php:89
msgid "has been posted"
msgstr "byl vyslán"
-#: BankReconciliation.php:95 SuppPaymentRun.php:300
+#: BankReconciliation.php:97 SuppPaymentRun.php:300
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr "Bankovní účty se nepodařilo získat na SQL, protože"
-#: BankReconciliation.php:96 CustomerReceipt.php:717
+#: BankReconciliation.php:98 CustomerReceipt.php:717
#: DailyBankTransactions.php:26 Payments.php:734 SuppPaymentRun.php:302
msgid "The SQL used to retrieve the bank accounts was"
msgstr "SQL slouží k získání bankovní účty byly"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
msgid "Bank Accounts have not yet been defined"
msgstr "Bankovní účty dosud nebyly definovány"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
msgid "You must first"
msgstr "Musíte nejprve"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
#: DailyBankTransactions.php:34 Payments.php:742 SuppPaymentRun.php:310
msgid "define the bank accounts"
msgstr "definovat bankovních účtů"
-#: BankReconciliation.php:106 CustomerReceipt.php:731
+#: BankReconciliation.php:108 CustomerReceipt.php:731
#: DailyBankTransactions.php:34 Payments.php:742 SuppPaymentRun.php:310
msgid "and general ledger accounts to be affected"
msgstr "a účtů hlavní knihy mohly být postiženy"
-#: BankReconciliation.php:125
+#: BankReconciliation.php:128
msgid "Show bank reconciliation statement"
msgstr "Zobrazit bankovní prohlášení o smíření"
-#: BankReconciliation.php:144
+#: BankReconciliation.php:147
msgid "The bank account balance could not be returned by the SQL because"
msgstr "Bankovního účtu nemůže být vrácen, protože SQL"
-#: BankReconciliation.php:157
+#: BankReconciliation.php:160
msgid ""
"Could not retrieve the currency and exchange rate for the selected bank "
"account"
msgstr "Nepodařilo se načíst měny a směnného kurzu pro zvolený bankovní účet"
-#: BankReconciliation.php:165
+#: BankReconciliation.php:168
msgid "Balance as at"
msgstr "Zůstatek k"
-#: BankReconciliation.php:188
+#: BankReconciliation.php:192
msgid "The unpresented cheques could not be retrieved by the SQL because"
msgstr "Unpresented Kontroly se nepodařilo získat do SQL, protože"
-#: BankReconciliation.php:191
+#: BankReconciliation.php:195
msgid "Add back unpresented cheques"
msgstr "Přidat zpět unpresented kontroly"
-#: BankReconciliation.php:196 BankReconciliation.php:268
+#: BankReconciliation.php:200 BankReconciliation.php:272
#: CustomerAllocations.php:330 CustomerAllocations.php:356
-#: CustomerInquiry.php:191 CustomerTransInquiry.php:86 CustWhereAlloc.php:89
+#: CustomerInquiry.php:191 CustomerTransInquiry.php:89 CustWhereAlloc.php:89
#: EmailCustTrans.php:15 GLAccountInquiry.php:153 GLAccountReportphp:156
#: PrintCustTrans.php:450 PrintCustTrans.php:651 PrintCustTrans.php:871
#: PrintCustTrans.php:918 PrintCustTransPortrait.php:502
@@ -1659,8 +1702,8 @@
msgid "Number"
msgstr "Číslo"
-#: BankReconciliation.php:197 BankReconciliation.php:269
-#: ContractCosting.php:148 CustomerInquiry.php:194 CustomerTransInquiry.php:90
+#: BankReconciliation.php:201 BankReconciliation.php:273
+#: ContractCosting.php:150 CustomerInquiry.php:194 CustomerTransInquiry.php:93
#: CustWhereAlloc.php:90 DailyBankTransactions.php:105 GLAccountReport.php:368
#: PaymentAllocations.php:75 PaymentAllocations.php:76
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:99
@@ -1676,39 +1719,39 @@
msgid "Reference"
msgstr "Reference"
-#: BankReconciliation.php:198 BankReconciliation.php:270
+#: BankReconciliation.php:202 BankReconciliation.php:274
msgid "Orig Amount"
msgstr "Orig Částka"
-#: BankReconciliation.php:241
+#: BankReconciliation.php:245
msgid "Total of all unpresented cheques"
msgstr "Celkem ze všech kontrol unpresented"
-#: BankReconciliation.php:259
+#: BankReconciliation.php:263
msgid "The uncleared deposits could not be retrieved by the SQL because"
msgstr "Uncleared vklady se nepodařilo získat do SQL, protože"
-#: BankReconciliation.php:263
+#: BankReconciliation.php:267
msgid "Less deposits not cleared"
msgstr "Méně vklady nejsou schváleny"
-#: BankReconciliation.php:313
+#: BankReconciliation.php:318
msgid "Total of all uncleared deposits"
msgstr "Souhrn všech vkladů uncleared"
-#: BankReconciliation.php:315
+#: BankReconciliation.php:324
msgid "Bank statement balance should be"
msgstr "Bankovní výpis bilance by měla být"
-#: BankReconciliation.php:319
+#: BankReconciliation.php:329
msgid "Enter the actual bank statement balance"
msgstr "Zadejte aktuální výpis z účtu zůstatek"
-#: BankReconciliation.php:321 BankReconciliation.php:331
+#: BankReconciliation.php:331 BankReconciliation.php:341
msgid "Calculate and Post Exchange Difference"
msgstr "Vypočítat a příspěvek kurzových rozdílů"
-#: BankReconciliation.php:321
+#: BankReconciliation.php:331
msgid ""
"This will create a general ledger journal to write off the exchange "
"difference in the current balance of the account. It is important that the "
@@ -1718,13 +1761,13 @@
"zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu "
"měny bankovního účtu"
-#: BankReconciliation.php:321 CounterSales.php:781 Customers.php:1024
+#: BankReconciliation.php:331 CounterSales.php:781 Customers.php:1000
#: SelectOrderItems.php:1381 Stocks.php:1041 WorkOrderCosting.php:517
#: WorkOrderEntry.php:548
msgid "Are You Sure?"
msgstr "Opravdu provést?"
-#: BankReconciliation.php:330
+#: BankReconciliation.php:340
msgid ""
"It is normal for foreign currency accounts to have exchange differences that "
"need to be reflected as the exchange rate varies. This reconciliation is "
@@ -1741,58 +1784,58 @@
"vytvořit časopis, aby odrážely kurzový rozdíl na základě aktuálního směnného "
"kurzu k opravě k usmíření skutečného stavu bankovního výpisu klikněte níže."
-#: BankReconciliation.php:338 BankReconciliation.php:341
+#: BankReconciliation.php:348 BankReconciliation.php:351
msgid "Match off cleared payments"
msgstr "Utkání vypnutí vymazány plateb"
-#: BankReconciliation.php:339 BankReconciliation.php:342
+#: BankReconciliation.php:349 BankReconciliation.php:352
msgid "Match off cleared deposits"
msgstr "Utkání vypnutí vymazány vklady"
-#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:269
+#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:149
+#: BOMExtendedQty.php:256
msgid "Quantity Extended BOM Listing"
msgstr "Množství Rozšířené kusovníku Výpis"
-#: BOMExtendedQty.php:32 BOMIndentedReverse.php:29 MRPCalendar.php:85
+#: BOMExtendedQty.php:29 BOMIndentedReverse.php:26 MRPCalendar.php:85
#: MRP.php:27
msgid "The SQL to to create passbom failed with the message"
msgstr "SQL k vytvoření passbom nepodařilo se zprávou"
-#: BOMExtendedQty.php:45 BOMIndented.php:40 BOMIndentedReverse.php:42
+#: BOMExtendedQty.php:42 BOMIndented.php:40 BOMIndentedReverse.php:39
#: MRP.php:34
msgid "Create of tempbom failed because"
msgstr "Vytvořit z tempbom se nezdařila, protože"
-#: BOMExtendedQty.php:161
+#: BOMExtendedQty.php:151
msgid ""
"The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
msgstr "Quantiy Rozšířená rozpisky Výpis se nepodařilo získat na SQL, protože"
-#: BOMExtendedQty.php:256 BOMIndented.php:231
+#: BOMExtendedQty.php:243 BOMIndented.php:231
msgid "Print Indented BOM Listing Error"
msgstr "Tisk Odsazené kusovníku výpis chyby"
-#: BOMExtendedQty.php:258 BOMIndented.php:233
+#: BOMExtendedQty.php:245 BOMIndented.php:233
msgid "There were no items for the selected assembly"
msgstr "Nebyly zjištěny žádné položky pro vybraný montáž"
-#: BOMExtendedQty.php:276 BOMIndented.php:252 BOMIndentedReverse.php:249
+#: BOMExtendedQty.php:263 BOMIndented.php:253 BOMIndentedReverse.php:242
msgid "Part"
msgstr "Část"
-#: BOMExtendedQty.php:277 BOMExtendedQty.php:328 BOMExtendedQty.php:329
-#: BOMExtendedQty.php:330 BOMExtendedQty.php:331 BOMIndented.php:308
-#: BOMIndentedReverse.php:293 BOMInquiry.php:173 BOMs.php:516 BOMs.php:677
-#: ContractBOM.php:241 ContractBOM.php:344 ContractCosting.php:74
-#: ContractCosting.php:80 ContractCosting.php:131 ContractOtherReqts.php:95
-#: Contracts.php:932 Contracts.php:956 CounterSales.php:701
+#: BOMExtendedQty.php:265 BOMExtendedQty.php:325 BOMExtendedQty.php:326
+#: BOMExtendedQty.php:327 BOMExtendedQty.php:328 BOMIndented.php:309
+#: BOMIndentedReverse.php:288 BOMInquiry.php:178 BOMs.php:522 BOMs.php:685
+#: ContractBOM.php:239 ContractBOM.php:347 ContractCosting.php:73
+#: ContractCosting.php:79 ContractCosting.php:130 ContractOtherReqts.php:92
+#: Contracts.php:938 Contracts.php:963 CounterSales.php:701
#: CounterSales.php:1994 CounterSales.php:2174 CounterSales.php:2302
#: Credit_Invoice.php:273 DeliveryDetails.php:822 DeliveryDetails.php:887
#: GoodsReceived.php:88 GoodsReceived.php:92 GoodsReceived.php:95
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
-#: MRPPlannedWorkOrders.php:259 MRPPlannedWorkOrders.php:387 MRPReport.php:413
+#: MRPPlannedWorkOrders.php:258 MRPPlannedWorkOrders.php:379 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:179 OffersReceived.php:95
#: OffersReceived.php:197 OffersReceived.php:244 OrderDetails.php:155
#: PDFOrdersInvoiced.php:384 POReport.php:743 POReport.php:1428
@@ -1807,7 +1850,7 @@
#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
-#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
+#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:185
#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
@@ -1833,44 +1876,44 @@
msgid "Quantity"
msgstr "Množství"
-#: BOMExtendedQty.php:278
+#:...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-18 04:55:22
|
Revision: 4598
http://web-erp.svn.sourceforge.net/web-erp/?rev=4598&view=rev
Author: daintree
Date: 2011-06-18 04:55:08 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
languages names
Modified Paths:
--------------
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerTransInquiry.php
trunk/DeliveryDetails.php
trunk/UserSettings.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/index.php
Added Paths:
-----------
trunk/includes/LanguagesArray.php
Modified: trunk/CreditItemsControlled.php
===================================================================
--- trunk/CreditItemsControlled.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CreditItemsControlled.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -1,9 +1,9 @@
<?php
-/* $Revision: 1.11 $ */
+
/* $Id$*/
+
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Specify Credited Controlled Items');
@@ -29,18 +29,18 @@
} elseif (isset($_POST['LineNo'])){
$LineNo = $_POST['LineNo'];
} else {
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Select Credit Items'). '</a><br><br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Select Credit Items'). '</a><br /><br />';
prnMsg( _('This page can only be opened if a Line Item on a credit note has been selected.') . ' ' . _('Please do that first'), 'error');
echo '</div>';
include('includes/footer.inc');
exit;
}
-
-
if (!isset($_SESSION['CreditItems'])) {
/* This page can only be called with a credit note entry part entered */
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Select Credit Items'). '</a><br><br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Select Credit Items'). '</a>
+ <br />
+ <br />';
prnMsg( _('This page can only be opened if a controlled credit note line item has been selected.') . ' ' . _('Please do that first'),'error');
echo '</div>';
include('includes/footer.inc');
@@ -53,8 +53,8 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Back to Credit Note Entry').'</a></div>';
- echo '<br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Back to Credit Note Entry').'</a></div>';
+ echo '<br />';
prnMsg( _('Notice') . ' - ' . _('The line item must be defined as controlled to require input of the batch numbers or serial numbers being credited'),'warn');
include('includes/footer.inc');
exit;
@@ -70,17 +70,16 @@
echo '<div class="centre">';
if ($CreditLink == 'Credit_Invoice.php'){
- echo '<input type=hidden name="CreditInvoice" VALUE="Yes">';
+ echo '<input type="hidden" name="CreditInvoice" value="Yes">';
}
-echo '<br><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Back to Credit Note Entry'). '</a>';
+echo '<br /><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Back to Credit Note Entry'). '</a>';
-echo '<br><font size=2><b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></font></div>';
+echo '<br /><font size=2><b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></font></div>';
/** vars needed by InputSerialItem : **/
$LocationOut = $_SESSION['CreditItems']->Location;
-/* $_SESSION['CreditingControlledItems_MustExist'] is in config.php - Phil and Jesse disagree on the default treatment
-compromise position make it user configurable */
+/* $_SESSION['CreditingControlledItems_MustExist'] is in config.php - Phil and Jesse disagree on the default treatment compromise position make it user configurable */
$ItemMustExist = $_SESSION['CreditingControlledItems_MustExist'];
$StockID = $LineItem->StockID;
$InOutModifier=1;
@@ -88,7 +87,8 @@
$IsCredit = true;
include ('includes/InputSerialItems.php');
- echo '</tr></table>';
+echo '</tr>
+ </table>';
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for dispatch */
@@ -100,4 +100,4 @@
include('includes/footer.inc');
exit;
-?>
+?>
\ No newline at end of file
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CreditStatus.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -17,7 +17,8 @@
}
$Errors = array();
$InputError = 0;
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
if (isset($_POST['submit'])) {
@@ -80,24 +81,21 @@
/*Selected Reason is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new status code form */
- if (isset($_POST['DisallowInvoices']) and $_POST['DisallowInvoices']=='on'){
+ if (isset($_POST['DisallowInvoices']) AND $_POST['DisallowInvoices']=='on'){
- $sql = "INSERT INTO holdreasons (
- reasoncode,
- reasondescription,
- dissallowinvoices)
- VALUES (
- '" .$_POST['ReasonCode'] . "',
- '".$_POST['ReasonDescription'] . "'
- , 1)";
+ $sql = "INSERT INTO holdreasons (reasoncode,
+ reasondescription,
+ dissallowinvoices)
+ VALUES ('" .$_POST['ReasonCode'] . "',
+ '".$_POST['ReasonDescription'] . "',
+ 1)";
} else {
- $sql = "INSERT INTO holdreasons (
- reasoncode,
- reasondescription,
- dissallowinvoices)
- VALUES (
- '" . $_POST['ReasonCode'] . "',
- '" . $_POST['ReasonDescription'] ."', 0)";
+ $sql = "INSERT INTO holdreasons (reasoncode,
+ reasondescription,
+ dissallowinvoices)
+ VALUES ('" . $_POST['ReasonCode'] . "',
+ '" . $_POST['ReasonDescription'] ."',
+ 0)";
}
$msg = _('A new credit status record has been inserted');
@@ -122,7 +120,7 @@
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0) {
prnMsg( _('Cannot delete this credit status code because customer accounts have been created referring to it'),'warn');
- echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this credit status code');
+ echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this credit status code');
} else {
//only delete if used in neither customer or supplier accounts
@@ -200,10 +198,10 @@
//editing an existing status code
$sql = "SELECT reasoncode,
- reasondescription,
- dissallowinvoices
- FROM holdreasons
- WHERE reasoncode='".$SelectedReason."'";
+ reasondescription,
+ dissallowinvoices
+ FROM holdreasons
+ WHERE reasoncode='".$SelectedReason."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -215,14 +213,17 @@
echo '<input type="hidden" name="SelectedReason" value="' . $SelectedReason . '">';
echo '<input type="hidden" name="ReasonCode" value="' . $_POST['ReasonCode'] . '">';
echo '<table class="selection">
- <tr><td>'. _('Status Code') .':</td>
- <td>' . $_POST['ReasonCode'] . '</td></tr>';
+ <tr>
+ <td>'. _('Status Code') .':</td>
+ <td>' . $_POST['ReasonCode'] . '</td>
+ </tr>';
} else { //end of if $SelectedReason only do the else when a new record is being entered
if (!isset($_POST['ReasonCode'])) {
$_POST['ReasonCode'] = '';
}
- echo '<br /><table class="selection">
+ echo '<br />
+ <table class="selection">
<tr>
<td>'. _('Status Code') .':</td>
<td><input ' . (in_array('ReasonCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="ReasonCode" value="'. $_POST['ReasonCode'] .'" size=3 maxlength=2></td>
@@ -233,17 +234,21 @@
$_POST['ReasonDescription'] = '';
}
echo '<tr>
- <td>'. _('Description') .':</td>
- <td><input ' . (in_array('ReasonDescription',$Errors) ? 'class="inputerror"' : '' ) .
- ' tabindex=2 type="text" name="ReasonDescription" VALUE="'. $_POST['ReasonDescription'] .'" size="28" maxlength="30">
- </td></tr>
- <tr><td>'. _('Disallow Invoices') . '</td>';
+ <td>'. _('Description') .':</td>
+ <td><input ' . (in_array('ReasonDescription',$Errors) ? 'class="inputerror"' : '' ) .
+ ' tabindex=2 type="text" name="ReasonDescription" VALUE="'. $_POST['ReasonDescription'] .'" size="28" maxlength="30"></td>
+ </tr>
+ <tr>
+ <td>'. _('Disallow Invoices') . '</td>';
if (isset($_POST['DisallowInvoices']) and $_POST['DisallowInvoices']==1) {
echo '<td><input tabindex=3 type="checkbox" checked name="DisallowInvoices"></td></tr>';
} else {
echo '<td><input tabindex=3 type="checkbox" name="DisallowInvoices"></td></tr>';
}
- echo '</table><br><div class="centre"><input tabindex=4 type="submit" name="submit" value="' . _('Enter Information') . '"></div></form>';
+ echo '</table>
+ <br />
+ <div class="centre"><input tabindex=4 type="submit" name="submit" value="' . _('Enter Information') . '"></div>
+ </form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/Credit_Invoice.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -357,7 +357,7 @@
echo '<br />';
}
if (!isset($_POST['ProcessCredit'])) {
- echo '<input type=text class="number" name="' . $LnItm->LineNumber . $Tax->TaxCalculationOrder .
+ echo '<input type="text" class="number" name="' . $LnItm->LineNumber . $Tax->TaxCalculationOrder .
'_TaxRate" maxlength=4 size=4 value="' . $Tax->TaxRate*100 . '">';
}
$i++;
@@ -381,7 +381,7 @@
echo '<td class=number>' . $DisplayTaxAmount . '</td>
<td class=number>' . $DisplayGrossLineTotal . '</td>
- <td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $LnItm->LineNumber . '">' . _('Delete') . '</a></td></tr>';
+ <td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td></tr>';
echo '<tr' . $RowStarter . '><td colspan=12><textarea tabindex=' . $j .' name="Narrative_' . $LnItm->LineNumber . '" cols=100% rows=1>' . $LnItm->Narrative . '</textarea><br /><hr></td></tr>';
$j++;
@@ -395,7 +395,7 @@
if (!isset($_POST['ProcessCredit'])) {
echo '<tr>
<td colspan=3 class=number>' . _('Freight cost charged on invoice') . '</td>
- <td class=number>' . number_format($_SESSION['Old_FreightCost'],2) . '</td>
+ <td class=number>' . number_format($_SESSION['Old_FreightCost'],$_SESSION['CreditItems']->CurrDecimalPlaces) . '</td>
<td></td>
<td colspan=2 class=number>' . _('Credit Freight Cost') . '</td>
<td><input tabindex='.$j.' type=text class="number" size=6 maxlength=6 name="ChargeFreightCost" value="' . $_SESSION['CreditItems']->FreightCost . '"></td>';
@@ -449,7 +449,7 @@
<td colspan=7 class=number>' . _('Credit Totals') . '</td>
<td class=number><hr><b>' . $DisplayTotal . '</b><hr></td>
<td colspan=2></td>
- <td class=number><hr><b>' . number_format($TaxTotal,2) . '<hr></td>
+ <td class=number><hr><b>' . number_format($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces) . '<hr></td>
<td class=number><hr><b>' . number_format($TaxTotal+($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost),$_SESSION['CreditItems']->CurrDecimalPlaces) . '</b><hr></td>
</tr></table>';
}
@@ -507,8 +507,8 @@
/*Do some rounding */
- $_SESSION['CreditItems']->total = round($_SESSION['CreditItems']->total,2);
- $TaxTotal = round($TaxTotal,2);
+ $_SESSION['CreditItems']->total = round($_SESSION['CreditItems']->total,$_SESSION['CreditItems']->CurrDecimalPlaces);
+ $TaxTotal = round($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces);
$Allocate_amount=0;
$Settled =0;
@@ -623,7 +623,7 @@
foreach ($_SESSION['CreditItems']->LineItems as $OrderLine) {
if ($OrderLine->QtyDispatched >0){
- $LocalCurrencyPrice= round(($OrderLine->Price / $_SESSION['CurrencyRate']),2);
+ $LocalCurrencyPrice= round(($OrderLine->Price / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']);
/*Determine the type of stock item being credited */
$SQL = "SELECT mbflag FROM stockmaster WHERE stockid = '" . $OrderLine->StockID . "'";
@@ -1255,7 +1255,7 @@
'" . $PeriodNo . "',
'" . $COGSAccount . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . -round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "'
+ '" . -round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost of sales GL posting could not be inserted because');
@@ -1279,7 +1279,7 @@
'" . $PeriodNo . "',
'" . $_POST['WriteOffGLCode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "')";
+ '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "')";
} else {
$StockGLCode = GetStockGLCode($OrderLine->StockID, $db);
$SQL = "INSERT INTO gltrans (type,
@@ -1295,7 +1295,7 @@
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "')";
+ '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side or write off of the cost of sales GL posting could not be inserted because');
@@ -1322,7 +1322,7 @@
'" . $PeriodNo . "',
'" . $SalesGLAccounts['salesglcode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->Price . "',
- '" . round(($OrderLine->Price * $OrderLine->QtyDispatched)/$_SESSION['CurrencyRate'],2) . "'
+ '" . round(($OrderLine->Price * $OrderLine->QtyDispatched)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The credit note GL posting could not be inserted because');
@@ -1344,7 +1344,7 @@
'" . $PeriodNo . "',
'" . $SalesGLAccounts['discountglcode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " @ " . ($OrderLine->DiscountPercent * 100) . "%',
- '" . -round(($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate'],2) . "'
+ '" . -round(($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The credit note discount GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
@@ -1372,7 +1372,7 @@
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['debtorsact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . "',
- '" . -round(($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate'],2) . "'
+ '" . -round(($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The total debtor GL posting for the credit note could not be inserted because');
@@ -1384,7 +1384,7 @@
/*Could do with setting up a more flexible freight posting schema that looks at the sales type and area of the customer branch to determine where to post the freight recovery */
- if (round($_SESSION['CreditItems']->FreightCost,2) !=0 ) {
+ if (round($_SESSION['CreditItems']->FreightCost,$_SESSION['CreditItems']->CurrDecimalPlaces) !=0 ) {
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -1398,7 +1398,7 @@
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['freightact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . "',
- '" . round($_SESSION['CreditItems']->FreightCost/$_SESSION['CurrencyRate'],2) . "'
+ '" . round($_SESSION['CreditItems']->FreightCost/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The freight GL posting for this credit note could not be inserted because');
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/Currencies.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -25,7 +25,8 @@
$Errors = array();
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
if (isset($_POST['submit'])) {
@@ -61,6 +62,22 @@
$Errors[$i] = 'ExchangeRate';
$i++;
}
+ if (!is_numeric($_POST['DecimalPlaces'])){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ }elseif ($_POST['DecimalPlaces']<=0){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ } elseif ($_POST['DecimalPlaces']>2){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency is expected to be 2 or less'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ }
if (strlen($_POST['CurrencyName']) > 20) {
$InputError = 1;
prnMsg(_('The currency name must be 20 characters or less long'),'error');
@@ -79,7 +96,7 @@
$Errors[$i] = 'HundredsName';
$i++;
}
- if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
+ if (($FunctionalCurrency != '') AND (isset($SelectedCurrency) AND $SelectedCurrency==$FunctionalCurrency)){
$InputError = 1;
prnMsg(_('The functional currency cannot be modified or deleted'),'error');
}
@@ -93,11 +110,11 @@
if (isset($SelectedCurrency) AND $InputError !=1) {
/*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE currencies SET
- currency='" . $_POST['CurrencyName'] . "',
- country='". $_POST['Country']. "',
- hundredsname='" . $_POST['HundredsName'] . "',
- rate='" .$_POST['ExchangeRate'] . "'
+ $sql = "UPDATE currencies SET currency='" . $_POST['CurrencyName'] . "',
+ country='". $_POST['Country']. "',
+ hundredsname='" . $_POST['HundredsName'] . "',
+ decimalplaces='" . $_POST['DecimalPlaces'] . "',
+ rate='" .$_POST['ExchangeRate'] . "'
WHERE currabrev = '" . $SelectedCurrency . "'";
$msg = _('The currency definition record has been updated');
@@ -105,16 +122,18 @@
/*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
$sql = "INSERT INTO currencies (currency,
- currabrev,
- country,
- hundredsname,
- rate)
- VALUES ('" . $_POST['CurrencyName'] . "',
- '" . $_POST['Abbreviation'] . "',
- '" . $_POST['Country'] . "',
- '" . $_POST['HundredsName'] . "',
- '" . $_POST['ExchangeRate'] . "')";
-
+ currabrev,
+ country,
+ hundredsname,
+ decimalplaces,
+ rate)
+ VALUES ('" . $_POST['CurrencyName'] . "',
+ '" . $_POST['Abbreviation'] . "',
+ '" . $_POST['Country'] . "',
+ '" . $_POST['HundredsName'] . "',
+ '" . $_POST['DecimalPlaces'] . "',
+ '" . $_POST['ExchangeRate'] . "')";
+
$msg = _('The currency definition record has been added');
}
//run the SQL from either of the above possibilites
@@ -126,6 +145,7 @@
unset($_POST['CurrencyName']);
unset($_POST['Country']);
unset($_POST['HundredsName']);
+ unset($_POST['DecimalPlaces']);
unset($_POST['ExchangeRate']);
unset($_POST['Abbreviation']);
@@ -134,7 +154,8 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN DebtorsMaster
- $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
+ $sql= "SELECT COUNT(*) FROM debtorsmaster
+ WHERE currcode = '" . $SelectedCurrency . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0)
@@ -142,15 +163,16 @@
prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
'<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
} else {
- $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '".$SelectedCurrency."'";
+ $sql= "SELECT COUNT(*) FROM suppliers
+ WHERE suppliers.currcode = '".$SelectedCurrency."'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
+ if ($myrow[0] > 0) {
prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
. '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
} else {
- $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
+ $sql= "SELECT COUNT(*) FROM banktrans
+ WHERE currcode = '" . $SelectedCurrency . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0){
@@ -176,15 +198,22 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT currency, currabrev, country, hundredsname, rate FROM currencies';
+ $sql = "SELECT currency,
+ currabrev,
+ country,
+ hundredsname,
+ rate,
+ decimalplaces
+ FROM currencies";
$result = DB_query($sql, $db);
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><td></td>
<th>' . _('ISO4217 Code') . '</th>
<th>' . _('Currency Name') . '</th>
<th>' . _('Country') . '</th>
<th>' . _('Hundredths Name') . '</th>
+ <th>' . _('Decimal Places') . '</th>
<th>' . _('Exchange Rate') . '</th>
<th>' . _('Ex Rate - ECB') .'</th>
</tr>';
@@ -197,7 +226,7 @@
$CurrencyRatesArray = array();
}
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($myrow[1]==$FunctionalCurrency){
echo '<tr bgcolor=#FFbbbb>';
} elseif ($k==1){
@@ -222,39 +251,43 @@
<td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
+ <td class=number>%s</td>
<td><a href="%s&SelectedCurrency=%s">%s</a></td>
- <td><a href="%s&SelectedCurrency=%s&delete=1">%s</a></td>
+ <td><a href="%s&SelectedCurrency=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this currency?') . '\');">%s</a></td>
<td><a href="%s/ExchangeRateTrend.php?%s">' . _('Graph') . '</a></td>
</tr>',
$ImageFile,
- $myrow[1],
- $myrow[0],
- $myrow[2],
- $myrow[3],
- number_format($myrow[4],5),
- number_format(GetCurrencyRate($myrow[1],$CurrencyRatesArray),5),
+ $myrow['currabrev'],
+ $myrow['currency'],
+ $myrow['country'],
+ $myrow['hundredsname'],
+ $myrow['decimalplaces'],
+ number_format($myrow['rate'],5),
+ number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),5),
$_SERVER['PHP_SELF'] . '?',
- $myrow[1],
+ $myrow['currabrev'],
_('Edit'),
$_SERVER['PHP_SELF'] . '?',
- $myrow[1],
+ $myrow['currabrev'],
_('Delete'),
$rootpath,
- '&CurrencyToShow=' . $myrow[1]);
+ '&CurrencyToShow=' . $myrow['currabrev']);
} else {
printf('<td><img src="%s"></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
<td colspan=4>%s</td>
</tr>',
$ImageFile,
- $myrow[1],
- $myrow[0],
- $myrow[2],
- $myrow[3],
+ $myrow['currabrev'],
+ $myrow['currency'],
+ $myrow['country'],
+ $myrow['hundredsname'],
+ $myrow['decimalplaces'],
1,
_('Functional Currency'));
}
@@ -282,6 +315,7 @@
currabrev,
country,
hundredsname,
+ decimalplaces,
rate
FROM currencies
WHERE currabrev='" . $SelectedCurrency . "'";
@@ -296,18 +330,22 @@
$_POST['Country'] = $myrow['country'];
$_POST['HundredsName'] = $myrow['hundredsname'];
$_POST['ExchangeRate'] = $myrow['rate'];
+ $_POST['DecimalPlaces'] = $myrow['decimalplaces'];
echo '<input type="hidden" name="SelectedCurrency" value="' . $SelectedCurrency . '">';
echo '<input type="hidden" name="Abbreviation" value="' . $_POST['Abbreviation'] . '">';
- echo '<table class=selection><tr>
+ echo '<table class="selection">
+ <tr>
<td>' . _('ISO 4217 Currency Code').':</td>
- <td>' . $_POST['Abbreviation'] . '</td></tr>';
+ <td>' . $_POST['Abbreviation'] . '</td>
+ </tr>';
} else { //end of if $SelectedCurrency only do the else when a new record is being entered
if (!isset($_POST['Abbreviation'])) {$_POST['Abbreviation']='';}
- echo '<table class=selection><tr>
+ echo '<table class="selection">
+ <tr>
<td>' ._('Currency Abbreviation') . ':</td>
<td><input ' . (in_array('Abbreviation',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" size=4 maxlength=3></td></tr>';
}
@@ -317,15 +355,16 @@
if (!isset($_POST['CurrencyName'])) {
$_POST['CurrencyName']='';
}
- echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
+ echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 value="' . $_POST['CurrencyName'] . '">';
echo '</td></tr>';
echo '<tr><td>'._('Country').':</td>';
echo '<td>';
if (!isset($_POST['Country'])) {
$_POST['Country']='';
}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
+ echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 value="' . $_POST['Country'] . '">';
echo '</td></tr>';
+
echo '<tr><td>'._('Hundredths Name').':</td>';
echo '<td>';
if (!isset($_POST['HundredsName'])) {
@@ -333,6 +372,15 @@
}
echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 value="'. $_POST['HundredsName'].'">';
echo '</td></tr>';
+
+ echo '<tr><td>'._('Decimal Places to Display').':</td>';
+ echo '<td>';
+ if (!isset($_POST['DecimalPlaces'])) {
+ $_POST['DecimalPlaces']='';
+ }
+ echo '<input ' . (in_array('DecimalPlaces',$Errors) ? 'class="inputerror"' : 'class="number"' ) .' type="text" name="DecimalPlaces" size="2" maxlength="2" value="'. $_POST['DecimalPlaces'].'">';
+ echo '</td></tr>';
+
echo '<tr><td>'._('Exchange Rate').':</td>';
echo '<td>';
if (!isset($_POST['ExchangeRate'])) {
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustEDISetup.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -62,9 +62,8 @@
WHERE debtorno = '" . $_SESSION['CustomerID'] . "'";
$ErrMsg = _('The customer EDI setup data could not be updated because');
- $result = DB_query($sql,$db,$ErrMsg);
+ $result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('Customer EDI configuration updated'),'success');
-
} else {
prnMsg(_('Customer EDI configuration failed'),'error');
}
@@ -72,7 +71,7 @@
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table class=selection>';
+echo '<br /><table class="selection">';
$sql = "SELECT debtorno,
name,
@@ -92,11 +91,13 @@
$myrow = DB_fetch_array($result);
echo '<tr><td>'._('Customer Code').':</td>
- <td>' . $_SESSION['CustomerID'] . '</td></tr>';
+ <td>' . $_SESSION['CustomerID'] . '</td>
+ </tr>';
echo '<tr><td>'._('Customer Name').':</td>
- <td>' . $myrow['name'] . '</td></tr>';
+ <td>' . $myrow['name'] . '</td>
+ </tr>';
echo '<tr><td>'._('Enable Sending of EDI Invoices').':</td>
- <td><select tabindex=1 name="EDIInvoices">';
+ <td><select tabindex=1 name="EDIInvoices">';
if ($myrow['ediinvoices']==0){
@@ -107,7 +108,8 @@
echo '<option selected value=1>'._('Enabled') . '</option>';
}
-echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td></tr>';
+echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
+ </tr>';
echo '<tr><td>'._('Enable Receiving of EDI Orders') . ':</td>
<td><select tabindex=2 name="EDIOrders">';
@@ -121,7 +123,8 @@
echo '<option selected value=1>'._('Enabled') . '</option>';
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
echo '<tr><td>'._('Customer EDI Reference') . ':</td>
<td><input ' . (in_array('EDIReference',$Errors) ? 'class="inputerror"' : '' ) .
@@ -152,7 +155,9 @@
<td><input tabindex=7 type="text" name="EDIServerPwd" size=20 maxlength=20 value="' . $myrow['ediserverpwd'] . '"></td></tr>';
}
-echo '</table><br /><div class="centre"><input tabindex=8 type="submit" name="submit" value="' ._('Update EDI Configuration'). '"></div></form>';
+echo '</table>
+ <br /><div class="centre"><input tabindex=8 type="submit" name="submit" value="' ._('Update EDI Configuration'). '"></div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustLoginSetup.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -6,21 +6,10 @@
$title = _('Customer Login Configuration');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+include ('includes/LanguagesArray.php');
-$ModuleList = array(_('Orders'),
- _('Receivables'),
- _('Payables'),
- _('Purchasing'),
- _('Inventory'),
- _('Manufacturing'),
- _('Contracts'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'));
+echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br />';
-echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br>';
-
$sql="SELECT name
FROM debtorsmaster
WHERE debtorno='".$_SESSION['CustomerID']."'";
@@ -33,37 +22,6 @@
'" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
'</p><br />';
-//Make an array of the security roles where only one role is active and is ID 1
-
-//For the security role selection box, we will only show roles that have:
-//- Only one entry in securitygroups AND the tokenid of this entry == 1
-
-//First get all available security role ID's'
-$query_roles = "SELECT secroleid FROM securityroles";
-$result_roles = DB_query($query_roles, $db);
-
-//Check for every security role if they have only one entry in securitygroups, if so check if the tokenid == 1, then store in selection box
-//Then they can be put in the $SecurityRoles array for the selection box;
-$SecurityRoles = array();
-while ($myroles = DB_fetch_array($result_roles)){
-
- $sqltoken = "SELECT tokenid FROM securitygroups WHERE secroleid = '" . $myroles['secroleid'] ."'";
- $result = DB_query($sqltoken,$db);
- $Number_roles = DB_num_rows($result);
- $myrow=DB_fetch_array($result);
-
- if ($Number_roles == 1 && $myrow['tokenid']==1 ) {
-
- $sql = "SELECT secroleid, secrolename FROM securityroles WHERE secroleid = '" . $myroles['secroleid'] ."'";
- $Sec_Result = DB_query($sql, $db);
- // Now load it into an aray using Key/Value pairs
- while( $Sec_row = DB_fetch_row($Sec_Result) ) {
- $SecurityRoles[$Sec_row[0]] = $Sec_row[1];
- }
- DB_free_result($Sec_Result);
- }
-}
-
if (isset($_GET['SelectedUser'])){
$SelectedUser = $_GET['SelectedUser'];
} elseif (isset($_POST['SelectedUser'])){
@@ -97,20 +55,13 @@
$InputError = 1;
prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
}
- //comment out except for demo! Do not want anyone modifying demo user.
- /*
- elseif ($_POST['UserID'] == 'demo') {
- prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
- $InputError = 1;
- }
- */
-
+
if ((strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
// check that the entered branch is valid for the customer code
- $sql = "SELECT custbranch.debtorno
+ $sql = "SELECT defaultlocation
FROM custbranch
- WHERE custbranch.debtorno='" . $_POST['Cust'] . "'
- AND custbranch.branchcode='" . $_POST['BranchCode'] . "'";
+ WHERE debtorno='" . $_POST['Cust'] . "'
+ AND branchcode='" . $_POST['BranchCode'] . "'";
$ErrMsg = _('The check on validity of the customer code and branch failed because');
$DbgMsg = _('The SQL that was used to check the customer code and branch was');
@@ -119,82 +70,65 @@
if (DB_num_rows($result)==0){
prnMsg(_('The entered Branch Code is not valid for the entered Customer Code'),'error');
$InputError = 1;
- }
+ } else {
+ $myrow = DB_fetch_row($result);
+ $InventoryLocation = $myrow[0];
}
-
- /* Make a comma separated list of modules allowed ready to update the database*/
- $i=0;
- $ModulesAllowed = '';
- while ($i < count($ModuleList)){
- $FormVbl = "Module_" . $i;
- $ModulesAllowed .= $_POST[($FormVbl)] . ',';
- $i++;
- }
- $_POST['ModulesAllowed']= $ModulesAllowed;
-
-
+
if (isset($SelectedUser) AND $InputError !=1) {
-/*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
-
- if (!isset($_POST['Cust']) OR $_POST['Cust']==NULL OR $_POST['Cust']==''){
- $_POST['Cust']='';
- $_POST['BranchCode']='';
- }
- $UpdatePassword = "";
+ $UpdatePassword = '';
if ($_POST['Password'] != ""){
$UpdatePassword = "password='" . CryptPass($_POST['Password']) . "',";
}
$sql = "UPDATE www_users SET realname='" . $_POST['RealName'] . "',
- customerid='" . $_POST['Cust'] ."',
phone='" . $_POST['Phone'] ."',
email='" . $_POST['Email'] ."',
".$UpdatePassword."
branchcode='" . $_POST['BranchCode'] . "',
pagesize='" . $_POST['PageSize'] . "',
- fullaccess='" . $_POST['Access'] . "',
theme='" . $_POST['Theme'] . "',
language ='" . $_POST['UserLanguage'] . "',
- defaultlocation='" . $_POST['DefaultLocation'] ."',
- modulesallowed='" . $ModulesAllowed . "',
+ defaultlocation='" . $InventoryLocation ."',
blocked='" . $_POST['Blocked'] . "'
WHERE userid = '".$SelectedUser."'";
prnMsg( _('The selected user record has been updated'), 'success' );
- } elseif ($InputError !=1) {
-
- $sql = "INSERT INTO www_users (userid,
- realname,
- customerid,
- branchcode,
- password,
- phone,
- email,
- pagesize,
- lastvisitdate,
- fullaccess,
- defaultlocation,
- modulesallowed,
- displayrecordsmax,
- theme,
- language)
- VALUES ('" . $_POST['UserID'] . "',
- '" . $_POST['RealName'] ."',
- '" . $_POST['Cust'] ."',
- '" . $_POST['BranchCode'] ."',
- '" . CryptPass($_POST['Password']) ."',
- '" . $_POST['Phone'] . "',
- '" . $_POST['Email'] ."',
- '" . $_POST['PageSize'] ."',
- '" . date('Y-m-d') ."',
- '" . $_POST['Access'] . "',
- '" . $_POST['DefaultLocation'] ."',
- '" . $ModulesAllowed . "',
- '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
- '" . $_POST['Theme'] . "',
- '". $_POST['UserLanguage'] ."')";
- prnMsg( _('A new user record has been inserted'), 'success' );
+
+
+ } else { //no selected user so it's an insert of new user
+
+ $sql = "INSERT INTO www_users (userid,
+ realname,
+ customerid,
+ branchcode,
+ password,
+ phone,
+ email,
+ pagesize,
+ fullaccess,
+ defaultlocation,
+ modulesallowed,
+ displayrecordsmax,
+ theme,
+ language)
+ VALUES ('" . $_POST['UserID'] . "',
+ '" . $_POST['RealName'] ."',
+ '" . $_POST['Cust'] ."',
+ '" . $_POST['BranchCode'] ."',
+ '" . CryptPass($_POST['Password']) ."',
+ '" . $_POST['Phone'] . "',
+ '" . $_POST['Email'] ."',
+ '" . $_POST['PageSize'] ."',
+ '7',
+ '" . $InventoryLocation ."',
+ '1,1,0,0,0,0,0,0',
+ '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
+ '" . $_POST['Theme'] . "',
+ '". $_POST['UserLanguage'] ."')";
+ prnMsg( _('A new user record has been inserted'), 'success' );
+ }
}
if ($InputError!=1){
@@ -211,24 +145,15 @@
unset($_POST['Email']);
unset($_POST['Password']);
unset($_POST['PageSize']);
- unset($_POST['Access']);
- unset($_POST['DefaultLocation']);
- unset($_POST['ModulesAllowed']);
- unset($_POST['Blocked']);
unset($_POST['Theme']);
unset($_POST['UserLanguage']);
+ unset($_POST['Blocked']);
unset($SelectedUser);
}
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
- // comment out except for demo! Do not want anyopne deleting demo user.
- /*
- if ($SelectedUser == 'demo') {
- prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
- } else {
- */
$sql="SELECT userid FROM audittrail where userid='". $SelectedUser ."'";
$result=DB_query($sql, $db);
if (DB_num_rows($result)!=0) {
@@ -241,8 +166,6 @@
prnMsg(_('User Deleted'),'info');
}
unset($SelectedUser);
- // }
-
}
if (!isset($SelectedUser)) {
@@ -250,29 +173,25 @@
/* If its the first time the page has been displayed with no parameters then none of the above are true and the list of Users will be displayed with links to delete or edit each. These will call the same page again and allow update/input or deletion of the records*/
$sql = "SELECT userid,
- realname,
- phone,
- email,
- customerid,
- branchcode,
- lastvisitdate,
- fullaccess,
- pagesize,
- theme,
- language
- FROM www_users WHERE customerid = '" . $_SESSION['CustomerID'] . "'";
+ realname,
+ phone,
+ email,
+ customerid,
+ branchcode,
+ lastvisitdate,
+ pagesize,
+ theme,
+ language
+ FROM www_users WHERE customerid = '" . $_SESSION['CustomerID'] . "'";
$result = DB_query($sql,$db);
-
- echo '<table class=selection>';
+ echo '<table class="selection>"';
+
echo '<tr><th>' . _('User Login') . '</th>
<th>' . _('Full Name') . '</th>
<th>' . _('Telephone') . '</th>
<th>' . _('Email') . '</th>
- <th>' . _('Customer Code') . '</th>
- <th>' . _('Branch Code') . '</th>
<th>' . _('Last Visit') . '</th>
- <th>' . _('Security Role') .'</th>
<th>' . _('Report Size') .'</th>
<th>' . _('Theme') .'</th>
<th>' . _('Language') .'</th>
@@ -280,7 +199,7 @@
$k=0; //row colour counter
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -289,10 +208,6 @@
$k=1;
}
- $LastVisitDate = ConvertSQLDate($myrow[6]);
-
- /*The SecurityHeadings array is defined in config.php */
-
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -301,35 +216,29 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
<td><a href="%s&SelectedUser=%s">' . _('Edit') . '</a></td>
- <td><a href="%s&SelectedUser=%s&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="%s&SelectedUser=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this user login?') . '\');">' . _('Delete') . '</a></td>
</tr>',
- $myrow[0],
- $myrow[1],
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
+ $myrow['userid'],
+ $myrow['realname'],
+ $myrow['phone'],
+ $myrow['email'],
$LastVisitDate,
- $SecurityRoles[($myrow[7])],
- $myrow[8],
- $myrow[9],
- $myrow[10],
+ $myrow['pagesize'],
+ $myrow['theme'],
+ $LanguagesArray[$myrow['language']],
$_SERVER['PHP_SELF'] . '?',
- $myrow[0],
+ $myrow['userid'],
$_SERVER['PHP_SELF'] . '?',
- $myrow[0]);
+ $myrow['userid']);
} //END WHILE LIST LOOP
- echo '</table><br>';
-} //end of ifs and buts!
+ echo '</table><br />';
+} //end of if there is no selected user
if (isset($SelectedUser)) {
- echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Review Existing Users') . '</a></div><br>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Review Existing Users') . '</a></div><br />';
}
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -338,21 +247,17 @@
//editing an existing User
$sql = "SELECT userid,
- realname,
- phone,
- email,
- customerid,
- password,
- branchcode,
- pagesize,
- fullaccess,
- defaultlocation,
- modulesallowed,
- blocked,
- theme,
- language
- FROM www_users
- WHERE userid='" . $SelectedUser . "'";
+ realname,
+ phone,
+ email,
+ customerid,
+ password,
+ branchcode,
+ pagesize,
+ theme,
+ language
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -361,39 +266,25 @@
$_POST['RealName'] = $myrow['realname'];
$_POST['Phone'] = $myrow['phone'];
$_POST['Email'] = $myrow['email'];
- $_POST['Cust'] = $myrow['customerid'];
- $_POST['BranchCode'] = $myrow['branchcode'];
$_POST['PageSize'] = $myrow['pagesize'];
- $_POST['Access'] = $myrow['fullaccess'];
- $_POST['DefaultLocation'] = $myrow['defaultlocation'];
- $_POST['ModulesAllowed'] = $myrow['modulesallowed'];
$_POST['Theme'] = $myrow['theme'];
$_POST['UserLanguage'] = $myrow['language'];
- $_POST['Blocked'] = $myrow['blocked'];
-
+
echo '<input type="hidden" name="SelectedUser" value="' . $SelectedUser . '">';
echo '<input type="hidden" name="UserID" value="' . $_POST['UserID'] . '">';
- echo '<input type="hidden" name="ModulesAllowed" value="' . $_POST['ModulesAllowed'] . '">';
- echo '<table class="selection"> <tr><td>' . _('User code') . ':</td><td>';
- echo $_POST['UserID'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('User code') . ':</td>
+ <td>' . $_POST['UserID'] . '</td>
+ </tr>';
} else { //end of if $SelectedUser only do the else when a new record is being entered
- echo '<table class=selection><tr><td>' . _('User Login') . ':</td><td><input type="text" name="UserID" size=22 maxlength=20 /></td></tr>';
-
- /*set the default modules to show to all
- this had trapped a few people previously*/
- $i=0;
- if (!isset($_POST['ModulesAllowed'])) {
- $_POST['ModulesAllowed']='';
- }
- foreach($ModuleList as $ModuleName){
- if ($i>0){
- $_POST['ModulesAllowed'] .=',';
- }
- $_POST['ModulesAllowed'] .= '1';
- $i++;
- }
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('User Login') . ':</td>
+ <td><input type="text" name="UserID" size="22" maxlength="20" /></td>
+ </tr>';
}
if (!isset($_POST['Password'])) {
@@ -417,31 +308,9 @@
<td><input type="text" name="Phone" value="' . $_POST['Phone'] . '" size=32 maxlength=30></td></tr>';
echo '<tr><td>' . _('Email Address') .':</td>
<td><input type="text" name="Email" value="' . $_POST['Email'] .'" size=32 maxlength=55></td></tr>';
-echo '<tr><td>' . _('Security Role') . ':</td><td><select name="Access">';
-foreach ($SecurityRoles as $SecKey => $SecVal) {
- if (isset($_POST['Access']) and $SecKey == $_POST['Access']){
- echo '<option selected value="' . $SecKey . '">' . $SecVal .'</option>';
- } else {
- echo '<option value="' . $SecKey . '">' . $SecVal .'</option>';
- }
-}
-echo '</select></td></tr>';
-echo '<input type="hidden" name="ID" value="'.$_SESSION['UserID'].'">';
-echo '<tr><td>' . _('Default Location') . ':</td>
- <td><select name="DefaultLocation">';
+echo '<input type="hidden" name="Access" value="1">';
-$sql = "SELECT loccode, locationname FROM locations";
-$result = DB_query($sql,$db);
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['DefaultLocation']) and $myrow['loccode'] == $_POST['DefaultLocation']){
- echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
- } else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
- }
-}
-
-
//Customer is fixed by selection of customer
$_POST['Cust']=$_SESSION['CustomerID'];
echo '<input type="hidden" name="Cust" value="' . $_POST['Cust'] . '">';
@@ -542,60 +411,31 @@
<td>' . _('Language') . ':</td>
<td><select name="UserLanguage">';
-$Languages = scandir('locale/', 0);
-
-
-foreach ($Languages as $LanguageEntry){
-
- if (is_dir('locale/' . $LanguageEntry)
- AND $LanguageEntry != '..'
- AND $LanguageEntry != '.svn'
- AND $LanguageEntry!='.'){
-
- if (isset($_POST['UserLanguage']) and $_POST['UserLanguage'] == $LanguageEntry){
- echo '<option selected value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- } elseif (!isset($_POST['UserLanguage']) and $LanguageEntry == $DefaultLanguage) {
- echo '<option selected value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- } else {
- echo '<option value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- }
+foreach ($LanguagesArray as $LanguageEntry => $LanguageName){
+ if (isset($_POST['UserLanguage']) and $_POST['UserLanguage'] == $LanguageEntry){
+ echo '<option selected value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
+ } elseif (!isset($_POST['UserLanguage']) and $LanguageEntry == $DefaultLanguage) {
+ echo '<option selected value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
+ } else {
+ echo '<option value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
}
}
+
echo '</select></td></tr>';
-
-/*Make an array out of the comma separated list of modules allowed*/
-$ModulesAllowed = explode(',',$_POST['ModulesAllowed']);
-
-$i=0;
-foreach($ModuleList as $ModuleName){
-
- echo '<tr><td>' . _('Display') . ' ' . $ModuleName . ' ' . _('options') . ': </td>
- <td><select name="Module_' . $i . '">';
- if ($ModulesAllowed[$i]==0){
- echo '<option selected value=0>' . _('No') . '</option>';
- echo '<option value=1>' . _('Yes') . '</option>';
- } else {
- echo '<option selected value=1>' . _('Yes') . '</option>';
- echo '<option value=0>' . _('No') . '</option>';
- }
- echo '</select></td></tr>';
- $i++;
-}
-
echo '<tr><td>' . _('Account Status') . ':</td>
<td><select name="Blocked">';
if ($_POST['Blocked']==0){
- echo '<option selected value=0>' . _('Open') . '</option>';
- echo '<option value=1>' . _('Blocked') . '</option>';
+ echo '<option selected value="0">' . _('Open') . '</option>
+ <option value="1">' . _('Blocked') . '</option>';
} else {
- echo '<option selected value=1>' . _('Blocked') . '</option>';
- echo '<option value=0>' . _('Open') . '</option>';
+ echo '<option value="0">' . _('Open') . '</option>
+ <option selected value="1">' . _('Blocked') . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br>
+echo '</table><br />
<div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '"></div>
</form>';
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustomerTransInquiry.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -1,35 +1,38 @@
<?php
-/* $Revision: 1.17 $ */
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Customer Transactions Inquiry');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' .
- _('Transaction Inquiry') . '" alt="" />' . ' ' . _('Transaction Inquiry') . '</p>';
-echo '<div class="page_help_text">' . _('Choose which type of transaction to report on.') . '</div><br>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Transaction Inquiry') . '" alt="" />' . ' ' . _('Transaction Inquiry') . '</p>';
+echo '<div class="page_help_text">' . _('Choose which type of transaction to report on.') . '</div>
+ <br />';
-echo "<form action='" . $_SERVER['PHP_SELF'] . "' method=post>";
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding=2 class=selection><tr>';
-echo '<td>' . _('Type') . ":</td><td><select tabindex=1 name='TransType'> ";
+echo '<td>' . _('Type') . ':</td>
+ <td><select tabindex="1" name="TransType"> ';
-$sql = 'SELECT typeid, typename FROM systypes WHERE typeid >= 10 AND typeid <= 14';
+$sql = "SELECT typeid,
+ typename
+ FROM systypes
+ WHERE typeid >= 10
+ AND typeid <= 14";
+
$resultTypes = DB_query($sql,$db);
-echo "<option Value='All'> All";
+echo '<option value="All">' . _('All') . '</option>';
while ($myrow=DB_fetch_array($resultTypes)){
if (isset($_POST['TransType'])){
if ($myrow['typeid'] == $_POST['TransType']){
- echo "<option selected Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
+ echo '<option selected value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
} else {
- echo "<option Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
+ echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
}
} else {
echo "<option Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
@@ -46,7 +49,7 @@
echo '<td>' . _('From') . ':</td><td><input tabindex="2" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="TEXT" name="FromDate" maxlength="10" size="11" VALUE="' . $_POST['FromDate'] . '"></td>';
echo '<td>' . _('To') . ':</td><td><input tabindex="3" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="TEXT" name="ToDate" maxlength="10" size="11" VALUE="' . $_POST['ToDate'] . '"></td>';
-echo "</tr></table><br><div class='centre'><input tabindex=4 type=submit name='ShowResults' VALUE='" . _('Show Transactions') . "'>";
+echo "</tr></table><br /><div class='centre'><input tabindex=4 type=submit name='ShowResults' VALUE='" . _('Show Transactions') . "'>";
echo '</form></div>';
@@ -79,7 +82,7 @@
$DbgMsg = _('The SQL that failed was');
$TransResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
- echo '<br><table cellpadding=2 class=selection>';
+ echo '<br /><table cellpadding=2 class=selection>';
$tableheader = "<tr>
<th>" . _('Type') . "</th>
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/DeliveryDetails.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -797,34 +797,34 @@
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'info');
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo;
-echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</p>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . '<br />';
+echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></p>';
+
+
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Display the order with or without discount depending on access level*/
if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
-
- echo '<div class="centre"><b>';
-
+
+ echo '<table cellpading=2 colspan=7>';
+
if ($_SESSION['Items'.$identifier]->Quotation==1){
- echo _('Quotation Summary');
+ echo '<tr><th colspan=7>'._('Quotation Summary').'</th></tr>';
} else {
- echo _('Order Summary');
+ echo '<tr><th colspan=7>'._('Order Summary').'</th></tr>';
}
- echo '</b></div>
- <table cellpading=2 colspan=7>
- <Tr>
- <th>'. _('Item Code') .'</th>
- <th>'. _('Item Description') .'</th>
- <th>'. _('Quantity') .'</th>
- <th>'. _('Unit') .'</th>
- <th>'. _('Price') .'</th>
- <th>'. _('Discount') .' %</th>
- <th>'. _('Total') .'</th>
- </tr>';
+ echo '<tr>
+ <th>'. _('Item Code') .'</th>
+ <th>'. _('Item Description') .'</th>
+ <th>'. _('Quantity') .'</th>
+ <th>'. _('Unit') .'</th>
+ <th>'. _('Price') .'</th>
+ <th>'. _('Discount') .' %</th>
+ <th>'. _('Total') .'</th>
+ </tr>';
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
@@ -834,8 +834,8 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineTotal = $StockItem->Quantity * $StockItem->Price * (1 - $StockItem->DiscountPercent);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($StockItem->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($StockItem->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayQuantity = number_format($StockItem->Quantity,$StockItem->DecimalPlaces);
$DisplayDiscount = number_format(($StockItem->DiscountPercent * 100),2);
@@ -872,9 +872,9 @@
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
echo '<br /><table><tr class="EvenTableRows">
<td>'. _('Total Weight') .':</td>
- <td>'.$DisplayWeight.'</td>
+ <td class="number">'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
- <td>'.$DisplayVolume.'</td>
+ <td class="number">'.$DisplayVolume.'</td>
</tr></table>';
} else {
@@ -897,8 +897,8 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineTotal = $StockItem->Quantity * $StockItem->Price * (1 - $StockItem->DiscountPercent);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($StockItem->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($StockItem->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayQuantity = number_format($StockItem->Quantity,$StockItem->DecimalPlaces);
if ($k==1){
@@ -921,7 +921,7 @@
}
- $DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
+ $DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
echo '<table class=selection><tr>
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight .'</td>
@@ -958,11 +958,11 @@
$StkLocsResult = DB_query("SELECT locationname,loccode
FROM locations",$db, $ErrMsg, $DbgMsg);
-while ($myrow=DB_fetch_row($StkLocsResult)){
- if ($_SESSION['Items'.$identifier]->Location==$myrow[1]){
- echo '<option selected value="' . $myrow[1] . '">' . $myrow[0] . '</option>';
+while ($myrow=DB_fetch_array($StkLocsResult)){
+ if ($_SESSION['Items'.$identifier]->Location==$myrow['loccode']){
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="'.$myrow[1].'">'.$myrow[0] . '</option>';
+ echo '<option value="'.$myrow['loccode'].'">'.$myrow['locationname'] . '</option>';
}
}
@@ -982,32 +982,32 @@
// The estimated Dispatch date or Delivery date for this order
echo '<tr>
<td>'. _('Estimated Delivery Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
</tr>';
// The date when a quote was issued to the customer
echo '<tr>
<td>'. _('Quote Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
</tr>';
// The date when the customer confirmed their order
echo '<tr>
<td>'. _('Confirmed Order Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
</tr>';
...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-18 04:55:22
|
Revision: 4598
http://web-erp.svn.sourceforge.net/web-erp/?rev=4598&view=rev
Author: daintree
Date: 2011-06-18 04:55:08 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
languages names
Modified Paths:
--------------
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerTransInquiry.php
trunk/DeliveryDetails.php
trunk/UserSettings.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/index.php
Added Paths:
-----------
trunk/includes/LanguagesArray.php
Modified: trunk/CreditItemsControlled.php
===================================================================
--- trunk/CreditItemsControlled.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CreditItemsControlled.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -1,9 +1,9 @@
<?php
-/* $Revision: 1.11 $ */
+
/* $Id$*/
+
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-//$PageSecurity = 3;
include('includes/session.inc');
$title = _('Specify Credited Controlled Items');
@@ -29,18 +29,18 @@
} elseif (isset($_POST['LineNo'])){
$LineNo = $_POST['LineNo'];
} else {
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Select Credit Items'). '</a><br><br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Select Credit Items'). '</a><br /><br />';
prnMsg( _('This page can only be opened if a Line Item on a credit note has been selected.') . ' ' . _('Please do that first'), 'error');
echo '</div>';
include('includes/footer.inc');
exit;
}
-
-
if (!isset($_SESSION['CreditItems'])) {
/* This page can only be called with a credit note entry part entered */
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Select Credit Items'). '</a><br><br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Select Credit Items'). '</a>
+ <br />
+ <br />';
prnMsg( _('This page can only be opened if a controlled credit note line item has been selected.') . ' ' . _('Please do that first'),'error');
echo '</div>';
include('includes/footer.inc');
@@ -53,8 +53,8 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Back to Credit Note Entry').'</a></div>';
- echo '<br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Back to Credit Note Entry').'</a></div>';
+ echo '<br />';
prnMsg( _('Notice') . ' - ' . _('The line item must be defined as controlled to require input of the batch numbers or serial numbers being credited'),'warn');
include('includes/footer.inc');
exit;
@@ -70,17 +70,16 @@
echo '<div class="centre">';
if ($CreditLink == 'Credit_Invoice.php'){
- echo '<input type=hidden name="CreditInvoice" VALUE="Yes">';
+ echo '<input type="hidden" name="CreditInvoice" value="Yes">';
}
-echo '<br><a href="' . $rootpath . '/' . $CreditLink . '?' . SID . '">'. _('Back to Credit Note Entry'). '</a>';
+echo '<br /><a href="' . $rootpath . '/' . $CreditLink . '">'. _('Back to Credit Note Entry'). '</a>';
-echo '<br><font size=2><b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></font></div>';
+echo '<br /><font size=2><b>'. _('Credit of Controlled Item'). ' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('from') .' '. $_SESSION['CreditItems']->CustomerName . '</b></font></div>';
/** vars needed by InputSerialItem : **/
$LocationOut = $_SESSION['CreditItems']->Location;
-/* $_SESSION['CreditingControlledItems_MustExist'] is in config.php - Phil and Jesse disagree on the default treatment
-compromise position make it user configurable */
+/* $_SESSION['CreditingControlledItems_MustExist'] is in config.php - Phil and Jesse disagree on the default treatment compromise position make it user configurable */
$ItemMustExist = $_SESSION['CreditingControlledItems_MustExist'];
$StockID = $LineItem->StockID;
$InOutModifier=1;
@@ -88,7 +87,8 @@
$IsCredit = true;
include ('includes/InputSerialItems.php');
- echo '</tr></table>';
+echo '</tr>
+ </table>';
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for dispatch */
@@ -100,4 +100,4 @@
include('includes/footer.inc');
exit;
-?>
+?>
\ No newline at end of file
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CreditStatus.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -17,7 +17,8 @@
}
$Errors = array();
$InputError = 0;
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
if (isset($_POST['submit'])) {
@@ -80,24 +81,21 @@
/*Selected Reason is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new status code form */
- if (isset($_POST['DisallowInvoices']) and $_POST['DisallowInvoices']=='on'){
+ if (isset($_POST['DisallowInvoices']) AND $_POST['DisallowInvoices']=='on'){
- $sql = "INSERT INTO holdreasons (
- reasoncode,
- reasondescription,
- dissallowinvoices)
- VALUES (
- '" .$_POST['ReasonCode'] . "',
- '".$_POST['ReasonDescription'] . "'
- , 1)";
+ $sql = "INSERT INTO holdreasons (reasoncode,
+ reasondescription,
+ dissallowinvoices)
+ VALUES ('" .$_POST['ReasonCode'] . "',
+ '".$_POST['ReasonDescription'] . "',
+ 1)";
} else {
- $sql = "INSERT INTO holdreasons (
- reasoncode,
- reasondescription,
- dissallowinvoices)
- VALUES (
- '" . $_POST['ReasonCode'] . "',
- '" . $_POST['ReasonDescription'] ."', 0)";
+ $sql = "INSERT INTO holdreasons (reasoncode,
+ reasondescription,
+ dissallowinvoices)
+ VALUES ('" . $_POST['ReasonCode'] . "',
+ '" . $_POST['ReasonDescription'] ."',
+ 0)";
}
$msg = _('A new credit status record has been inserted');
@@ -122,7 +120,7 @@
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0) {
prnMsg( _('Cannot delete this credit status code because customer accounts have been created referring to it'),'warn');
- echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this credit status code');
+ echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this credit status code');
} else {
//only delete if used in neither customer or supplier accounts
@@ -200,10 +198,10 @@
//editing an existing status code
$sql = "SELECT reasoncode,
- reasondescription,
- dissallowinvoices
- FROM holdreasons
- WHERE reasoncode='".$SelectedReason."'";
+ reasondescription,
+ dissallowinvoices
+ FROM holdreasons
+ WHERE reasoncode='".$SelectedReason."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -215,14 +213,17 @@
echo '<input type="hidden" name="SelectedReason" value="' . $SelectedReason . '">';
echo '<input type="hidden" name="ReasonCode" value="' . $_POST['ReasonCode'] . '">';
echo '<table class="selection">
- <tr><td>'. _('Status Code') .':</td>
- <td>' . $_POST['ReasonCode'] . '</td></tr>';
+ <tr>
+ <td>'. _('Status Code') .':</td>
+ <td>' . $_POST['ReasonCode'] . '</td>
+ </tr>';
} else { //end of if $SelectedReason only do the else when a new record is being entered
if (!isset($_POST['ReasonCode'])) {
$_POST['ReasonCode'] = '';
}
- echo '<br /><table class="selection">
+ echo '<br />
+ <table class="selection">
<tr>
<td>'. _('Status Code') .':</td>
<td><input ' . (in_array('ReasonCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="ReasonCode" value="'. $_POST['ReasonCode'] .'" size=3 maxlength=2></td>
@@ -233,17 +234,21 @@
$_POST['ReasonDescription'] = '';
}
echo '<tr>
- <td>'. _('Description') .':</td>
- <td><input ' . (in_array('ReasonDescription',$Errors) ? 'class="inputerror"' : '' ) .
- ' tabindex=2 type="text" name="ReasonDescription" VALUE="'. $_POST['ReasonDescription'] .'" size="28" maxlength="30">
- </td></tr>
- <tr><td>'. _('Disallow Invoices') . '</td>';
+ <td>'. _('Description') .':</td>
+ <td><input ' . (in_array('ReasonDescription',$Errors) ? 'class="inputerror"' : '' ) .
+ ' tabindex=2 type="text" name="ReasonDescription" VALUE="'. $_POST['ReasonDescription'] .'" size="28" maxlength="30"></td>
+ </tr>
+ <tr>
+ <td>'. _('Disallow Invoices') . '</td>';
if (isset($_POST['DisallowInvoices']) and $_POST['DisallowInvoices']==1) {
echo '<td><input tabindex=3 type="checkbox" checked name="DisallowInvoices"></td></tr>';
} else {
echo '<td><input tabindex=3 type="checkbox" name="DisallowInvoices"></td></tr>';
}
- echo '</table><br><div class="centre"><input tabindex=4 type="submit" name="submit" value="' . _('Enter Information') . '"></div></form>';
+ echo '</table>
+ <br />
+ <div class="centre"><input tabindex=4 type="submit" name="submit" value="' . _('Enter Information') . '"></div>
+ </form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/Credit_Invoice.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -357,7 +357,7 @@
echo '<br />';
}
if (!isset($_POST['ProcessCredit'])) {
- echo '<input type=text class="number" name="' . $LnItm->LineNumber . $Tax->TaxCalculationOrder .
+ echo '<input type="text" class="number" name="' . $LnItm->LineNumber . $Tax->TaxCalculationOrder .
'_TaxRate" maxlength=4 size=4 value="' . $Tax->TaxRate*100 . '">';
}
$i++;
@@ -381,7 +381,7 @@
echo '<td class=number>' . $DisplayTaxAmount . '</td>
<td class=number>' . $DisplayGrossLineTotal . '</td>
- <td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $LnItm->LineNumber . '">' . _('Delete') . '</a></td></tr>';
+ <td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td></tr>';
echo '<tr' . $RowStarter . '><td colspan=12><textarea tabindex=' . $j .' name="Narrative_' . $LnItm->LineNumber . '" cols=100% rows=1>' . $LnItm->Narrative . '</textarea><br /><hr></td></tr>';
$j++;
@@ -395,7 +395,7 @@
if (!isset($_POST['ProcessCredit'])) {
echo '<tr>
<td colspan=3 class=number>' . _('Freight cost charged on invoice') . '</td>
- <td class=number>' . number_format($_SESSION['Old_FreightCost'],2) . '</td>
+ <td class=number>' . number_format($_SESSION['Old_FreightCost'],$_SESSION['CreditItems']->CurrDecimalPlaces) . '</td>
<td></td>
<td colspan=2 class=number>' . _('Credit Freight Cost') . '</td>
<td><input tabindex='.$j.' type=text class="number" size=6 maxlength=6 name="ChargeFreightCost" value="' . $_SESSION['CreditItems']->FreightCost . '"></td>';
@@ -449,7 +449,7 @@
<td colspan=7 class=number>' . _('Credit Totals') . '</td>
<td class=number><hr><b>' . $DisplayTotal . '</b><hr></td>
<td colspan=2></td>
- <td class=number><hr><b>' . number_format($TaxTotal,2) . '<hr></td>
+ <td class=number><hr><b>' . number_format($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces) . '<hr></td>
<td class=number><hr><b>' . number_format($TaxTotal+($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost),$_SESSION['CreditItems']->CurrDecimalPlaces) . '</b><hr></td>
</tr></table>';
}
@@ -507,8 +507,8 @@
/*Do some rounding */
- $_SESSION['CreditItems']->total = round($_SESSION['CreditItems']->total,2);
- $TaxTotal = round($TaxTotal,2);
+ $_SESSION['CreditItems']->total = round($_SESSION['CreditItems']->total,$_SESSION['CreditItems']->CurrDecimalPlaces);
+ $TaxTotal = round($TaxTotal,$_SESSION['CreditItems']->CurrDecimalPlaces);
$Allocate_amount=0;
$Settled =0;
@@ -623,7 +623,7 @@
foreach ($_SESSION['CreditItems']->LineItems as $OrderLine) {
if ($OrderLine->QtyDispatched >0){
- $LocalCurrencyPrice= round(($OrderLine->Price / $_SESSION['CurrencyRate']),2);
+ $LocalCurrencyPrice= round(($OrderLine->Price / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']);
/*Determine the type of stock item being credited */
$SQL = "SELECT mbflag FROM stockmaster WHERE stockid = '" . $OrderLine->StockID . "'";
@@ -1255,7 +1255,7 @@
'" . $PeriodNo . "',
'" . $COGSAccount . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . -round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "'
+ '" . -round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost of sales GL posting could not be inserted because');
@@ -1279,7 +1279,7 @@
'" . $PeriodNo . "',
'" . $_POST['WriteOffGLCode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "')";
+ '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "')";
} else {
$StockGLCode = GetStockGLCode($OrderLine->StockID, $db);
$SQL = "INSERT INTO gltrans (type,
@@ -1295,7 +1295,7 @@
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,2) . "')";
+ '" . round($OrderLine->StandardCost * $OrderLine->QtyDispatched,$_SESSION['CompanyRecord']['decimalplaces']) . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side or write off of the cost of sales GL posting could not be inserted because');
@@ -1322,7 +1322,7 @@
'" . $PeriodNo . "',
'" . $SalesGLAccounts['salesglcode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->Price . "',
- '" . round(($OrderLine->Price * $OrderLine->QtyDispatched)/$_SESSION['CurrencyRate'],2) . "'
+ '" . round(($OrderLine->Price * $OrderLine->QtyDispatched)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The credit note GL posting could not be inserted because');
@@ -1344,7 +1344,7 @@
'" . $PeriodNo . "',
'" . $SalesGLAccounts['discountglcode'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . " - " . $OrderLine->StockID . " @ " . ($OrderLine->DiscountPercent * 100) . "%',
- '" . -round(($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate'],2) . "'
+ '" . -round(($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The credit note discount GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
@@ -1372,7 +1372,7 @@
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['debtorsact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . "',
- '" . -round(($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate'],2) . "'
+ '" . -round(($_SESSION['CreditItems']->total + $_SESSION['CreditItems']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The total debtor GL posting for the credit note could not be inserted because');
@@ -1384,7 +1384,7 @@
/*Could do with setting up a more flexible freight posting schema that looks at the sales type and area of the customer branch to determine where to post the freight recovery */
- if (round($_SESSION['CreditItems']->FreightCost,2) !=0 ) {
+ if (round($_SESSION['CreditItems']->FreightCost,$_SESSION['CreditItems']->CurrDecimalPlaces) !=0 ) {
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -1398,7 +1398,7 @@
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['freightact'] . "',
'" . $_SESSION['CreditItems']->DebtorNo . "',
- '" . round($_SESSION['CreditItems']->FreightCost/$_SESSION['CurrencyRate'],2) . "'
+ '" . round($_SESSION['CreditItems']->FreightCost/$_SESSION['CurrencyRate'],$_SESSION['CompanyRecord']['decimalplaces']) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The freight GL posting for this credit note could not be inserted because');
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/Currencies.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -25,7 +25,8 @@
$Errors = array();
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
if (isset($_POST['submit'])) {
@@ -61,6 +62,22 @@
$Errors[$i] = 'ExchangeRate';
$i++;
}
+ if (!is_numeric($_POST['DecimalPlaces'])){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ }elseif ($_POST['DecimalPlaces']<=0){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ } elseif ($_POST['DecimalPlaces']>2){
+ $InputError = 1;
+ prnMsg(_('The number of decimal places to display for amounts in this currency is expected to be 2 or less'),'error');
+ $Errors[$i] = 'DecimalPlaces';
+ $i++;
+ }
if (strlen($_POST['CurrencyName']) > 20) {
$InputError = 1;
prnMsg(_('The currency name must be 20 characters or less long'),'error');
@@ -79,7 +96,7 @@
$Errors[$i] = 'HundredsName';
$i++;
}
- if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
+ if (($FunctionalCurrency != '') AND (isset($SelectedCurrency) AND $SelectedCurrency==$FunctionalCurrency)){
$InputError = 1;
prnMsg(_('The functional currency cannot be modified or deleted'),'error');
}
@@ -93,11 +110,11 @@
if (isset($SelectedCurrency) AND $InputError !=1) {
/*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE currencies SET
- currency='" . $_POST['CurrencyName'] . "',
- country='". $_POST['Country']. "',
- hundredsname='" . $_POST['HundredsName'] . "',
- rate='" .$_POST['ExchangeRate'] . "'
+ $sql = "UPDATE currencies SET currency='" . $_POST['CurrencyName'] . "',
+ country='". $_POST['Country']. "',
+ hundredsname='" . $_POST['HundredsName'] . "',
+ decimalplaces='" . $_POST['DecimalPlaces'] . "',
+ rate='" .$_POST['ExchangeRate'] . "'
WHERE currabrev = '" . $SelectedCurrency . "'";
$msg = _('The currency definition record has been updated');
@@ -105,16 +122,18 @@
/*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
$sql = "INSERT INTO currencies (currency,
- currabrev,
- country,
- hundredsname,
- rate)
- VALUES ('" . $_POST['CurrencyName'] . "',
- '" . $_POST['Abbreviation'] . "',
- '" . $_POST['Country'] . "',
- '" . $_POST['HundredsName'] . "',
- '" . $_POST['ExchangeRate'] . "')";
-
+ currabrev,
+ country,
+ hundredsname,
+ decimalplaces,
+ rate)
+ VALUES ('" . $_POST['CurrencyName'] . "',
+ '" . $_POST['Abbreviation'] . "',
+ '" . $_POST['Country'] . "',
+ '" . $_POST['HundredsName'] . "',
+ '" . $_POST['DecimalPlaces'] . "',
+ '" . $_POST['ExchangeRate'] . "')";
+
$msg = _('The currency definition record has been added');
}
//run the SQL from either of the above possibilites
@@ -126,6 +145,7 @@
unset($_POST['CurrencyName']);
unset($_POST['Country']);
unset($_POST['HundredsName']);
+ unset($_POST['DecimalPlaces']);
unset($_POST['ExchangeRate']);
unset($_POST['Abbreviation']);
@@ -134,7 +154,8 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN DebtorsMaster
- $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
+ $sql= "SELECT COUNT(*) FROM debtorsmaster
+ WHERE currcode = '" . $SelectedCurrency . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0)
@@ -142,15 +163,16 @@
prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
'<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
} else {
- $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '".$SelectedCurrency."'";
+ $sql= "SELECT COUNT(*) FROM suppliers
+ WHERE suppliers.currcode = '".$SelectedCurrency."'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
+ if ($myrow[0] > 0) {
prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
. '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
} else {
- $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
+ $sql= "SELECT COUNT(*) FROM banktrans
+ WHERE currcode = '" . $SelectedCurrency . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0] > 0){
@@ -176,15 +198,22 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT currency, currabrev, country, hundredsname, rate FROM currencies';
+ $sql = "SELECT currency,
+ currabrev,
+ country,
+ hundredsname,
+ rate,
+ decimalplaces
+ FROM currencies";
$result = DB_query($sql, $db);
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><td></td>
<th>' . _('ISO4217 Code') . '</th>
<th>' . _('Currency Name') . '</th>
<th>' . _('Country') . '</th>
<th>' . _('Hundredths Name') . '</th>
+ <th>' . _('Decimal Places') . '</th>
<th>' . _('Exchange Rate') . '</th>
<th>' . _('Ex Rate - ECB') .'</th>
</tr>';
@@ -197,7 +226,7 @@
$CurrencyRatesArray = array();
}
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($myrow[1]==$FunctionalCurrency){
echo '<tr bgcolor=#FFbbbb>';
} elseif ($k==1){
@@ -222,39 +251,43 @@
<td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
+ <td class=number>%s</td>
<td><a href="%s&SelectedCurrency=%s">%s</a></td>
- <td><a href="%s&SelectedCurrency=%s&delete=1">%s</a></td>
+ <td><a href="%s&SelectedCurrency=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this currency?') . '\');">%s</a></td>
<td><a href="%s/ExchangeRateTrend.php?%s">' . _('Graph') . '</a></td>
</tr>',
$ImageFile,
- $myrow[1],
- $myrow[0],
- $myrow[2],
- $myrow[3],
- number_format($myrow[4],5),
- number_format(GetCurrencyRate($myrow[1],$CurrencyRatesArray),5),
+ $myrow['currabrev'],
+ $myrow['currency'],
+ $myrow['country'],
+ $myrow['hundredsname'],
+ $myrow['decimalplaces'],
+ number_format($myrow['rate'],5),
+ number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),5),
$_SERVER['PHP_SELF'] . '?',
- $myrow[1],
+ $myrow['currabrev'],
_('Edit'),
$_SERVER['PHP_SELF'] . '?',
- $myrow[1],
+ $myrow['currabrev'],
_('Delete'),
$rootpath,
- '&CurrencyToShow=' . $myrow[1]);
+ '&CurrencyToShow=' . $myrow['currabrev']);
} else {
printf('<td><img src="%s"></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
<td colspan=4>%s</td>
</tr>',
$ImageFile,
- $myrow[1],
- $myrow[0],
- $myrow[2],
- $myrow[3],
+ $myrow['currabrev'],
+ $myrow['currency'],
+ $myrow['country'],
+ $myrow['hundredsname'],
+ $myrow['decimalplaces'],
1,
_('Functional Currency'));
}
@@ -282,6 +315,7 @@
currabrev,
country,
hundredsname,
+ decimalplaces,
rate
FROM currencies
WHERE currabrev='" . $SelectedCurrency . "'";
@@ -296,18 +330,22 @@
$_POST['Country'] = $myrow['country'];
$_POST['HundredsName'] = $myrow['hundredsname'];
$_POST['ExchangeRate'] = $myrow['rate'];
+ $_POST['DecimalPlaces'] = $myrow['decimalplaces'];
echo '<input type="hidden" name="SelectedCurrency" value="' . $SelectedCurrency . '">';
echo '<input type="hidden" name="Abbreviation" value="' . $_POST['Abbreviation'] . '">';
- echo '<table class=selection><tr>
+ echo '<table class="selection">
+ <tr>
<td>' . _('ISO 4217 Currency Code').':</td>
- <td>' . $_POST['Abbreviation'] . '</td></tr>';
+ <td>' . $_POST['Abbreviation'] . '</td>
+ </tr>';
} else { //end of if $SelectedCurrency only do the else when a new record is being entered
if (!isset($_POST['Abbreviation'])) {$_POST['Abbreviation']='';}
- echo '<table class=selection><tr>
+ echo '<table class="selection">
+ <tr>
<td>' ._('Currency Abbreviation') . ':</td>
<td><input ' . (in_array('Abbreviation',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" size=4 maxlength=3></td></tr>';
}
@@ -317,15 +355,16 @@
if (!isset($_POST['CurrencyName'])) {
$_POST['CurrencyName']='';
}
- echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
+ echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 value="' . $_POST['CurrencyName'] . '">';
echo '</td></tr>';
echo '<tr><td>'._('Country').':</td>';
echo '<td>';
if (!isset($_POST['Country'])) {
$_POST['Country']='';
}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
+ echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 value="' . $_POST['Country'] . '">';
echo '</td></tr>';
+
echo '<tr><td>'._('Hundredths Name').':</td>';
echo '<td>';
if (!isset($_POST['HundredsName'])) {
@@ -333,6 +372,15 @@
}
echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 value="'. $_POST['HundredsName'].'">';
echo '</td></tr>';
+
+ echo '<tr><td>'._('Decimal Places to Display').':</td>';
+ echo '<td>';
+ if (!isset($_POST['DecimalPlaces'])) {
+ $_POST['DecimalPlaces']='';
+ }
+ echo '<input ' . (in_array('DecimalPlaces',$Errors) ? 'class="inputerror"' : 'class="number"' ) .' type="text" name="DecimalPlaces" size="2" maxlength="2" value="'. $_POST['DecimalPlaces'].'">';
+ echo '</td></tr>';
+
echo '<tr><td>'._('Exchange Rate').':</td>';
echo '<td>';
if (!isset($_POST['ExchangeRate'])) {
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustEDISetup.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -62,9 +62,8 @@
WHERE debtorno = '" . $_SESSION['CustomerID'] . "'";
$ErrMsg = _('The customer EDI setup data could not be updated because');
- $result = DB_query($sql,$db,$ErrMsg);
+ $result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('Customer EDI configuration updated'),'success');
-
} else {
prnMsg(_('Customer EDI configuration failed'),'error');
}
@@ -72,7 +71,7 @@
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table class=selection>';
+echo '<br /><table class="selection">';
$sql = "SELECT debtorno,
name,
@@ -92,11 +91,13 @@
$myrow = DB_fetch_array($result);
echo '<tr><td>'._('Customer Code').':</td>
- <td>' . $_SESSION['CustomerID'] . '</td></tr>';
+ <td>' . $_SESSION['CustomerID'] . '</td>
+ </tr>';
echo '<tr><td>'._('Customer Name').':</td>
- <td>' . $myrow['name'] . '</td></tr>';
+ <td>' . $myrow['name'] . '</td>
+ </tr>';
echo '<tr><td>'._('Enable Sending of EDI Invoices').':</td>
- <td><select tabindex=1 name="EDIInvoices">';
+ <td><select tabindex=1 name="EDIInvoices">';
if ($myrow['ediinvoices']==0){
@@ -107,7 +108,8 @@
echo '<option selected value=1>'._('Enabled') . '</option>';
}
-echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td></tr>';
+echo '</select><a href="' . $rootpath . '/EDIMessageFormat.php?MessageType=INVOIC&PartnerCode=' . $_SESSION['CustomerID'] . '">'._('Create') . '/' . _('Edit Invoice Message Format').'</a></td>
+ </tr>';
echo '<tr><td>'._('Enable Receiving of EDI Orders') . ':</td>
<td><select tabindex=2 name="EDIOrders">';
@@ -121,7 +123,8 @@
echo '<option selected value=1>'._('Enabled') . '</option>';
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
echo '<tr><td>'._('Customer EDI Reference') . ':</td>
<td><input ' . (in_array('EDIReference',$Errors) ? 'class="inputerror"' : '' ) .
@@ -152,7 +155,9 @@
<td><input tabindex=7 type="text" name="EDIServerPwd" size=20 maxlength=20 value="' . $myrow['ediserverpwd'] . '"></td></tr>';
}
-echo '</table><br /><div class="centre"><input tabindex=8 type="submit" name="submit" value="' ._('Update EDI Configuration'). '"></div></form>';
+echo '</table>
+ <br /><div class="centre"><input tabindex=8 type="submit" name="submit" value="' ._('Update EDI Configuration'). '"></div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustLoginSetup.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -6,21 +6,10 @@
$title = _('Customer Login Configuration');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+include ('includes/LanguagesArray.php');
-$ModuleList = array(_('Orders'),
- _('Receivables'),
- _('Payables'),
- _('Purchasing'),
- _('Inventory'),
- _('Manufacturing'),
- _('Contracts'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'));
+echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br />';
-echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br>';
-
$sql="SELECT name
FROM debtorsmaster
WHERE debtorno='".$_SESSION['CustomerID']."'";
@@ -33,37 +22,6 @@
'" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
'</p><br />';
-//Make an array of the security roles where only one role is active and is ID 1
-
-//For the security role selection box, we will only show roles that have:
-//- Only one entry in securitygroups AND the tokenid of this entry == 1
-
-//First get all available security role ID's'
-$query_roles = "SELECT secroleid FROM securityroles";
-$result_roles = DB_query($query_roles, $db);
-
-//Check for every security role if they have only one entry in securitygroups, if so check if the tokenid == 1, then store in selection box
-//Then they can be put in the $SecurityRoles array for the selection box;
-$SecurityRoles = array();
-while ($myroles = DB_fetch_array($result_roles)){
-
- $sqltoken = "SELECT tokenid FROM securitygroups WHERE secroleid = '" . $myroles['secroleid'] ."'";
- $result = DB_query($sqltoken,$db);
- $Number_roles = DB_num_rows($result);
- $myrow=DB_fetch_array($result);
-
- if ($Number_roles == 1 && $myrow['tokenid']==1 ) {
-
- $sql = "SELECT secroleid, secrolename FROM securityroles WHERE secroleid = '" . $myroles['secroleid'] ."'";
- $Sec_Result = DB_query($sql, $db);
- // Now load it into an aray using Key/Value pairs
- while( $Sec_row = DB_fetch_row($Sec_Result) ) {
- $SecurityRoles[$Sec_row[0]] = $Sec_row[1];
- }
- DB_free_result($Sec_Result);
- }
-}
-
if (isset($_GET['SelectedUser'])){
$SelectedUser = $_GET['SelectedUser'];
} elseif (isset($_POST['SelectedUser'])){
@@ -97,20 +55,13 @@
$InputError = 1;
prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
}
- //comment out except for demo! Do not want anyone modifying demo user.
- /*
- elseif ($_POST['UserID'] == 'demo') {
- prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
- $InputError = 1;
- }
- */
-
+
if ((strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
// check that the entered branch is valid for the customer code
- $sql = "SELECT custbranch.debtorno
+ $sql = "SELECT defaultlocation
FROM custbranch
- WHERE custbranch.debtorno='" . $_POST['Cust'] . "'
- AND custbranch.branchcode='" . $_POST['BranchCode'] . "'";
+ WHERE debtorno='" . $_POST['Cust'] . "'
+ AND branchcode='" . $_POST['BranchCode'] . "'";
$ErrMsg = _('The check on validity of the customer code and branch failed because');
$DbgMsg = _('The SQL that was used to check the customer code and branch was');
@@ -119,82 +70,65 @@
if (DB_num_rows($result)==0){
prnMsg(_('The entered Branch Code is not valid for the entered Customer Code'),'error');
$InputError = 1;
- }
+ } else {
+ $myrow = DB_fetch_row($result);
+ $InventoryLocation = $myrow[0];
}
-
- /* Make a comma separated list of modules allowed ready to update the database*/
- $i=0;
- $ModulesAllowed = '';
- while ($i < count($ModuleList)){
- $FormVbl = "Module_" . $i;
- $ModulesAllowed .= $_POST[($FormVbl)] . ',';
- $i++;
- }
- $_POST['ModulesAllowed']= $ModulesAllowed;
-
-
+
if (isset($SelectedUser) AND $InputError !=1) {
-/*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
-
- if (!isset($_POST['Cust']) OR $_POST['Cust']==NULL OR $_POST['Cust']==''){
- $_POST['Cust']='';
- $_POST['BranchCode']='';
- }
- $UpdatePassword = "";
+ $UpdatePassword = '';
if ($_POST['Password'] != ""){
$UpdatePassword = "password='" . CryptPass($_POST['Password']) . "',";
}
$sql = "UPDATE www_users SET realname='" . $_POST['RealName'] . "',
- customerid='" . $_POST['Cust'] ."',
phone='" . $_POST['Phone'] ."',
email='" . $_POST['Email'] ."',
".$UpdatePassword."
branchcode='" . $_POST['BranchCode'] . "',
pagesize='" . $_POST['PageSize'] . "',
- fullaccess='" . $_POST['Access'] . "',
theme='" . $_POST['Theme'] . "',
language ='" . $_POST['UserLanguage'] . "',
- defaultlocation='" . $_POST['DefaultLocation'] ."',
- modulesallowed='" . $ModulesAllowed . "',
+ defaultlocation='" . $InventoryLocation ."',
blocked='" . $_POST['Blocked'] . "'
WHERE userid = '".$SelectedUser."'";
prnMsg( _('The selected user record has been updated'), 'success' );
- } elseif ($InputError !=1) {
-
- $sql = "INSERT INTO www_users (userid,
- realname,
- customerid,
- branchcode,
- password,
- phone,
- email,
- pagesize,
- lastvisitdate,
- fullaccess,
- defaultlocation,
- modulesallowed,
- displayrecordsmax,
- theme,
- language)
- VALUES ('" . $_POST['UserID'] . "',
- '" . $_POST['RealName'] ."',
- '" . $_POST['Cust'] ."',
- '" . $_POST['BranchCode'] ."',
- '" . CryptPass($_POST['Password']) ."',
- '" . $_POST['Phone'] . "',
- '" . $_POST['Email'] ."',
- '" . $_POST['PageSize'] ."',
- '" . date('Y-m-d') ."',
- '" . $_POST['Access'] . "',
- '" . $_POST['DefaultLocation'] ."',
- '" . $ModulesAllowed . "',
- '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
- '" . $_POST['Theme'] . "',
- '". $_POST['UserLanguage'] ."')";
- prnMsg( _('A new user record has been inserted'), 'success' );
+
+
+ } else { //no selected user so it's an insert of new user
+
+ $sql = "INSERT INTO www_users (userid,
+ realname,
+ customerid,
+ branchcode,
+ password,
+ phone,
+ email,
+ pagesize,
+ fullaccess,
+ defaultlocation,
+ modulesallowed,
+ displayrecordsmax,
+ theme,
+ language)
+ VALUES ('" . $_POST['UserID'] . "',
+ '" . $_POST['RealName'] ."',
+ '" . $_POST['Cust'] ."',
+ '" . $_POST['BranchCode'] ."',
+ '" . CryptPass($_POST['Password']) ."',
+ '" . $_POST['Phone'] . "',
+ '" . $_POST['Email'] ."',
+ '" . $_POST['PageSize'] ."',
+ '7',
+ '" . $InventoryLocation ."',
+ '1,1,0,0,0,0,0,0',
+ '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
+ '" . $_POST['Theme'] . "',
+ '". $_POST['UserLanguage'] ."')";
+ prnMsg( _('A new user record has been inserted'), 'success' );
+ }
}
if ($InputError!=1){
@@ -211,24 +145,15 @@
unset($_POST['Email']);
unset($_POST['Password']);
unset($_POST['PageSize']);
- unset($_POST['Access']);
- unset($_POST['DefaultLocation']);
- unset($_POST['ModulesAllowed']);
- unset($_POST['Blocked']);
unset($_POST['Theme']);
unset($_POST['UserLanguage']);
+ unset($_POST['Blocked']);
unset($SelectedUser);
}
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
- // comment out except for demo! Do not want anyopne deleting demo user.
- /*
- if ($SelectedUser == 'demo') {
- prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
- } else {
- */
$sql="SELECT userid FROM audittrail where userid='". $SelectedUser ."'";
$result=DB_query($sql, $db);
if (DB_num_rows($result)!=0) {
@@ -241,8 +166,6 @@
prnMsg(_('User Deleted'),'info');
}
unset($SelectedUser);
- // }
-
}
if (!isset($SelectedUser)) {
@@ -250,29 +173,25 @@
/* If its the first time the page has been displayed with no parameters then none of the above are true and the list of Users will be displayed with links to delete or edit each. These will call the same page again and allow update/input or deletion of the records*/
$sql = "SELECT userid,
- realname,
- phone,
- email,
- customerid,
- branchcode,
- lastvisitdate,
- fullaccess,
- pagesize,
- theme,
- language
- FROM www_users WHERE customerid = '" . $_SESSION['CustomerID'] . "'";
+ realname,
+ phone,
+ email,
+ customerid,
+ branchcode,
+ lastvisitdate,
+ pagesize,
+ theme,
+ language
+ FROM www_users WHERE customerid = '" . $_SESSION['CustomerID'] . "'";
$result = DB_query($sql,$db);
-
- echo '<table class=selection>';
+ echo '<table class="selection>"';
+
echo '<tr><th>' . _('User Login') . '</th>
<th>' . _('Full Name') . '</th>
<th>' . _('Telephone') . '</th>
<th>' . _('Email') . '</th>
- <th>' . _('Customer Code') . '</th>
- <th>' . _('Branch Code') . '</th>
<th>' . _('Last Visit') . '</th>
- <th>' . _('Security Role') .'</th>
<th>' . _('Report Size') .'</th>
<th>' . _('Theme') .'</th>
<th>' . _('Language') .'</th>
@@ -280,7 +199,7 @@
$k=0; //row colour counter
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -289,10 +208,6 @@
$k=1;
}
- $LastVisitDate = ConvertSQLDate($myrow[6]);
-
- /*The SecurityHeadings array is defined in config.php */
-
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -301,35 +216,29 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
<td><a href="%s&SelectedUser=%s">' . _('Edit') . '</a></td>
- <td><a href="%s&SelectedUser=%s&delete=1">' . _('Delete') . '</a></td>
+ <td><a href="%s&SelectedUser=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this user login?') . '\');">' . _('Delete') . '</a></td>
</tr>',
- $myrow[0],
- $myrow[1],
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
+ $myrow['userid'],
+ $myrow['realname'],
+ $myrow['phone'],
+ $myrow['email'],
$LastVisitDate,
- $SecurityRoles[($myrow[7])],
- $myrow[8],
- $myrow[9],
- $myrow[10],
+ $myrow['pagesize'],
+ $myrow['theme'],
+ $LanguagesArray[$myrow['language']],
$_SERVER['PHP_SELF'] . '?',
- $myrow[0],
+ $myrow['userid'],
$_SERVER['PHP_SELF'] . '?',
- $myrow[0]);
+ $myrow['userid']);
} //END WHILE LIST LOOP
- echo '</table><br>';
-} //end of ifs and buts!
+ echo '</table><br />';
+} //end of if there is no selected user
if (isset($SelectedUser)) {
- echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Review Existing Users') . '</a></div><br>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Review Existing Users') . '</a></div><br />';
}
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -338,21 +247,17 @@
//editing an existing User
$sql = "SELECT userid,
- realname,
- phone,
- email,
- customerid,
- password,
- branchcode,
- pagesize,
- fullaccess,
- defaultlocation,
- modulesallowed,
- blocked,
- theme,
- language
- FROM www_users
- WHERE userid='" . $SelectedUser . "'";
+ realname,
+ phone,
+ email,
+ customerid,
+ password,
+ branchcode,
+ pagesize,
+ theme,
+ language
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -361,39 +266,25 @@
$_POST['RealName'] = $myrow['realname'];
$_POST['Phone'] = $myrow['phone'];
$_POST['Email'] = $myrow['email'];
- $_POST['Cust'] = $myrow['customerid'];
- $_POST['BranchCode'] = $myrow['branchcode'];
$_POST['PageSize'] = $myrow['pagesize'];
- $_POST['Access'] = $myrow['fullaccess'];
- $_POST['DefaultLocation'] = $myrow['defaultlocation'];
- $_POST['ModulesAllowed'] = $myrow['modulesallowed'];
$_POST['Theme'] = $myrow['theme'];
$_POST['UserLanguage'] = $myrow['language'];
- $_POST['Blocked'] = $myrow['blocked'];
-
+
echo '<input type="hidden" name="SelectedUser" value="' . $SelectedUser . '">';
echo '<input type="hidden" name="UserID" value="' . $_POST['UserID'] . '">';
- echo '<input type="hidden" name="ModulesAllowed" value="' . $_POST['ModulesAllowed'] . '">';
- echo '<table class="selection"> <tr><td>' . _('User code') . ':</td><td>';
- echo $_POST['UserID'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('User code') . ':</td>
+ <td>' . $_POST['UserID'] . '</td>
+ </tr>';
} else { //end of if $SelectedUser only do the else when a new record is being entered
- echo '<table class=selection><tr><td>' . _('User Login') . ':</td><td><input type="text" name="UserID" size=22 maxlength=20 /></td></tr>';
-
- /*set the default modules to show to all
- this had trapped a few people previously*/
- $i=0;
- if (!isset($_POST['ModulesAllowed'])) {
- $_POST['ModulesAllowed']='';
- }
- foreach($ModuleList as $ModuleName){
- if ($i>0){
- $_POST['ModulesAllowed'] .=',';
- }
- $_POST['ModulesAllowed'] .= '1';
- $i++;
- }
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('User Login') . ':</td>
+ <td><input type="text" name="UserID" size="22" maxlength="20" /></td>
+ </tr>';
}
if (!isset($_POST['Password'])) {
@@ -417,31 +308,9 @@
<td><input type="text" name="Phone" value="' . $_POST['Phone'] . '" size=32 maxlength=30></td></tr>';
echo '<tr><td>' . _('Email Address') .':</td>
<td><input type="text" name="Email" value="' . $_POST['Email'] .'" size=32 maxlength=55></td></tr>';
-echo '<tr><td>' . _('Security Role') . ':</td><td><select name="Access">';
-foreach ($SecurityRoles as $SecKey => $SecVal) {
- if (isset($_POST['Access']) and $SecKey == $_POST['Access']){
- echo '<option selected value="' . $SecKey . '">' . $SecVal .'</option>';
- } else {
- echo '<option value="' . $SecKey . '">' . $SecVal .'</option>';
- }
-}
-echo '</select></td></tr>';
-echo '<input type="hidden" name="ID" value="'.$_SESSION['UserID'].'">';
-echo '<tr><td>' . _('Default Location') . ':</td>
- <td><select name="DefaultLocation">';
+echo '<input type="hidden" name="Access" value="1">';
-$sql = "SELECT loccode, locationname FROM locations";
-$result = DB_query($sql,$db);
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['DefaultLocation']) and $myrow['loccode'] == $_POST['DefaultLocation']){
- echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
- } else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
- }
-}
-
-
//Customer is fixed by selection of customer
$_POST['Cust']=$_SESSION['CustomerID'];
echo '<input type="hidden" name="Cust" value="' . $_POST['Cust'] . '">';
@@ -542,60 +411,31 @@
<td>' . _('Language') . ':</td>
<td><select name="UserLanguage">';
-$Languages = scandir('locale/', 0);
-
-
-foreach ($Languages as $LanguageEntry){
-
- if (is_dir('locale/' . $LanguageEntry)
- AND $LanguageEntry != '..'
- AND $LanguageEntry != '.svn'
- AND $LanguageEntry!='.'){
-
- if (isset($_POST['UserLanguage']) and $_POST['UserLanguage'] == $LanguageEntry){
- echo '<option selected value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- } elseif (!isset($_POST['UserLanguage']) and $LanguageEntry == $DefaultLanguage) {
- echo '<option selected value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- } else {
- echo '<option value="' . $LanguageEntry . '">' . $LanguageEntry .'</option>';
- }
+foreach ($LanguagesArray as $LanguageEntry => $LanguageName){
+ if (isset($_POST['UserLanguage']) and $_POST['UserLanguage'] == $LanguageEntry){
+ echo '<option selected value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
+ } elseif (!isset($_POST['UserLanguage']) and $LanguageEntry == $DefaultLanguage) {
+ echo '<option selected value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
+ } else {
+ echo '<option value="' . $LanguageEntry . '">' . $LanguageName .'</option>';
}
}
+
echo '</select></td></tr>';
-
-/*Make an array out of the comma separated list of modules allowed*/
-$ModulesAllowed = explode(',',$_POST['ModulesAllowed']);
-
-$i=0;
-foreach($ModuleList as $ModuleName){
-
- echo '<tr><td>' . _('Display') . ' ' . $ModuleName . ' ' . _('options') . ': </td>
- <td><select name="Module_' . $i . '">';
- if ($ModulesAllowed[$i]==0){
- echo '<option selected value=0>' . _('No') . '</option>';
- echo '<option value=1>' . _('Yes') . '</option>';
- } else {
- echo '<option selected value=1>' . _('Yes') . '</option>';
- echo '<option value=0>' . _('No') . '</option>';
- }
- echo '</select></td></tr>';
- $i++;
-}
-
echo '<tr><td>' . _('Account Status') . ':</td>
<td><select name="Blocked">';
if ($_POST['Blocked']==0){
- echo '<option selected value=0>' . _('Open') . '</option>';
- echo '<option value=1>' . _('Blocked') . '</option>';
+ echo '<option selected value="0">' . _('Open') . '</option>
+ <option value="1">' . _('Blocked') . '</option>';
} else {
- echo '<option selected value=1>' . _('Blocked') . '</option>';
- echo '<option value=0>' . _('Open') . '</option>';
+ echo '<option value="0">' . _('Open') . '</option>
+ <option selected value="1">' . _('Blocked') . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br>
+echo '</table><br />
<div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '"></div>
</form>';
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/CustomerTransInquiry.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -1,35 +1,38 @@
<?php
-/* $Revision: 1.17 $ */
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Customer Transactions Inquiry');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' .
- _('Transaction Inquiry') . '" alt="" />' . ' ' . _('Transaction Inquiry') . '</p>';
-echo '<div class="page_help_text">' . _('Choose which type of transaction to report on.') . '</div><br>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Transaction Inquiry') . '" alt="" />' . ' ' . _('Transaction Inquiry') . '</p>';
+echo '<div class="page_help_text">' . _('Choose which type of transaction to report on.') . '</div>
+ <br />';
-echo "<form action='" . $_SERVER['PHP_SELF'] . "' method=post>";
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding=2 class=selection><tr>';
-echo '<td>' . _('Type') . ":</td><td><select tabindex=1 name='TransType'> ";
+echo '<td>' . _('Type') . ':</td>
+ <td><select tabindex="1" name="TransType"> ';
-$sql = 'SELECT typeid, typename FROM systypes WHERE typeid >= 10 AND typeid <= 14';
+$sql = "SELECT typeid,
+ typename
+ FROM systypes
+ WHERE typeid >= 10
+ AND typeid <= 14";
+
$resultTypes = DB_query($sql,$db);
-echo "<option Value='All'> All";
+echo '<option value="All">' . _('All') . '</option>';
while ($myrow=DB_fetch_array($resultTypes)){
if (isset($_POST['TransType'])){
if ($myrow['typeid'] == $_POST['TransType']){
- echo "<option selected Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
+ echo '<option selected value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
} else {
- echo "<option Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
+ echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
}
} else {
echo "<option Value='" . $myrow['typeid'] . "'>" . $myrow['typename'];
@@ -46,7 +49,7 @@
echo '<td>' . _('From') . ':</td><td><input tabindex="2" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="TEXT" name="FromDate" maxlength="10" size="11" VALUE="' . $_POST['FromDate'] . '"></td>';
echo '<td>' . _('To') . ':</td><td><input tabindex="3" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="TEXT" name="ToDate" maxlength="10" size="11" VALUE="' . $_POST['ToDate'] . '"></td>';
-echo "</tr></table><br><div class='centre'><input tabindex=4 type=submit name='ShowResults' VALUE='" . _('Show Transactions') . "'>";
+echo "</tr></table><br /><div class='centre'><input tabindex=4 type=submit name='ShowResults' VALUE='" . _('Show Transactions') . "'>";
echo '</form></div>';
@@ -79,7 +82,7 @@
$DbgMsg = _('The SQL that failed was');
$TransResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
- echo '<br><table cellpadding=2 class=selection>';
+ echo '<br /><table cellpadding=2 class=selection>';
$tableheader = "<tr>
<th>" . _('Type') . "</th>
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-06-17 09:16:37 UTC (rev 4597)
+++ trunk/DeliveryDetails.php 2011-06-18 04:55:08 UTC (rev 4598)
@@ -797,34 +797,34 @@
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'info');
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo;
-echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</p>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo . '<br />';
+echo '</b> ' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></p>';
+
+
echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Display the order with or without discount depending on access level*/
if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
-
- echo '<div class="centre"><b>';
-
+
+ echo '<table cellpading=2 colspan=7>';
+
if ($_SESSION['Items'.$identifier]->Quotation==1){
- echo _('Quotation Summary');
+ echo '<tr><th colspan=7>'._('Quotation Summary').'</th></tr>';
} else {
- echo _('Order Summary');
+ echo '<tr><th colspan=7>'._('Order Summary').'</th></tr>';
}
- echo '</b></div>
- <table cellpading=2 colspan=7>
- <Tr>
- <th>'. _('Item Code') .'</th>
- <th>'. _('Item Description') .'</th>
- <th>'. _('Quantity') .'</th>
- <th>'. _('Unit') .'</th>
- <th>'. _('Price') .'</th>
- <th>'. _('Discount') .' %</th>
- <th>'. _('Total') .'</th>
- </tr>';
+ echo '<tr>
+ <th>'. _('Item Code') .'</th>
+ <th>'. _('Item Description') .'</th>
+ <th>'. _('Quantity') .'</th>
+ <th>'. _('Unit') .'</th>
+ <th>'. _('Price') .'</th>
+ <th>'. _('Discount') .' %</th>
+ <th>'. _('Total') .'</th>
+ </tr>';
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
@@ -834,8 +834,8 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineTotal = $StockItem->Quantity * $StockItem->Price * (1 - $StockItem->DiscountPercent);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($StockItem->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($StockItem->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayQuantity = number_format($StockItem->Quantity,$StockItem->DecimalPlaces);
$DisplayDiscount = number_format(($StockItem->DiscountPercent * 100),2);
@@ -872,9 +872,9 @@
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
echo '<br /><table><tr class="EvenTableRows">
<td>'. _('Total Weight') .':</td>
- <td>'.$DisplayWeight.'</td>
+ <td class="number">'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
- <td>'.$DisplayVolume.'</td>
+ <td class="number">'.$DisplayVolume.'</td>
</tr></table>';
} else {
@@ -897,8 +897,8 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineTotal = $StockItem->Quantity * $StockItem->Price * (1 - $StockItem->DiscountPercent);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($StockItem->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($StockItem->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayQuantity = number_format($StockItem->Quantity,$StockItem->DecimalPlaces);
if ($k==1){
@@ -921,7 +921,7 @@
}
- $DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
+ $DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
echo '<table class=selection><tr>
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight .'</td>
@@ -958,11 +958,11 @@
$StkLocsResult = DB_query("SELECT locationname,loccode
FROM locations",$db, $ErrMsg, $DbgMsg);
-while ($myrow=DB_fetch_row($StkLocsResult)){
- if ($_SESSION['Items'.$identifier]->Location==$myrow[1]){
- echo '<option selected value="' . $myrow[1] . '">' . $myrow[0] . '</option>';
+while ($myrow=DB_fetch_array($StkLocsResult)){
+ if ($_SESSION['Items'.$identifier]->Location==$myrow['loccode']){
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="'.$myrow[1].'">'.$myrow[0] . '</option>';
+ echo '<option value="'.$myrow['loccode'].'">'.$myrow['locationname'] . '</option>';
}
}
@@ -982,32 +982,32 @@
// The estimated Dispatch date or Delivery date for this order
echo '<tr>
<td>'. _('Estimated Delivery Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
</tr>';
// The date when a quote was issued to the customer
echo '<tr>
<td>'. _('Quote Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
</tr>';
// The date when the customer confirmed their order
echo '<tr>
<td>'. _('Confirmed Order Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="Text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
</tr>';
...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-17 09:16:47
|
Revision: 4597
http://web-erp.svn.sourceforge.net/web-erp/?rev=4597&view=rev
Author: daintree
Date: 2011-06-17 09:16:37 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
consistency
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CounterSales.php
trunk/CustomerInquiry.php
trunk/Customers.php
trunk/MRPPlannedWorkOrders.php
trunk/SelectContract.php
trunk/SelectCustomer.php
trunk/StockLocTransfer.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualARInquiries.html
trunk/doc/Manual/ManualARReports.html
trunk/doc/Manual/ManualARTransactions.html
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/doc/Manual/ManualCreditStatus.html
trunk/doc/Manual/ManualCurrencies.html
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualHeader.html
trunk/doc/Manual/ManualIntroduction.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualMRP.html
trunk/doc/Manual/ManualManufacturing.html
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/ManualPaymentTerms.html
trunk/doc/Manual/ManualPettyCash.html
trunk/doc/Manual/ManualPrices.html
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/doc/Manual/ManualReportBuilder.html
trunk/doc/Manual/ManualRequirements.html
trunk/doc/Manual/ManualSalesAnalysis.html
trunk/doc/Manual/ManualSalesOrders.html
trunk/doc/Manual/ManualSalesPeople.html
trunk/doc/Manual/ManualSalesTypes.html
trunk/doc/Manual/ManualSecuritySchema.html
trunk/doc/Manual/ManualShipments.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/doc/Manual/ManualSystemConventions.html
trunk/doc/Manual/ManualTax.html
trunk/includes/ConnectDB.inc
Added Paths:
-----------
trunk/doc/Manual/images/AccountsPayable.jpg
trunk/doc/Manual/images/BankReconciliation.jpg
trunk/doc/Manual/images/GLIntegration.jpg
trunk/doc/Manual/images/Purchasing.jpg
trunk/doc/Manual/images/Sales.jpg
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AccountGroups.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -53,10 +53,10 @@
FROM accountgroups WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
- $ErrMsg = _('Could not check whether the group exists because');
+ $ErrMsg = _('Could not check whether the group exists because');
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
- $myrow=DB_fetch_row($result);
+ $myrow=DB_fetch_row($result);
if ($myrow[0]!=0 and $_POST['SelectedAccountGroup']=='') {
$InputError = 1;
@@ -362,7 +362,7 @@
<td><select tabindex="3" ' . (in_array('SectionInAccounts',$Errors) ? 'class="selecterror"' : '' ) .
' name="SectionInAccounts">';
- $sql = 'SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid';
+ $sql = "SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid";
$secresult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
while( $secrow = DB_fetch_array($secresult) ) {
if ($_POST['SectionInAccounts']==$secrow['sectionid']) {
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AccountSections.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -172,7 +172,8 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
echo '<table name="SectionList" class="selection">
<tr>
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerContacts.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -17,16 +17,16 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo "<a href='" . $rootpath . '/Customers.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Customers') . '</a><br />';
+echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $DebtorNo .'">' . _('Back to Customers') . '</a><br />';
$SQLname="SELECT name FROM debtorsmaster where debtorno='" .$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . _('Contacts for Customer: <b>') .$row['name'].'</p><br />';
+ '" alt="" />' . ' ' . _('Contacts for Customer:') . ' <b>' . $row['name'].'</b></p><br />';
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . _('Edit contact for <b>') .$row['name'].'</p><br />';
+ '" alt="" />' . ' ' . _('Edit contact for') . '<b>' . $row['name'].'</b></p><br />';
}
if ( isset($_POST['submit']) ) {
@@ -39,34 +39,40 @@
if (isset($_POST['Con_ID']) and !is_long((integer)$_POST['Con_ID'])) {
$InputError = 1;
prnMsg( _('The Contact ID must be an integer.'), 'error');
- } elseif (strlen($_POST['conName']) >40) {
+ } elseif (strlen($_POST['ContactName']) >40) {
$InputError = 1;
prnMsg( _('The contact name must be forty characters or less long'), 'error');
- } elseif( trim($_POST['conName']) == '' ) {
+ } elseif( trim($_POST['ContactName']) == '' ) {
$InputError = 1;
prnMsg( _('The contact name may not be empty'), 'error');
+ }elseif (!IsEmailAddress($_POST['ContactEmail']) AND strlen($_POST['ContactEmail'])>0){
+ $InputError = 1;
+ prnMsg( _('The contact email address is not a valid email address'), 'error');
}
-
if (isset($Id) and ($Id and $InputError !=1)) {
- $sql = "UPDATE custcontacts SET
- contactname='" . $_POST['conName'] . "',
- role='" . $_POST['conRole'] . "',
- phoneno='" . $_POST['conPhone'] . "',
- notes='" . $_POST['conNotes'] . "'
- WHERE debtorno ='".$DebtorNo."'
- AND contid='".$Id."'";
+ $sql = "UPDATE custcontacts SET contactname='" . $_POST['ContactName'] . "',
+ role='" . $_POST['ContactRole'] . "',
+ phoneno='" . $_POST['ContactPhone'] . "',
+ notes='" . $_POST['ContactNotes'] . "',
+ email='" . $_POST['ContactEmail'] . "'
+ WHERE debtorno ='".$DebtorNo."'
+ AND contid='".$Id."'";
$msg = _('Customer Contacts') . ' ' . $DebtorNo . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO custcontacts (debtorno,contactname,role,phoneno,notes)
- VALUES (
- '" . $DebtorNo. "',
- '" . $_POST['conName'] . "',
- '" . $_POST['conRole'] . "',
- '" . $_POST['conPhone'] . "',
- '" . $_POST['conNotes'] . "'
- )";
+ $sql = "INSERT INTO custcontacts (debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email)
+ VALUES ('" . $DebtorNo. "',
+ '" . $_POST['ContactName'] . "',
+ '" . $_POST['ContactRole'] . "',
+ '" . $_POST['ContactPhone'] . "',
+ '" . $_POST['ContactNotes'] . "',
+ '" . $_POST['ContactEmail'] . "')";
$msg = _('The contact record has been added');
}
@@ -78,40 +84,51 @@
prnMsg($msg, 'success');
echo '<br />';
unset($Id);
- unset($_POST['conName']);
- unset($_POST['conRole']);
- unset($_POST['conPhone']);
- unset($_POST['conNotes']);
+ unset($_POST['ContactName']);
+ unset($_POST['ContactRole']);
+ unset($_POST['ContactPhone']);
+ unset($_POST['ContactNotes']);
+ unset($_POST['ContactEmail']);
unset($_POST['Con_ID']);
}
- } elseif (isset($_GET['delete']) and $_GET['delete']) {
+} elseif (isset($_GET['delete']) and $_GET['delete']) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM custcontacts WHERE contid=".$Id."
- and debtorno='".$DebtorNo."'";
+ $sql="DELETE FROM custcontacts
+ WHERE contid='" . $Id . "'
+ AND debtorno='" . $DebtorNo . "'";
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
- echo '<br />';
- prnMsg( _('The contact record has been deleted'), 'success');
- unset($Id);
- unset($_GET['delete']);
+ echo '<br />';
+ prnMsg( _('The contact record has been deleted'), 'success');
+ unset($Id);
+ unset($_GET['delete']);
- }
+}
if (!isset($Id)) {
- $sql = "SELECT * FROM custcontacts where debtorno='".$DebtorNo."' ORDER BY contid";
+ $sql = "SELECT contid,
+ debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email
+ FROM custcontacts
+ WHERE debtorno='".$DebtorNo."'
+ ORDER BY contid";
$result = DB_query($sql,$db);
//echo '<br />'.$sql;
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Name') . '</th>
<th>' . _('Role') . '</th>
<th>' . _('Phone no') . '</th>
+ <th>' . _('Email') . '</th>
<th>' . _('Notes') . '</th>';
$k=0; //row colour counter
@@ -127,83 +144,102 @@
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td><a href=mailto:%s>%s</a></td>
<td>%s</td>
<td><a href="%sId=%s&DebtorNo=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorNo=%s&delete=1">'. _('Delete'). '</td></tr>',
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
- $myrow[0],
- $myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
- $myrow[0],
- $myrow[1]);
+ <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</td></tr>',
+ $myrow['contactname'],
+ $myrow['role'],
+ $myrow['phoneno'],
+ $myrow['email'],
+ $myrow['email'],
+ $myrow['notes'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['contid'],
+ $myrow['debtorno'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['contid'],
+ $myrow['debtorno']);
}
//END WHILE LIST LOOP
echo '</table>';
}
-if (isset($Id)) { ?>
- <div class="centre"><a href="<?php echo $_SERVER['PHP_SELF'] . '?' . SID .'&DebtorNo='.$DebtorNo;?>"><?=_('Review all contacts for this Customer')?></a></div>
-<?php } ?>
-<p>
+if (isset($Id)) {
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo .'">' . _('Review all contacts for this Customer') . '</a></div>';
+}
-<?php
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
- //editing an existing Shipper
- $sql = "SELECT * FROM custcontacts WHERE contid='".$Id."'
- and debtorno='".$DebtorNo."'";
+ $sql = "SELECT contid,
+ debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email
+ FROM custcontacts
+ WHERE contid='".$Id."'
+ AND debtorno='".$DebtorNo."'";
$result = DB_query($sql, $db);
- //echo '<br />'.$sql;
-
$myrow = DB_fetch_array($result);
$_POST['Con_ID'] = $myrow['contid'];
- $_POST['conName'] = $myrow['contactname'];
- $_POST['conRole'] = $myrow['role'];
- $_POST['conPhone'] = $myrow['phoneno'];
- $_POST['conNotes'] = $myrow['notes'];
- $_POST['debtorno'] = $myrow['debtorno'];
+ $_POST['ContactName'] = $myrow['contactname'];
+ $_POST['ContactRole'] = $myrow['role'];
+ $_POST['ContactPhone'] = $myrow['phoneno'];
+ $_POST['ContactNotes'] = $myrow['notes'];
+ $_POST['ContactEmail'] = $myrow['email'];
+ $_POST['DebtorNo'] = $myrow['debtorno'];
echo '<input type=hidden name="Id" value='. $Id .'>';
echo '<input type=hidden name="Con_ID" value=' . $_POST['Con_ID'] . '>';
- echo '<input type=hidden name="DebtorNo" value=' . $_POST['debtorno'] . '>';
- echo '<table class=selection><tr><td>'. _('Contact Code').':</td><td>' . $_POST['Con_ID'] . '</td></tr>';
+ echo '<input type=hidden name="DebtorNo" value=' . $_POST['DebtorNo'] . '>';
+ echo '<br />
+ <table class="selection">
+ <tr>
+ <td>'. _('Contact Code').':</td>
+ <td>' . $_POST['Con_ID'] . '</td>
+ </tr>';
} else {
- echo '<table class=selection>';
+ echo '<br />
+ <table class="selection">';
}
echo '<tr><td>'. _('Contact Name') . '</td>';
- if (isset($_POST['conName'])) {
- echo '<td><input type="Text" name="conName" value="' . $_POST['conName']. '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactName'])) {
+ echo '<td><input type="text" name="ContactName" value="' . $_POST['ContactName']. '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="Text" name="conName" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactName" size=35 maxlength=40></td></tr>';
}
echo '<tr><td>' . _('Role') . '</td>';
- if (isset($_POST['conRole'])) {
- echo '<td><input type="text" name="conRole" value="'. $_POST['conRole']. '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactRole'])) {
+ echo '<td><input type="text" name="ContactRole" value="'. $_POST['ContactRole']. '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="text" name="conRole" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactRole" size=35 maxlength=40></td></tr>';
}
echo '<tr><td>' . _('Phone') . '</td>';
- if (isset($_POST['conPhone'])) {
- echo '<td><input type="Text" name="conPhone" value="' . $_POST['conPhone'] . '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactPhone'])) {
+ echo '<td><input type="text" name="ContactPhone" value="' . $_POST['ContactPhone'] . '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="Text" name="conPhone"" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactPhone" size=35 maxlength=40></td></tr>';
}
+ echo '<tr><td>' . _('Email') . '</td>';
+ if (isset($_POST['ContactEmail'])) {
+ echo '<td><input type="text" name="ContactEmail" value="' . $_POST['ContactEmail'] . '" size=55 maxlength="55"></td></tr>';
+ } else {
+ echo '<td><input type="text" name="ContactEmail" size="55" maxlength="55"></td></tr>';
+ }
echo '<tr><td>' . _('Notes') . '</td>';
- if (isset($_POST['conNotes'])) {
- echo '<td><textarea name="conNotes">'. $_POST['conNotes'] . '</textarea>';
+ if (isset($_POST['ContactNotes'])) {
+ echo '<td><textarea name="ContactNotes">'. $_POST['ContactNotes'] . '</textarea>';
} else {
- echo '<td><textarea name="conNotes"></textarea>';
+ echo '<td><textarea name="ContactNotes"></textarea>';
}
echo '<tr><td colspan=2><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '"></div></td></tr>';
echo '</table>';
@@ -212,4 +248,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerNotes.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -1,7 +1,7 @@
<?php
-/* $Revision: 1.4 $ */
+
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Notes');
include('includes/header.inc');
@@ -17,7 +17,8 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Select Customer') . '</a><br>';
+
+echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Select Customer') . '</a><br />';
if ( isset($_POST['submit']) ) {
//initialise no input errors assumed initially before we test
@@ -49,22 +50,24 @@
$msg = _('Customer Notes') . ' ' . $DebtorNo . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO custnotes (debtorno,href,note,date,priority)
- VALUES (
- '" . $DebtorNo. "',
- '" . $_POST['href'] . "',
- '" . $_POST['note'] . "',
- '" . FormatDateForSQL($_POST['date']) . "',
- '" . $_POST['priority'] . "'
- )";
+ $sql = "INSERT INTO custnotes (debtorno,
+ href,
+ note,
+ date,
+ priority)
+ VALUES ('" . $DebtorNo. "',
+ '" . $_POST['href'] . "',
+ '" . $_POST['note'] . "',
+ '" . FormatDateForSQL($_POST['date']) . "',
+ '" . $_POST['priority'] . "')";
$msg = _('The contact notes record has been added');
}
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg($msg, 'success');
unset($Id);
unset($_POST['note']);
@@ -78,28 +81,32 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM custnotes WHERE noteid='".$Id."'
- and debtorno='".$DebtorNo."'";
- $result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ $sql="DELETE FROM custnotes
+ WHERE noteid='".$Id."'
+ AND debtorno='".$DebtorNo."'";
+ $result = DB_query($sql,$db);
+ //echo '<br />'.$sql;
- echo '<br>';
- prnMsg( _('The contact note record has been deleted'), 'success');
- unset($Id);
- unset($_GET['delete']);
+ echo '<br />';
+ prnMsg( _('The contact note record has been deleted'), 'success');
+ unset($Id);
+ unset($_GET['delete']);
+}
- }
-
if (!isset($Id)) {
- $SQLname="SELECT * from debtorsmaster where debtorno='".$DebtorNo."'";
+ $SQLname="SELECT * FROM debtorsmaster
+ WHERE debtorno='".$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p><br />';
+ '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
+ <br />';
- $sql = "SELECT * FROM custnotes where debtorno='".$DebtorNo."' ORDER BY date DESC";
+ $sql = "SELECT * FROM custnotes
+ WHERE debtorno='".$DebtorNo."'
+ ORDER BY date DESC";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
echo '<table class=selection>';
echo '<tr>
@@ -128,10 +135,10 @@
$myrow[3],
$myrow[2],
$myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1]);
@@ -140,9 +147,9 @@
echo '</table>';
}
if (isset($Id)) {
- echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?' . SID .'&DebtorNo='.$DebtorNo.'"><?='._('Review all notes for this Customer').'</a></div>';
+ echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">'._('Review all notes for this Customer').'</a></div>';
}
-echo '<p>';
+echo '<br />';
if (!isset($_GET['delete'])) {
@@ -156,7 +163,6 @@
and debtorno='".$DebtorNo."'";
$result = DB_query($sql, $db);
- //echo '<br>'.$sql;
$myrow = DB_fetch_array($result);
@@ -169,9 +175,13 @@
echo '<input type=hidden name="Id" value='. $Id .'>';
echo '<input type=hidden name="Con_ID" value=' . $_POST['noteid'] . '>';
echo '<input type=hidden name="DebtorNo" value=' . $_POST['debtorno'] . '>';
- echo '<table class=selection><tr><td>'. _('Note ID').':</td><td>' . $_POST['noteid'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Note ID').':</td>
+ <td>' . $_POST['noteid'] . '</td>
+ </tr>';
} else {
- echo '<table class=selection>';
+ echo '<table class="selection">';
}
echo '<tr><td>' . _('Contact Note'). '</td>';
@@ -188,15 +198,15 @@
}
echo '<tr><td>' . _('Date') .'</td>';
if (isset($_POST['date'])) {
- echo '<td><input type="Text" name="date" value="'.ConvertSQLDate($_POST['date']).'" size=10 maxlength=10></td></tr>';
+ echo '<td><input type="text" name="date" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['date']).'" size=10 maxlength=10></td></tr>';
} else {
- echo '<td><input type="Text" name="date" size=10 maxlength=10></td></tr>';
+ echo '<td><input type="text" name="date" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" size=10 maxlength=10></td></tr>';
}
echo '<tr><td>'. _('Priority'). '</td>';
if (isset($_POST['priority'])) {
echo '<td><input type="Text" name="priority" value="' .$_POST['priority']. '" size=1 maxlength=3></td></td>';
} else {
- echo '<td><input type="Text" name="priority" size=1 maxlength=3></td></td>';
+ echo '<td><input type="text" name="priority" size=1 maxlength=3></td></td>';
}
echo '<tr><td colspan=2><div class="centre"><input type="Submit" name="submit" value="'._('Enter Information').'"></div></td></tr>';
echo '</table>';
@@ -206,4 +216,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerTypeNotes.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.3 $ */
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Type (Group) Notes');
include('includes/header.inc');
@@ -17,8 +16,8 @@
} elseif (isset($_GET['DebtorType'])){
$DebtorType = $_GET['DebtorType'];
}
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorType='.$DebtorType."'>" . _('Back to Select Customer') . '</a><br>';
-if ( isset($_POST['submit']) ) {
+echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorType='.$DebtorType.'">' . _('Back to Select Customer') . '</a><br />';
+if (isset($_POST['submit']) ) {
//initialise no input errors assumed initially before we test
$InputError = 0;
@@ -28,10 +27,10 @@
//first off validate inputs sensible
if (!is_long((integer)$_POST['priority'])) {
$InputError = 1;
- prnMsg( _('The Contact priority must be an integer.'), 'error');
+ prnMsg(_('The Contact priority must be an integer.'), 'error');
} elseif (strlen($_POST['note']) >200) {
$InputError = 1;
- prnMsg( _("The contact's notes must be two hundred characters or less long"), 'error');
+ prnMsg(_("The contact's notes must be two hundred characters or less long"), 'error');
} elseif( trim($_POST['note']) == '' ) {
$InputError = 1;
prnMsg( _("The contact's notes may not be empty"), 'error');
@@ -40,31 +39,32 @@
if ($Id AND $InputError !=1) {
$sql = "UPDATE debtortypenotes SET
- note='" . $_POST['note'] . "',
- date='" . $_POST['date'] . "',
- href='" . $_POST['href'] . "',
- priority='" . $_POST['priority'] . "'
- WHERE typeid ='".$DebtorType."'
- AND noteid='".$Id."'";
+ note='" . $_POST['note'] . "',
+ date='" . $_POST['date'] . "',
+ href='" . $_POST['href'] . "',
+ priority='" . $_POST['priority'] . "'
+ WHERE typeid ='".$DebtorType."'
+ AND noteid='".$Id."'";
$msg = _('Customer Group Notes') . ' ' . $DebtorType . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO debtortypenotes (typeid,href,note,date,priority)
- VALUES (
- '" . $DebtorType. "',
- '" . $_POST['href'] . "',
- '" . $_POST['note'] . "',
- '" . $_POST['date'] . "',
- '" . $_POST['priority'] . "'
- )";
+ $sql = "INSERT INTO debtortypenotes (typeid,
+ href,
+ note,
+ date,
+ priority)
+ VALUES ('" . $DebtorType. "',
+ '" . $_POST['href'] . "',
+ '" . $_POST['note'] . "',
+ '" . $_POST['date'] . "',
+ '" . $_POST['priority'] . "')";
$msg = _('The contact group notes record has been added');
}
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg($msg, 'success');
unset($Id);
unset($_POST['note']);
@@ -75,12 +75,13 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM debtortypenotes WHERE noteid='".$Id."'
- and typeid='".$DebtorType."'";
+ $sql="DELETE FROM debtortypenotes
+ WHERE noteid='".$Id."'
+ AND typeid='".$DebtorType."'";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg( _('The contact group note record has been deleted'), 'success');
unset($Id);
unset($_GET['delete']);
@@ -97,9 +98,8 @@
$sql = "SELECT * FROM debtortypenotes where typeid='".$DebtorType."' ORDER BY date DESC";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Date') . '</th>
<th>' . _('Note') . '</th>
@@ -121,15 +121,15 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sId=%s&DebtorType=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorType=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this customer type note?') . '\');">'. _('Delete'). '</td></tr>',
$myrow[4],
$myrow[3],
$myrow[2],
$myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1]);
@@ -145,7 +145,7 @@
<?php
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DebtorType='.$DebtorType.'">';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorType='.$DebtorType.'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -155,7 +155,6 @@
and typeid='".$DebtorType."'";
$result = DB_query($sql, $db);
- //echo '<br>'.$sql;
$myrow = DB_fetch_array($result);
@@ -189,7 +188,7 @@
echo '<tr><td>'. _('Priority').':</td>';
echo '<td><input type="Text" name="priority" value="'. $_POST['priority'].'" size=1 maxlength=3></td></td>
</table>';
- echo '<br><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information').'"></div>';
+ echo '<br /><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information').'"></div>';
echo '</form>';
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AgedDebtors.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -80,7 +80,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -154,7 +154,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -243,7 +243,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -269,7 +269,7 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
- echo '<p>' . _('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db);
+ prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
@@ -368,10 +368,10 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
- echo '<br /><br />' . _('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db);
+ prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . _('The SQL that failed was') . '<p>' . $sql;
+ echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -483,13 +483,12 @@
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$result=DB_query($sql,$db);
- echo '<option value=""></option>';
+ echo '<option value="">' . _('All Sales people') . '</option>';
while ($myrow=DB_fetch_array($result)){
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td></tr>';
-
echo '<tr><td>' . _('Only show customers trading in') . ':' . '</td>
<td><select tabindex="5" name="Currency">';
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AgedSuppliers.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -2,9 +2,6 @@
/* $Id$*/
-/* $Revision: 1.13 $ */
-
-//$PageSecurity = 2;
include('includes/session.inc');
If (isset($_POST['PrintPDF'])
@@ -24,78 +21,83 @@
/*Now figure out the aged analysis for the Supplier range under review */
if ($_POST['All_Or_Overdues']=='All'){
- $SQL = "SELECT suppliers.supplierid, suppliers.suppname, currencies.currency, paymentterms.terms,
- SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS due,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue1,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue2
- FROM suppliers, paymentterms, currencies, supptrans WHERE suppliers.paymentterms = paymentterms.termsindicator
- AND suppliers.currcode = currencies.currabrev
- AND suppliers.supplierid = supptrans.supplierno
- AND suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
- AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
- AND suppliers.currcode ='" . $_POST['Currency'] . "'
- GROUP BY suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth
- HAVING Sum(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <>0";
-
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS due,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue1,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue2
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
+ AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.currcode ='" . $_POST['Currency'] . "'
+ GROUP BY suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth
+ HAVING SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <>0";
+
} else {
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS due,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue1,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue2
- FROM suppliers,
- paymentterms,
- currencies,
- supptrans
- WHERE suppliers.paymentterms = paymentterms.termsindicator
- AND suppliers.currcode = currencies.currabrev
- and suppliers.supplierid = supptrans.supplierno
- AND suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
- AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
- AND suppliers.currcode ='" . $_POST['Currency'] . "'
- GROUP BY suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth
- HAVING Sum(IF (paymentterms.daysbeforedue > 0,
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS due,
+ Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue1,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue2
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
+ AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.currcode ='" . $_POST['Currency'] . "'
+ GROUP BY suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth
+ HAVING Sum(IF (paymentterms.daysbeforedue > 0,
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
}
@@ -103,11 +105,11 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
- include("includes/header.inc");
+ include('includes/header.inc');
prnMsg(_('The Supplier details 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;
@@ -186,10 +188,10 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Supplier Account Analysis - Problem Report');
include('includes/header.inc');
- echo '<br>' . _('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db);
- echo "<br><a href='$rootpath/index.php'>" . _('Back to the menu') . '</a>';
+ prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . _('The SQL that failed was') . '<br>' . $sql;
+ echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -250,22 +252,11 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos ,220, $YPos);
-/* UldisN : this doesn't work for TCPDF
- $buf = $pdf->output();
- $len = strlen($buf);
- header('Content-type: application/pdf');
- header("Content-Length: $len");
- header('Content-Disposition: inline; filename=AgedSuppliers.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $pdf->stream();
-*/
if ($ListCount == 0) {
- prnMsg('there are no results so the PDF is empty');
+ prnMsg('There are no results so the PDF is empty');
} else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');
}
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
@@ -280,46 +271,47 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo "<form sction='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method='POST'><table>";
+ echo '<form sction="' . $_SERVER['PHP_SELF'] . '" method="post">
+ <table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('From Supplier Code') . ":</font></td>
- <td><input tabindex='1' type=text maxlength=6 size=7 name=FromCriteria value='1'></td>
- </tr>";
- echo '<tr><td>' . _('To Supplier Code') . ":</td>
- <td><input tabindex='2' Type=text maxlength=6 size=7 name=ToCriteria value='zzzzzz'></td>
- </tr>";
+ echo '<tr><td>' . _('From Supplier Code') . ':</font></td>
+ <td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1"></td>
+ </tr>';
+ echo '<tr><td>' . _('To Supplier Code') . ':</td>
+ <td><input tabindex="2" type="text" maxlength="6" size="7" name="ToCriteria" value="zzzzzz"></td>
+ </tr>';
- echo '<tr><td>' . _('All balances or overdues only') . ':' . "</td>
- <td><select tabindex='3' name='All_Or_Overdues'>";
- echo "<option selected value='All'>" . _('All suppliers with balances');
- echo "<option value='OverduesOnly'>" . _('Overdue accounts only');
+ echo '<tr><td>' . _('All balances or overdues only') . ':' . '</td>
+ <td><select tabindex="3" name="All_Or_Overdues">';
+ echo '<option selected value="All">' . _('All suppliers with balances') . '</option>';
+ echo '<option value="OverduesOnly">' . _('Overdue accounts only') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('For suppliers trading in') . ':' . "</td>
- <td><select tabindex='4' name='Currency'>";
+ echo '<tr><td>' . _('For suppliers trading in') . ':' . '</td>
+ <td><select tabindex="4" name="Currency">';
- $sql = 'SELECT currency, currabrev FROM currencies';
+ $sql = "SELECT currency, currabrev FROM currencies";
$result=DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)){
if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
- 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>';
}
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Summary or Detailed Report') . ':' . "</td>
- <td><select tabindex='5' name='DetailedReport'>";
- echo "<option selected value='No'>" . _('Summary Report');
- echo "<option value='Yes'>" . _('Detailed Report');
+ echo '<tr><td>' . _('Summary or Detailed Report') . ':' . '</td>
+ <td><select tabindex="5" name="DetailedReport">';
+ echo '<option selected value="No">' . _('Summary Report') . '</option>';
+ echo '<option value="Yes">' . _('Detailed Report') . '</option>';
echo '</select></td></tr>';
- echo '</table><br><div class="centre"><input tabindex="6" type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
+ echo '</table><br /><div class="centre"><input tabindex="6" type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/BOMExtendedQty.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -2,8 +2,8 @@
/* $Id$*/
-// BOMExtendedQty.php - Quantiy Extended Bill of Materials
-//$PageSecurity = 2;
+// BOMExtendedQty.php - Quantity Extended Bill of Materials
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -15,24 +15,21 @@
$PageNumber=1;
$line_height=12;
- if (!$_POST['Quantity'] || !is_numeric($_POST['Quantity'])) {
+ if (!$_POST['Quantity'] OR !is_numeric($_POST['Quantity'])) {
$_POST['Quantity'] = 1;
}
- $sql = 'DROP TABLE IF EXISTS tempbom';
- $result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom';
- $result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom2';
- $result = DB_query($sql,$db);
- $sql = 'CREATE TEMPORARY TABLE passbom (
+ $result = DB_query("DROP TABLE IF EXISTS tempbom",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom2",$db);
+ $sql = "CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa double,
- 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 (
+ $sql = "CREATE TEMPORARY TABLE tempbom (
parent char(20),
component char(20),
sortpart text,
@@ -41,7 +38,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double) DEFAULT CHARSET=utf8';
+ 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
@@ -59,8 +56,8 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $levelctr = 2;
- // $levelctr is the level counter
+ $LevelCounter = 2;
+ // $LevelCounter is the level counter
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -74,7 +71,7 @@
SELECT bom.parent,
bom.component,
CONCAT(bom.parent,bom.component) AS sortpart,"
- . $levelctr . " as level,
+ . $LevelCounter . " as level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -86,13 +83,13 @@
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
+ // This while routine finds the other levels as long as $ComponentCounter - the
// component counter finds there are more components that are used as
// assemblies at lower levels
- $componentctr = 1;
- while ($componentctr > 0) {
- $levelctr++;
+ $ComponentCounter = 1;
+ while ($ComponentCounter > 0) {
+ $LevelCounter++;
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -106,7 +103,7 @@
SELECT bom.parent,
bom.component,
CONCAT(passbom.sortpart,bom.component) AS sortpart,
- $levelctr as level,
+ " . $LevelCounter . " as level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -118,22 +115,15 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom2';
- $result = DB_query($sql,$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom2",$db);
+ $result = DB_query("ALTER TABLE passbom RENAME AS passbom2",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom",$db);
- $sql = 'ALTER TABLE passbom RENAME AS passbom2';
+ $sql = "CREATE TEMPORARY TABLE passbom (part char(20),
+ extendedqpa decimal(10,3),
+ sortpart text) DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom';
- $result = DB_query($sql,$db);
-
- $sql = 'CREATE TEMPORARY TABLE passbom (
- part char(20),
- extendedqpa decimal(10,3),
- sortpart text) DEFAULT CHARSET=utf8';
- $result = DB_query($sql,$db);
-
-
$sql = "INSERT INTO passbom (part, extendedqpa, sortpart)
SELECT bom.component AS part,
(bom.quantity * passbom2.extendedqpa),
@@ -145,15 +135,15 @@
$result = DB_query($sql,$db);
- $sql = 'SELECT COUNT(*) FROM bom, passbom
+ $sql = "SELECT COUNT(*) FROM bom, passbom
WHERE bom.parent = passbom.part
- GROUP BY passbom.part';
+ GROUP BY passbom.part";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- $componentctr = $myrow[0];
+ $ComponentCounter = $myrow[0];
- } // End of while $componentctr > 0
+ } // End of while $ComponentCounter > 0
if (DB_error_no($db) !=0) {
$title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
@@ -167,9 +157,8 @@
exit;
}
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
- $sql = "SELECT stockmaster.stockid,stockmaster.description
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
+ $sql = "SELECT stockid,description
FROM stockmaster
WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
@@ -181,7 +170,7 @@
$Tot_Val=0;
$fill = false;
$pdf->SetFillColor(224,235,255);
- $sql = 'SELECT tempbom.component,
+ $sql = "SELECT tempbom.component,
SUM(tempbom.quantity) as quantity,
stockmaster.description,
stockmaster.decimalplaces,
@@ -207,10 +196,10 @@
GROUP BY tempbom.component,
stockmaster.description,
stockmaster.decimalplaces,
- stockmaster.mbflag';
+ stockmaster.mbflag";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result); // UldisN
- While ($myrow = DB_fetch_array($result,$db)){
+ $ListCount = DB_num_rows($result);
+ 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
@@ -239,8 +228,7 @@
$myrow['decimalplaces']),'right',0,$fill);
}
if ($YPos < $Bottom_Margin + $line_height){
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
}
} /*end while loop */
@@ -249,14 +237,13 @@
$YPos -= (2*$line_height);
if ($YPos < $Bottom_Margin + $line_height){
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
}
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>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -271,19 +258,29 @@
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><td><input type ='text' name='Part' size='20'>";
- echo '<tr><td>' . _('Quantity') . ":</td><td><input type='text' class=number name='Quantity' size='4'>";
- echo '<tr><td>' . _('Selection Option') . ":</td><td><select name='Select'>";
- echo "<option selected value='All'>" . _('Show All Parts');
- echo "<option value='Shortages'>" . _('Only Show Shortages');
- echo '</select></td></tr>';
- echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
- 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 '<tr><td>' . _('Part') . ':</td>
+ <td><input type ="text" name="Part" size="20">';
+ echo '<tr><td>' . _('Quantity') . ':</td>
+ <td><input type="text" class="number" name="Quantity" size="4"></td></tr>';
+
+ echo '<tr><td>' . _('Selection Option') . ':</td>
+ <td><select name="Select">
+ <option selected value="All">' . _('Show All Parts') . '</option>
+ <option value="Shortages">' . _('Only Show Shortages') . '</option>
+ </select></td></tr>';
+ echo '<tr><td>' . _('Print Option') . ':</td>
+ <td><select name="Fill">
+ <option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>
+ <option value="no">' . _('Plain Print') . '</option>
+ </select></td></tr>';
+ echo '</table>
+ </br>
+ </br>
+ <div class="centre">
+ <br /><input type=submit name="PrintPDF" value="' . _('Print PDF') . '">
+ </div>';
include('includes/footer.inc');
@@ -334,4 +331,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader function
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/BOMIndented.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -53,8 +53,8 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $levelctr = 2;
- // $levelctr is the level counter
+ $LevelCounter = 2;
+ // $LevelCounter is the level counter
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -68,7 +68,7 @@
SELECT bom.parent,
bom.component,
CONCAT(bom.parent,bom.component) AS sortpart,
- '$levelctr' as level,
+ " . $LevelCounter . " AS level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -80,14 +80,14 @@
AND bom.effectiveafte...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-17 09:16:46
|
Revision: 4597
http://web-erp.svn.sourceforge.net/web-erp/?rev=4597&view=rev
Author: daintree
Date: 2011-06-17 09:16:37 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
consistency
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CounterSales.php
trunk/CustomerInquiry.php
trunk/Customers.php
trunk/MRPPlannedWorkOrders.php
trunk/SelectContract.php
trunk/SelectCustomer.php
trunk/StockLocTransfer.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualARInquiries.html
trunk/doc/Manual/ManualARReports.html
trunk/doc/Manual/ManualARTransactions.html
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/doc/Manual/ManualCreditStatus.html
trunk/doc/Manual/ManualCurrencies.html
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualHeader.html
trunk/doc/Manual/ManualIntroduction.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualMRP.html
trunk/doc/Manual/ManualManufacturing.html
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/ManualPaymentTerms.html
trunk/doc/Manual/ManualPettyCash.html
trunk/doc/Manual/ManualPrices.html
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/doc/Manual/ManualReportBuilder.html
trunk/doc/Manual/ManualRequirements.html
trunk/doc/Manual/ManualSalesAnalysis.html
trunk/doc/Manual/ManualSalesOrders.html
trunk/doc/Manual/ManualSalesPeople.html
trunk/doc/Manual/ManualSalesTypes.html
trunk/doc/Manual/ManualSecuritySchema.html
trunk/doc/Manual/ManualShipments.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/doc/Manual/ManualSystemConventions.html
trunk/doc/Manual/ManualTax.html
trunk/includes/ConnectDB.inc
Added Paths:
-----------
trunk/doc/Manual/images/AccountsPayable.jpg
trunk/doc/Manual/images/BankReconciliation.jpg
trunk/doc/Manual/images/GLIntegration.jpg
trunk/doc/Manual/images/Purchasing.jpg
trunk/doc/Manual/images/Sales.jpg
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AccountGroups.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -53,10 +53,10 @@
FROM accountgroups WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
- $ErrMsg = _('Could not check whether the group exists because');
+ $ErrMsg = _('Could not check whether the group exists because');
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
- $myrow=DB_fetch_row($result);
+ $myrow=DB_fetch_row($result);
if ($myrow[0]!=0 and $_POST['SelectedAccountGroup']=='') {
$InputError = 1;
@@ -362,7 +362,7 @@
<td><select tabindex="3" ' . (in_array('SectionInAccounts',$Errors) ? 'class="selecterror"' : '' ) .
' name="SectionInAccounts">';
- $sql = 'SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid';
+ $sql = "SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid";
$secresult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
while( $secrow = DB_fetch_array($secresult) ) {
if ($_POST['SectionInAccounts']==$secrow['sectionid']) {
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AccountSections.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -172,7 +172,8 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
echo '<table name="SectionList" class="selection">
<tr>
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerContacts.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -17,16 +17,16 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo "<a href='" . $rootpath . '/Customers.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Customers') . '</a><br />';
+echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $DebtorNo .'">' . _('Back to Customers') . '</a><br />';
$SQLname="SELECT name FROM debtorsmaster where debtorno='" .$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . _('Contacts for Customer: <b>') .$row['name'].'</p><br />';
+ '" alt="" />' . ' ' . _('Contacts for Customer:') . ' <b>' . $row['name'].'</b></p><br />';
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . _('Edit contact for <b>') .$row['name'].'</p><br />';
+ '" alt="" />' . ' ' . _('Edit contact for') . '<b>' . $row['name'].'</b></p><br />';
}
if ( isset($_POST['submit']) ) {
@@ -39,34 +39,40 @@
if (isset($_POST['Con_ID']) and !is_long((integer)$_POST['Con_ID'])) {
$InputError = 1;
prnMsg( _('The Contact ID must be an integer.'), 'error');
- } elseif (strlen($_POST['conName']) >40) {
+ } elseif (strlen($_POST['ContactName']) >40) {
$InputError = 1;
prnMsg( _('The contact name must be forty characters or less long'), 'error');
- } elseif( trim($_POST['conName']) == '' ) {
+ } elseif( trim($_POST['ContactName']) == '' ) {
$InputError = 1;
prnMsg( _('The contact name may not be empty'), 'error');
+ }elseif (!IsEmailAddress($_POST['ContactEmail']) AND strlen($_POST['ContactEmail'])>0){
+ $InputError = 1;
+ prnMsg( _('The contact email address is not a valid email address'), 'error');
}
-
if (isset($Id) and ($Id and $InputError !=1)) {
- $sql = "UPDATE custcontacts SET
- contactname='" . $_POST['conName'] . "',
- role='" . $_POST['conRole'] . "',
- phoneno='" . $_POST['conPhone'] . "',
- notes='" . $_POST['conNotes'] . "'
- WHERE debtorno ='".$DebtorNo."'
- AND contid='".$Id."'";
+ $sql = "UPDATE custcontacts SET contactname='" . $_POST['ContactName'] . "',
+ role='" . $_POST['ContactRole'] . "',
+ phoneno='" . $_POST['ContactPhone'] . "',
+ notes='" . $_POST['ContactNotes'] . "',
+ email='" . $_POST['ContactEmail'] . "'
+ WHERE debtorno ='".$DebtorNo."'
+ AND contid='".$Id."'";
$msg = _('Customer Contacts') . ' ' . $DebtorNo . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO custcontacts (debtorno,contactname,role,phoneno,notes)
- VALUES (
- '" . $DebtorNo. "',
- '" . $_POST['conName'] . "',
- '" . $_POST['conRole'] . "',
- '" . $_POST['conPhone'] . "',
- '" . $_POST['conNotes'] . "'
- )";
+ $sql = "INSERT INTO custcontacts (debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email)
+ VALUES ('" . $DebtorNo. "',
+ '" . $_POST['ContactName'] . "',
+ '" . $_POST['ContactRole'] . "',
+ '" . $_POST['ContactPhone'] . "',
+ '" . $_POST['ContactNotes'] . "',
+ '" . $_POST['ContactEmail'] . "')";
$msg = _('The contact record has been added');
}
@@ -78,40 +84,51 @@
prnMsg($msg, 'success');
echo '<br />';
unset($Id);
- unset($_POST['conName']);
- unset($_POST['conRole']);
- unset($_POST['conPhone']);
- unset($_POST['conNotes']);
+ unset($_POST['ContactName']);
+ unset($_POST['ContactRole']);
+ unset($_POST['ContactPhone']);
+ unset($_POST['ContactNotes']);
+ unset($_POST['ContactEmail']);
unset($_POST['Con_ID']);
}
- } elseif (isset($_GET['delete']) and $_GET['delete']) {
+} elseif (isset($_GET['delete']) and $_GET['delete']) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM custcontacts WHERE contid=".$Id."
- and debtorno='".$DebtorNo."'";
+ $sql="DELETE FROM custcontacts
+ WHERE contid='" . $Id . "'
+ AND debtorno='" . $DebtorNo . "'";
$result = DB_query($sql,$db);
- //echo '<br />'.$sql;
- echo '<br />';
- prnMsg( _('The contact record has been deleted'), 'success');
- unset($Id);
- unset($_GET['delete']);
+ echo '<br />';
+ prnMsg( _('The contact record has been deleted'), 'success');
+ unset($Id);
+ unset($_GET['delete']);
- }
+}
if (!isset($Id)) {
- $sql = "SELECT * FROM custcontacts where debtorno='".$DebtorNo."' ORDER BY contid";
+ $sql = "SELECT contid,
+ debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email
+ FROM custcontacts
+ WHERE debtorno='".$DebtorNo."'
+ ORDER BY contid";
$result = DB_query($sql,$db);
//echo '<br />'.$sql;
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Name') . '</th>
<th>' . _('Role') . '</th>
<th>' . _('Phone no') . '</th>
+ <th>' . _('Email') . '</th>
<th>' . _('Notes') . '</th>';
$k=0; //row colour counter
@@ -127,83 +144,102 @@
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td><a href=mailto:%s>%s</a></td>
<td>%s</td>
<td><a href="%sId=%s&DebtorNo=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorNo=%s&delete=1">'. _('Delete'). '</td></tr>',
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
- $myrow[0],
- $myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
- $myrow[0],
- $myrow[1]);
+ <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">'. _('Delete'). '</td></tr>',
+ $myrow['contactname'],
+ $myrow['role'],
+ $myrow['phoneno'],
+ $myrow['email'],
+ $myrow['email'],
+ $myrow['notes'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['contid'],
+ $myrow['debtorno'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['contid'],
+ $myrow['debtorno']);
}
//END WHILE LIST LOOP
echo '</table>';
}
-if (isset($Id)) { ?>
- <div class="centre"><a href="<?php echo $_SERVER['PHP_SELF'] . '?' . SID .'&DebtorNo='.$DebtorNo;?>"><?=_('Review all contacts for this Customer')?></a></div>
-<?php } ?>
-<p>
+if (isset($Id)) {
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo .'">' . _('Review all contacts for this Customer') . '</a></div>';
+}
-<?php
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
- //editing an existing Shipper
- $sql = "SELECT * FROM custcontacts WHERE contid='".$Id."'
- and debtorno='".$DebtorNo."'";
+ $sql = "SELECT contid,
+ debtorno,
+ contactname,
+ role,
+ phoneno,
+ notes,
+ email
+ FROM custcontacts
+ WHERE contid='".$Id."'
+ AND debtorno='".$DebtorNo."'";
$result = DB_query($sql, $db);
- //echo '<br />'.$sql;
-
$myrow = DB_fetch_array($result);
$_POST['Con_ID'] = $myrow['contid'];
- $_POST['conName'] = $myrow['contactname'];
- $_POST['conRole'] = $myrow['role'];
- $_POST['conPhone'] = $myrow['phoneno'];
- $_POST['conNotes'] = $myrow['notes'];
- $_POST['debtorno'] = $myrow['debtorno'];
+ $_POST['ContactName'] = $myrow['contactname'];
+ $_POST['ContactRole'] = $myrow['role'];
+ $_POST['ContactPhone'] = $myrow['phoneno'];
+ $_POST['ContactNotes'] = $myrow['notes'];
+ $_POST['ContactEmail'] = $myrow['email'];
+ $_POST['DebtorNo'] = $myrow['debtorno'];
echo '<input type=hidden name="Id" value='. $Id .'>';
echo '<input type=hidden name="Con_ID" value=' . $_POST['Con_ID'] . '>';
- echo '<input type=hidden name="DebtorNo" value=' . $_POST['debtorno'] . '>';
- echo '<table class=selection><tr><td>'. _('Contact Code').':</td><td>' . $_POST['Con_ID'] . '</td></tr>';
+ echo '<input type=hidden name="DebtorNo" value=' . $_POST['DebtorNo'] . '>';
+ echo '<br />
+ <table class="selection">
+ <tr>
+ <td>'. _('Contact Code').':</td>
+ <td>' . $_POST['Con_ID'] . '</td>
+ </tr>';
} else {
- echo '<table class=selection>';
+ echo '<br />
+ <table class="selection">';
}
echo '<tr><td>'. _('Contact Name') . '</td>';
- if (isset($_POST['conName'])) {
- echo '<td><input type="Text" name="conName" value="' . $_POST['conName']. '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactName'])) {
+ echo '<td><input type="text" name="ContactName" value="' . $_POST['ContactName']. '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="Text" name="conName" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactName" size=35 maxlength=40></td></tr>';
}
echo '<tr><td>' . _('Role') . '</td>';
- if (isset($_POST['conRole'])) {
- echo '<td><input type="text" name="conRole" value="'. $_POST['conRole']. '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactRole'])) {
+ echo '<td><input type="text" name="ContactRole" value="'. $_POST['ContactRole']. '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="text" name="conRole" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactRole" size=35 maxlength=40></td></tr>';
}
echo '<tr><td>' . _('Phone') . '</td>';
- if (isset($_POST['conPhone'])) {
- echo '<td><input type="Text" name="conPhone" value="' . $_POST['conPhone'] . '" size=35 maxlength=40></td></tr>';
+ if (isset($_POST['ContactPhone'])) {
+ echo '<td><input type="text" name="ContactPhone" value="' . $_POST['ContactPhone'] . '" size=35 maxlength=40></td></tr>';
} else {
- echo '<td><input type="Text" name="conPhone"" size=35 maxlength=40></td></tr>';
+ echo '<td><input type="text" name="ContactPhone" size=35 maxlength=40></td></tr>';
}
+ echo '<tr><td>' . _('Email') . '</td>';
+ if (isset($_POST['ContactEmail'])) {
+ echo '<td><input type="text" name="ContactEmail" value="' . $_POST['ContactEmail'] . '" size=55 maxlength="55"></td></tr>';
+ } else {
+ echo '<td><input type="text" name="ContactEmail" size="55" maxlength="55"></td></tr>';
+ }
echo '<tr><td>' . _('Notes') . '</td>';
- if (isset($_POST['conNotes'])) {
- echo '<td><textarea name="conNotes">'. $_POST['conNotes'] . '</textarea>';
+ if (isset($_POST['ContactNotes'])) {
+ echo '<td><textarea name="ContactNotes">'. $_POST['ContactNotes'] . '</textarea>';
} else {
- echo '<td><textarea name="conNotes"></textarea>';
+ echo '<td><textarea name="ContactNotes"></textarea>';
}
echo '<tr><td colspan=2><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information') . '"></div></td></tr>';
echo '</table>';
@@ -212,4 +248,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerNotes.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -1,7 +1,7 @@
<?php
-/* $Revision: 1.4 $ */
+
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Notes');
include('includes/header.inc');
@@ -17,7 +17,8 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Select Customer') . '</a><br>';
+
+echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Select Customer') . '</a><br />';
if ( isset($_POST['submit']) ) {
//initialise no input errors assumed initially before we test
@@ -49,22 +50,24 @@
$msg = _('Customer Notes') . ' ' . $DebtorNo . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO custnotes (debtorno,href,note,date,priority)
- VALUES (
- '" . $DebtorNo. "',
- '" . $_POST['href'] . "',
- '" . $_POST['note'] . "',
- '" . FormatDateForSQL($_POST['date']) . "',
- '" . $_POST['priority'] . "'
- )";
+ $sql = "INSERT INTO custnotes (debtorno,
+ href,
+ note,
+ date,
+ priority)
+ VALUES ('" . $DebtorNo. "',
+ '" . $_POST['href'] . "',
+ '" . $_POST['note'] . "',
+ '" . FormatDateForSQL($_POST['date']) . "',
+ '" . $_POST['priority'] . "')";
$msg = _('The contact notes record has been added');
}
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg($msg, 'success');
unset($Id);
unset($_POST['note']);
@@ -78,28 +81,32 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM custnotes WHERE noteid='".$Id."'
- and debtorno='".$DebtorNo."'";
- $result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ $sql="DELETE FROM custnotes
+ WHERE noteid='".$Id."'
+ AND debtorno='".$DebtorNo."'";
+ $result = DB_query($sql,$db);
+ //echo '<br />'.$sql;
- echo '<br>';
- prnMsg( _('The contact note record has been deleted'), 'success');
- unset($Id);
- unset($_GET['delete']);
+ echo '<br />';
+ prnMsg( _('The contact note record has been deleted'), 'success');
+ unset($Id);
+ unset($_GET['delete']);
+}
- }
-
if (!isset($Id)) {
- $SQLname="SELECT * from debtorsmaster where debtorno='".$DebtorNo."'";
+ $SQLname="SELECT * FROM debtorsmaster
+ WHERE debtorno='".$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p><br />';
+ '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
+ <br />';
- $sql = "SELECT * FROM custnotes where debtorno='".$DebtorNo."' ORDER BY date DESC";
+ $sql = "SELECT * FROM custnotes
+ WHERE debtorno='".$DebtorNo."'
+ ORDER BY date DESC";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
echo '<table class=selection>';
echo '<tr>
@@ -128,10 +135,10 @@
$myrow[3],
$myrow[2],
$myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1]);
@@ -140,9 +147,9 @@
echo '</table>';
}
if (isset($Id)) {
- echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?' . SID .'&DebtorNo='.$DebtorNo.'"><?='._('Review all notes for this Customer').'</a></div>';
+ echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">'._('Review all notes for this Customer').'</a></div>';
}
-echo '<p>';
+echo '<br />';
if (!isset($_GET['delete'])) {
@@ -156,7 +163,6 @@
and debtorno='".$DebtorNo."'";
$result = DB_query($sql, $db);
- //echo '<br>'.$sql;
$myrow = DB_fetch_array($result);
@@ -169,9 +175,13 @@
echo '<input type=hidden name="Id" value='. $Id .'>';
echo '<input type=hidden name="Con_ID" value=' . $_POST['noteid'] . '>';
echo '<input type=hidden name="DebtorNo" value=' . $_POST['debtorno'] . '>';
- echo '<table class=selection><tr><td>'. _('Note ID').':</td><td>' . $_POST['noteid'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Note ID').':</td>
+ <td>' . $_POST['noteid'] . '</td>
+ </tr>';
} else {
- echo '<table class=selection>';
+ echo '<table class="selection">';
}
echo '<tr><td>' . _('Contact Note'). '</td>';
@@ -188,15 +198,15 @@
}
echo '<tr><td>' . _('Date') .'</td>';
if (isset($_POST['date'])) {
- echo '<td><input type="Text" name="date" value="'.ConvertSQLDate($_POST['date']).'" size=10 maxlength=10></td></tr>';
+ echo '<td><input type="text" name="date" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['date']).'" size=10 maxlength=10></td></tr>';
} else {
- echo '<td><input type="Text" name="date" size=10 maxlength=10></td></tr>';
+ echo '<td><input type="text" name="date" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" size=10 maxlength=10></td></tr>';
}
echo '<tr><td>'. _('Priority'). '</td>';
if (isset($_POST['priority'])) {
echo '<td><input type="Text" name="priority" value="' .$_POST['priority']. '" size=1 maxlength=3></td></td>';
} else {
- echo '<td><input type="Text" name="priority" size=1 maxlength=3></td></td>';
+ echo '<td><input type="text" name="priority" size=1 maxlength=3></td></td>';
}
echo '<tr><td colspan=2><div class="centre"><input type="Submit" name="submit" value="'._('Enter Information').'"></div></td></tr>';
echo '</table>';
@@ -206,4 +216,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AddCustomerTypeNotes.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.3 $ */
/* $Id$*/
-//$PageSecurity = 3;
+
include('includes/session.inc');
$title = _('Customer Type (Group) Notes');
include('includes/header.inc');
@@ -17,8 +16,8 @@
} elseif (isset($_GET['DebtorType'])){
$DebtorType = $_GET['DebtorType'];
}
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorType='.$DebtorType."'>" . _('Back to Select Customer') . '</a><br>';
-if ( isset($_POST['submit']) ) {
+echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorType='.$DebtorType.'">' . _('Back to Select Customer') . '</a><br />';
+if (isset($_POST['submit']) ) {
//initialise no input errors assumed initially before we test
$InputError = 0;
@@ -28,10 +27,10 @@
//first off validate inputs sensible
if (!is_long((integer)$_POST['priority'])) {
$InputError = 1;
- prnMsg( _('The Contact priority must be an integer.'), 'error');
+ prnMsg(_('The Contact priority must be an integer.'), 'error');
} elseif (strlen($_POST['note']) >200) {
$InputError = 1;
- prnMsg( _("The contact's notes must be two hundred characters or less long"), 'error');
+ prnMsg(_("The contact's notes must be two hundred characters or less long"), 'error');
} elseif( trim($_POST['note']) == '' ) {
$InputError = 1;
prnMsg( _("The contact's notes may not be empty"), 'error');
@@ -40,31 +39,32 @@
if ($Id AND $InputError !=1) {
$sql = "UPDATE debtortypenotes SET
- note='" . $_POST['note'] . "',
- date='" . $_POST['date'] . "',
- href='" . $_POST['href'] . "',
- priority='" . $_POST['priority'] . "'
- WHERE typeid ='".$DebtorType."'
- AND noteid='".$Id."'";
+ note='" . $_POST['note'] . "',
+ date='" . $_POST['date'] . "',
+ href='" . $_POST['href'] . "',
+ priority='" . $_POST['priority'] . "'
+ WHERE typeid ='".$DebtorType."'
+ AND noteid='".$Id."'";
$msg = _('Customer Group Notes') . ' ' . $DebtorType . ' ' . _('has been updated');
} elseif ($InputError !=1) {
- $sql = "INSERT INTO debtortypenotes (typeid,href,note,date,priority)
- VALUES (
- '" . $DebtorType. "',
- '" . $_POST['href'] . "',
- '" . $_POST['note'] . "',
- '" . $_POST['date'] . "',
- '" . $_POST['priority'] . "'
- )";
+ $sql = "INSERT INTO debtortypenotes (typeid,
+ href,
+ note,
+ date,
+ priority)
+ VALUES ('" . $DebtorType. "',
+ '" . $_POST['href'] . "',
+ '" . $_POST['note'] . "',
+ '" . $_POST['date'] . "',
+ '" . $_POST['priority'] . "')";
$msg = _('The contact group notes record has been added');
}
if ($InputError !=1) {
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg($msg, 'success');
unset($Id);
unset($_POST['note']);
@@ -75,12 +75,13 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
- $sql="DELETE FROM debtortypenotes WHERE noteid='".$Id."'
- and typeid='".$DebtorType."'";
+ $sql="DELETE FROM debtortypenotes
+ WHERE noteid='".$Id."'
+ AND typeid='".$DebtorType."'";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
+ //echo '<br />'.$sql;
- echo '<br>';
+ echo '<br />';
prnMsg( _('The contact group note record has been deleted'), 'success');
unset($Id);
unset($_GET['delete']);
@@ -97,9 +98,8 @@
$sql = "SELECT * FROM debtortypenotes where typeid='".$DebtorType."' ORDER BY date DESC";
$result = DB_query($sql,$db);
- //echo '<br>'.$sql;
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr>
<th>' . _('Date') . '</th>
<th>' . _('Note') . '</th>
@@ -121,15 +121,15 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sId=%s&DebtorType=%s">'. _('Edit').' </td>
- <td><a href="%sId=%s&DebtorType=%s&delete=1">'. _('Delete'). '</td></tr>',
+ <td><a href="%sId=%s&DebtorType=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this customer type note?') . '\');">'. _('Delete'). '</td></tr>',
$myrow[4],
$myrow[3],
$myrow[2],
$myrow[5],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . "?" . SID,
+ $_SERVER['PHP_SELF'] . '?',
$myrow[0],
$myrow[1]);
@@ -145,7 +145,7 @@
<?php
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DebtorType='.$DebtorType.'">';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorType='.$DebtorType.'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -155,7 +155,6 @@
and typeid='".$DebtorType."'";
$result = DB_query($sql, $db);
- //echo '<br>'.$sql;
$myrow = DB_fetch_array($result);
@@ -189,7 +188,7 @@
echo '<tr><td>'. _('Priority').':</td>';
echo '<td><input type="Text" name="priority" value="'. $_POST['priority'].'" size=1 maxlength=3></td></td>
</table>';
- echo '<br><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information').'"></div>';
+ echo '<br /><div class="centre"><input type="Submit" name="submit" value="'. _('Enter Information').'"></div>';
echo '</form>';
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AgedDebtors.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -80,7 +80,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -154,7 +154,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -243,7 +243,7 @@
AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- $SalesLimit
+ " . $SalesLimit . "
GROUP BY debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -269,7 +269,7 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
- echo '<p>' . _('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db);
+ prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
@@ -368,10 +368,10 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
- echo '<br /><br />' . _('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db);
+ prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . _('The SQL that failed was') . '<p>' . $sql;
+ echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -483,13 +483,12 @@
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$result=DB_query($sql,$db);
- echo '<option value=""></option>';
+ echo '<option value="">' . _('All Sales people') . '</option>';
while ($myrow=DB_fetch_array($result)){
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td></tr>';
-
echo '<tr><td>' . _('Only show customers trading in') . ':' . '</td>
<td><select tabindex="5" name="Currency">';
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/AgedSuppliers.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -2,9 +2,6 @@
/* $Id$*/
-/* $Revision: 1.13 $ */
-
-//$PageSecurity = 2;
include('includes/session.inc');
If (isset($_POST['PrintPDF'])
@@ -24,78 +21,83 @@
/*Now figure out the aged analysis for the Supplier range under review */
if ($_POST['All_Or_Overdues']=='All'){
- $SQL = "SELECT suppliers.supplierid, suppliers.suppname, currencies.currency, paymentterms.terms,
- SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS due,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue1,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue2
- FROM suppliers, paymentterms, currencies, supptrans WHERE suppliers.paymentterms = paymentterms.termsindicator
- AND suppliers.currcode = currencies.currabrev
- AND suppliers.supplierid = supptrans.supplierno
- AND suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
- AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
- AND suppliers.currcode ='" . $_POST['Currency'] . "'
- GROUP BY suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth
- HAVING Sum(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <>0";
-
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS due,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue1,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue2
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
+ AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.currcode ='" . $_POST['Currency'] . "'
+ GROUP BY suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth
+ HAVING SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <>0";
+
} else {
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS due,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue1,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END) AS overdue2
- FROM suppliers,
- paymentterms,
- currencies,
- supptrans
- WHERE suppliers.paymentterms = paymentterms.termsindicator
- AND suppliers.currcode = currencies.currabrev
- and suppliers.supplierid = supptrans.supplierno
- AND suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
- AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
- AND suppliers.currcode ='" . $_POST['Currency'] . "'
- GROUP BY suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth
- HAVING Sum(IF (paymentterms.daysbeforedue > 0,
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS due,
+ Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue1,
+ SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END) AS overdue2
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
+ AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.currcode ='" . $_POST['Currency'] . "'
+ GROUP BY suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth
+ HAVING Sum(IF (paymentterms.daysbeforedue > 0,
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
}
@@ -103,11 +105,11 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
- include("includes/header.inc");
+ include('includes/header.inc');
prnMsg(_('The Supplier details 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;
@@ -186,10 +188,10 @@
if (DB_error_no($db) !=0) {
$title = _('Aged Supplier Account Analysis - Problem Report');
include('includes/header.inc');
- echo '<br>' . _('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db);
- echo "<br><a href='$rootpath/index.php'>" . _('Back to the menu') . '</a>';
+ prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . _('The SQL that failed was') . '<br>' . $sql;
+ echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -250,22 +252,11 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos ,220, $YPos);
-/* UldisN : this doesn't work for TCPDF
- $buf = $pdf->output();
- $len = strlen($buf);
- header('Content-type: application/pdf');
- header("Content-Length: $len");
- header('Content-Disposition: inline; filename=AgedSuppliers.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $pdf->stream();
-*/
if ($ListCount == 0) {
- prnMsg('there are no results so the PDF is empty');
+ prnMsg('There are no results so the PDF is empty');
} else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');
}
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
@@ -280,46 +271,47 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo "<form sction='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method='POST'><table>";
+ echo '<form sction="' . $_SERVER['PHP_SELF'] . '" method="post">
+ <table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('From Supplier Code') . ":</font></td>
- <td><input tabindex='1' type=text maxlength=6 size=7 name=FromCriteria value='1'></td>
- </tr>";
- echo '<tr><td>' . _('To Supplier Code') . ":</td>
- <td><input tabindex='2' Type=text maxlength=6 size=7 name=ToCriteria value='zzzzzz'></td>
- </tr>";
+ echo '<tr><td>' . _('From Supplier Code') . ':</font></td>
+ <td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1"></td>
+ </tr>';
+ echo '<tr><td>' . _('To Supplier Code') . ':</td>
+ <td><input tabindex="2" type="text" maxlength="6" size="7" name="ToCriteria" value="zzzzzz"></td>
+ </tr>';
- echo '<tr><td>' . _('All balances or overdues only') . ':' . "</td>
- <td><select tabindex='3' name='All_Or_Overdues'>";
- echo "<option selected value='All'>" . _('All suppliers with balances');
- echo "<option value='OverduesOnly'>" . _('Overdue accounts only');
+ echo '<tr><td>' . _('All balances or overdues only') . ':' . '</td>
+ <td><select tabindex="3" name="All_Or_Overdues">';
+ echo '<option selected value="All">' . _('All suppliers with balances') . '</option>';
+ echo '<option value="OverduesOnly">' . _('Overdue accounts only') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('For suppliers trading in') . ':' . "</td>
- <td><select tabindex='4' name='Currency'>";
+ echo '<tr><td>' . _('For suppliers trading in') . ':' . '</td>
+ <td><select tabindex="4" name="Currency">';
- $sql = 'SELECT currency, currabrev FROM currencies';
+ $sql = "SELECT currency, currabrev FROM currencies";
$result=DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)){
if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
- 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>';
}
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Summary or Detailed Report') . ':' . "</td>
- <td><select tabindex='5' name='DetailedReport'>";
- echo "<option selected value='No'>" . _('Summary Report');
- echo "<option value='Yes'>" . _('Detailed Report');
+ echo '<tr><td>' . _('Summary or Detailed Report') . ':' . '</td>
+ <td><select tabindex="5" name="DetailedReport">';
+ echo '<option selected value="No">' . _('Summary Report') . '</option>';
+ echo '<option value="Yes">' . _('Detailed Report') . '</option>';
echo '</select></td></tr>';
- echo '</table><br><div class="centre"><input tabindex="6" type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
+ echo '</table><br /><div class="centre"><input tabindex="6" type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/BOMExtendedQty.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -2,8 +2,8 @@
/* $Id$*/
-// BOMExtendedQty.php - Quantiy Extended Bill of Materials
-//$PageSecurity = 2;
+// BOMExtendedQty.php - Quantity Extended Bill of Materials
+
include('includes/session.inc');
if (isset($_POST['PrintPDF'])) {
@@ -15,24 +15,21 @@
$PageNumber=1;
$line_height=12;
- if (!$_POST['Quantity'] || !is_numeric($_POST['Quantity'])) {
+ if (!$_POST['Quantity'] OR !is_numeric($_POST['Quantity'])) {
$_POST['Quantity'] = 1;
}
- $sql = 'DROP TABLE IF EXISTS tempbom';
- $result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom';
- $result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom2';
- $result = DB_query($sql,$db);
- $sql = 'CREATE TEMPORARY TABLE passbom (
+ $result = DB_query("DROP TABLE IF EXISTS tempbom",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom2",$db);
+ $sql = "CREATE TEMPORARY TABLE passbom (
part char(20),
extendedqpa double,
- 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 (
+ $sql = "CREATE TEMPORARY TABLE tempbom (
parent char(20),
component char(20),
sortpart text,
@@ -41,7 +38,7 @@
loccode char(5),
effectiveafter date,
effectiveto date,
- quantity double) DEFAULT CHARSET=utf8';
+ 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
@@ -59,8 +56,8 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $levelctr = 2;
- // $levelctr is the level counter
+ $LevelCounter = 2;
+ // $LevelCounter is the level counter
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -74,7 +71,7 @@
SELECT bom.parent,
bom.component,
CONCAT(bom.parent,bom.component) AS sortpart,"
- . $levelctr . " as level,
+ . $LevelCounter . " as level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -86,13 +83,13 @@
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
+ // This while routine finds the other levels as long as $ComponentCounter - the
// component counter finds there are more components that are used as
// assemblies at lower levels
- $componentctr = 1;
- while ($componentctr > 0) {
- $levelctr++;
+ $ComponentCounter = 1;
+ while ($ComponentCounter > 0) {
+ $LevelCounter++;
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -106,7 +103,7 @@
SELECT bom.parent,
bom.component,
CONCAT(passbom.sortpart,bom.component) AS sortpart,
- $levelctr as level,
+ " . $LevelCounter . " as level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -118,22 +115,15 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom2';
- $result = DB_query($sql,$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom2",$db);
+ $result = DB_query("ALTER TABLE passbom RENAME AS passbom2",$db);
+ $result = DB_query("DROP TABLE IF EXISTS passbom",$db);
- $sql = 'ALTER TABLE passbom RENAME AS passbom2';
+ $sql = "CREATE TEMPORARY TABLE passbom (part char(20),
+ extendedqpa decimal(10,3),
+ sortpart text) DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db);
- $sql = 'DROP TABLE IF EXISTS passbom';
- $result = DB_query($sql,$db);
-
- $sql = 'CREATE TEMPORARY TABLE passbom (
- part char(20),
- extendedqpa decimal(10,3),
- sortpart text) DEFAULT CHARSET=utf8';
- $result = DB_query($sql,$db);
-
-
$sql = "INSERT INTO passbom (part, extendedqpa, sortpart)
SELECT bom.component AS part,
(bom.quantity * passbom2.extendedqpa),
@@ -145,15 +135,15 @@
$result = DB_query($sql,$db);
- $sql = 'SELECT COUNT(*) FROM bom, passbom
+ $sql = "SELECT COUNT(*) FROM bom, passbom
WHERE bom.parent = passbom.part
- GROUP BY passbom.part';
+ GROUP BY passbom.part";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- $componentctr = $myrow[0];
+ $ComponentCounter = $myrow[0];
- } // End of while $componentctr > 0
+ } // End of while $ComponentCounter > 0
if (DB_error_no($db) !=0) {
$title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
@@ -167,9 +157,8 @@
exit;
}
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
- $sql = "SELECT stockmaster.stockid,stockmaster.description
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
+ $sql = "SELECT stockid,description
FROM stockmaster
WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
@@ -181,7 +170,7 @@
$Tot_Val=0;
$fill = false;
$pdf->SetFillColor(224,235,255);
- $sql = 'SELECT tempbom.component,
+ $sql = "SELECT tempbom.component,
SUM(tempbom.quantity) as quantity,
stockmaster.description,
stockmaster.decimalplaces,
@@ -207,10 +196,10 @@
GROUP BY tempbom.component,
stockmaster.description,
stockmaster.decimalplaces,
- stockmaster.mbflag';
+ stockmaster.mbflag";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result); // UldisN
- While ($myrow = DB_fetch_array($result,$db)){
+ $ListCount = DB_num_rows($result);
+ 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
@@ -239,8 +228,7 @@
$myrow['decimalplaces']),'right',0,$fill);
}
if ($YPos < $Bottom_Margin + $line_height){
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
}
} /*end while loop */
@@ -249,14 +237,13 @@
$YPos -= (2*$line_height);
if ($YPos < $Bottom_Margin + $line_height){
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
}
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>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -271,19 +258,29 @@
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><td><input type ='text' name='Part' size='20'>";
- echo '<tr><td>' . _('Quantity') . ":</td><td><input type='text' class=number name='Quantity' size='4'>";
- echo '<tr><td>' . _('Selection Option') . ":</td><td><select name='Select'>";
- echo "<option selected value='All'>" . _('Show All Parts');
- echo "<option value='Shortages'>" . _('Only Show Shortages');
- echo '</select></td></tr>';
- echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
- 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 '<tr><td>' . _('Part') . ':</td>
+ <td><input type ="text" name="Part" size="20">';
+ echo '<tr><td>' . _('Quantity') . ':</td>
+ <td><input type="text" class="number" name="Quantity" size="4"></td></tr>';
+
+ echo '<tr><td>' . _('Selection Option') . ':</td>
+ <td><select name="Select">
+ <option selected value="All">' . _('Show All Parts') . '</option>
+ <option value="Shortages">' . _('Only Show Shortages') . '</option>
+ </select></td></tr>';
+ echo '<tr><td>' . _('Print Option') . ':</td>
+ <td><select name="Fill">
+ <option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>
+ <option value="no">' . _('Plain Print') . '</option>
+ </select></td></tr>';
+ echo '</table>
+ </br>
+ </br>
+ <div class="centre">
+ <br /><input type=submit name="PrintPDF" value="' . _('Print PDF') . '">
+ </div>';
include('includes/footer.inc');
@@ -334,4 +331,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader function
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2011-06-13 10:23:44 UTC (rev 4596)
+++ trunk/BOMIndented.php 2011-06-17 09:16:37 UTC (rev 4597)
@@ -53,8 +53,8 @@
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
- $levelctr = 2;
- // $levelctr is the level counter
+ $LevelCounter = 2;
+ // $LevelCounter is the level counter
$sql = "INSERT INTO tempbom (
parent,
component,
@@ -68,7 +68,7 @@
SELECT bom.parent,
bom.component,
CONCAT(bom.parent,bom.component) AS sortpart,
- '$levelctr' as level,
+ " . $LevelCounter . " AS level,
bom.workcentreadded,
bom.loccode,
bom.effectiveafter,
@@ -80,14 +80,14 @@
AND bom.effectiveafte...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-13 10:23:55
|
Revision: 4596
http://web-erp.svn.sourceforge.net/web-erp/?rev=4596&view=rev
Author: daintree
Date: 2011-06-13 10:23:44 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
xhtml case indent etc
Modified Paths:
--------------
trunk/Areas.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatch_Invoice.php
trunk/StockLocTransfer.php
trunk/doc/Change.log
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/Areas.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -68,7 +68,7 @@
$sql = "UPDATE areas SET
areadescription='" . $_POST['AreaDescription'] . "'
- WHERE areacode = '$SelectedArea'";
+ WHERE areacode = '" . $SelectedArea . "'";
$msg = _('Area code') . ' ' . $SelectedArea . ' ' . _('has been updated');
@@ -172,13 +172,13 @@
//end of ifs and buts!
if (isset($SelectedArea)) {
- echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Review Areas Defined') . '</a></div>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Review Areas Defined') . '</a></div>';
}
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><br>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '"><br>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -187,7 +187,7 @@
$sql = "SELECT areacode,
areadescription
FROM areas
- WHERE areacode='$SelectedArea'";
+ WHERE areacode='" . $SelectedArea . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -195,8 +195,8 @@
$_POST['AreaCode'] = $myrow['areacode'];
$_POST['AreaDescription'] = $myrow['areadescription'];
- echo '<input type=hidden name=SelectedArea VALUE=' . $SelectedArea . '>';
- echo '<input type=hidden name=AreaCode VALUE=' .$_POST['AreaCode'] . '>';
+ echo '<input type=hidden name=SelectedArea value="' . $SelectedArea . '">';
+ echo '<input type=hidden name=AreaCode value="' .$_POST['AreaCode'] . '">';
echo '<table class=selection><tr><td>' . _('Area Code') . ':</td><td>' . $_POST['AreaCode'] . '</td></tr>';
} else {
@@ -206,7 +206,7 @@
if (!isset($_POST['AreaDescription'])) {
$_POST['AreaDescription'] = '';
}
- echo '<table class=selection>
+ echo '<table class="selection">
<tr>
<td>' . _('Area Code') . ':</td>
<td><input tabindex="1" ' . (in_array('AreaCode',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="AreaCode" value="' . $_POST['AreaCode'] . '" size=3 maxlength=3></td>
@@ -217,7 +217,7 @@
<td><input tabindex="2" ' . (in_array('AreaDescription',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="AreaDescription" value="' . $_POST['AreaDescription'] .'" size=26 maxlength=25></td>
</tr>';
- echo '<tr><td colspan=2><div class="centre"><input tabindex="3" type="Submit" name="submit" value=' . _('Enter Information') .'></div></td></tr>';
+ echo '<tr><td colspan=2><div class="centre"><input tabindex="3" type="submit" name="submit" value=' . _('Enter Information') .'></div></td></tr>';
echo '</table></form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMInquiry.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.12 $ */
+
/* $Id$*/
-//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Costed Bill Of Material');
@@ -14,16 +13,20 @@
}
if (!isset($_POST['StockID'])) {
- echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." method=post><b><br></b>".
- '<div class="page_help_text">'. _('Select a manufactured part') . " (" . _('or Assembly or Kit part') . ") " .
- _('to view the costed bill of materials') . "." . "<br><font size=1>" .
- _('Parts must be defined in the stock item entry') . "/" . _('modification screen as manufactured') .
- ", " . _('kits or assemblies to be available for construction of a bill of material').'</div>'
- ."</font><br><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>" . _('Enter text extracts in the') .
- " <b>" . _('description') . "</b>:</font></td><td><input tabindex='1' type='Text' name='Keywords' size=20 maxlength=25></td>
- <td><font size=3><b>" . _('OR') . "</b></font></td><td><font size=1>" . _('Enter extract of the') .
- " <b>" . _('Stock Code') . "</b>:</font></td><td><input tabindex='2' type='Text' name='StockCode' size=15 maxlength=20></td>
- </tr></table><br><div class='centre'><input tabindex='3' type=submit name='Search' VALUE=" . _('Search Now') . "></div><br>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><b><br></b>'.
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
+ _('to view the costed bill of materials') . '<br /><font size=1>' .
+ _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
+ ', ' . _('kits or assemblies to be available for construction of a bill of material').'</div>'
+ .'</font><br />
+ <table class="selection" cellpadding="3" colspan="4">
+ <tr><td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25"></td>
+ <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20"></td>
+ </tr></table>
+ <br /><div class="centre"><input tabindex="3" type="submit" name="Search" value=' . _('Search Now') . '></div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
}
@@ -90,10 +93,10 @@
echo '<br><hr><br><table class=selection cellpadding=2 colspan=7>';
$TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ <th>' . _('Description') . '</th>
+ <th>' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
echo $TableHeader;
@@ -113,15 +116,14 @@
$StockOnHand = number_format($myrow['totalonhand'],2);
}
$tabindex=$j+4;
- printf("<td><input tabindex='".$tabindex."' type=submit name='StockID' VALUE='%s'</td>
+ printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s"</td>
<td>%s</td>
- <td class=number>%s</td>
- <td>%s</td></tr>",
- $myrow['stockid'],
- $myrow['description'],
- $StockOnHand,
- $myrow['units']
- );
+ <td class=number>%s</td>
+ <td>%s</td></tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $StockOnHand,
+ $myrow['units'] );
$j++;
//end of page full new headings if
}
@@ -131,17 +133,18 @@
}
if (isset($StockID) and $StockID!=""){
- /*CCF modification */
-// $result = DB_query("SELECT description, units FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $result = DB_query("SELECT description, units, labourcost, overheadcost FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- /*CCF end modification */
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
+ WHERE stockid='" . $StockID . "'",
+ $db);
$myrow = DB_fetch_array($result);
- /*CCF modification */
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
- /*CCF end modification */
-
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -149,7 +152,8 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster ON bom.component = stockmaster.stockid
+ FROM bom INNER JOIN stockmaster
+ ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
AND bom.effectiveto > Now()";
@@ -161,20 +165,17 @@
prnMsg(_('The bill of material for this part is not set up') . ' - ' . _('there are no components defined for it'),'warn');
} else {
echo '<a href="'.$rootpath.'/index.php">'._('Return to Main Menu').'</a>';
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo "<table class=selection cellpadding=2>";
- echo "<tr><th colspan=5><div class='centre'><font size=4><b>" . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] .
- "</b></font></div></th></tr>";
+ echo '<table class="selection" cellpadding="2">';
+ echo '<tr><th colspan=5><div class="centre"><font size=4><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b></font></div></th></tr>';
$TableHeader = '<tr>
- <th>' . _('Component') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Unit Cost') . '</th>
- <th>' . _('Total Cost') . '</th>
- </tr>';
-
+ <th>' . _('Component') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Unit Cost') . '</th>
+ <th>' . _('Total Cost') . '</th>
+ </tr>';
echo $TableHeader;
$j = 1;
@@ -192,39 +193,37 @@
$k++;
}
- $ComponentLink = "<a href='$rootpath/SelectProduct.php?" . SID . "&StockID=" . $myrow['component'] . "'>" . $myrow['component'] . "</a>";
+ $ComponentLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['component'] . '">' . $myrow['component'] . '</a>';
- /* Component Code Description Quantity Std Cost* Total Cost */
- printf("<td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td class=number>%.2f</td>
- <td class=number>%.2f</td>
- </tr>",
- $ComponentLink,
- $myrow['description'],
- number_format($myrow['quantity'],
- $myrow['decimalplaces']),
- $myrow['standardcost'],
- $myrow['componentcost']);
+ /* Component Code Description Quantity Std Cost Total Cost */
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%.2f</td>
+ <td class=number>%.2f</td>
+ </tr>',
+ $ComponentLink,
+ $myrow['description'],
+ number_format($myrow['quantity'],$myrow['decimalplaces']),
+ $myrow['standardcost'],
+ $myrow['componentcost']);
$TotalCost += $myrow['componentcost'];
$j++;
}
- /*CCF modification */
+
$TotalCost += $ParentLabourCost;
echo '<tr>
- <td colspan=4 class=number><b>' . _('Labour Cost') . '</b></td>
- <td class=number><b>' . number_format($ParentLabourCost,2) . '</b></td> </tr>';
+ <td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
+ <td class=number><b>' . number_format($ParentLabourCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td></tr>';
$TotalCost += $ParentOverheadCost;
- echo '<tr><td colspan=4 class=number><b>' . _('Overhead Cost') . '</b></td>
- <td class=number><b>' . number_format($ParentOverheadCost,2) . '</b></td></tr>';
- /*CCF end modification */
+ echo '<tr><td colspan="4" class="number"><b>' . _('Overhead Cost') . '</b></td>
+ <td class=number><b>' . number_format($ParentOverheadCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td></tr>';
echo '<tr>
<td colspan=4 class=number><b>' . _('Total Cost') . '</b></td>
- <td class=number><b>' . number_format($TotalCost,2) . '</b></td>
+ <td class=number><b>' . number_format($TotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
</tr>';
echo '</table>';
@@ -234,9 +233,9 @@
}
if (!isset($_POST['StockID']) or $_POST['StockID']=='') {
- echo "<script>defaultControl(document.forms[0].StockCode);</script>";
+ echo '<script>defaultControl(document.forms[0].StockCode);</script>';
}
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMListing.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -77,7 +77,7 @@
$SQL = "SELECT description FROM stockmaster WHERE stockmaster.stockid = '" . $BOMList['parent'] . "'";
$ParentResult = DB_query($SQL,$db);
$ParentRow = DB_fetch_row($ParentResult);
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,400-$Left_Margin,$FontSize,$BOMList['parent'] . ' - ' . $ParentRow[0],'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,400-$Left_Margin,$FontSize,$BOMList['parent'] . ' - ' . $ParentRow[0],'left');
$ParentPart = $BOMList['parent'];
}
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMs.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -18,7 +18,7 @@
$c_result = DB_query("SELECT parent,
component
FROM bom WHERE parent='" . $parent. "'"
- ,$db);
+ ,$db);
if (DB_num_rows($c_result) > 0) {
while ($row = DB_fetch_array($c_result)) {
@@ -143,7 +143,7 @@
<td class=number>%s</td>
<td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
<td>'.$DrillText.'</a></td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s">' . _('Delete') . '</a></td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
$myrow[0],
@@ -216,13 +216,13 @@
if (!Is_Date($_POST['EffectiveAfter'])) {
$InputError = 1;
- prnMsg(_('The effective after date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy'),'error');
+ prnMsg(_('The effective after date field must be a date in the format') . ' ' .$_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'EffectiveAfter';
$i++;
}
if (!Is_Date($_POST['EffectiveTo'])) {
$InputError = 1;
- prnMsg(_('The effective to date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy'),'error');
+ prnMsg(_('The effective to date field must be a date in the format') . ' ' .$_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'EffectiveTo';
$i++;
}
@@ -380,9 +380,9 @@
//DisplayBOMItems($SelectedParent, $db);
$sql = "SELECT stockmaster.description,
- stockmaster.mbflag
- FROM stockmaster
- WHERE stockmaster.stockid='" . $SelectedParent . "'";
+ stockmaster.mbflag
+ FROM stockmaster
+ WHERE stockmaster.stockid='" . $SelectedParent . "'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -410,16 +410,16 @@
break;
}
- echo '<br /><div class=centre><a href=' . $_SERVER['PHP_SELF'] . '?' . SID . '>' . _('Select a Different BOM') . '</a></div><br />';
+ echo '<br /><div class=centre><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Select a Different BOM') . '</a></div><br />';
echo '<table class="selection">';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
- stockmaster.description,
- stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='M'";
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom, stockmaster
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.stockid=bom.parent
+ AND stockmaster.mbflag='M'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -429,7 +429,7 @@
if( DB_num_rows($result) > 0 ) {
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -437,10 +437,12 @@
$reqnl = $ix;
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
@@ -450,18 +452,20 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td></tr>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='K'";
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.mbflag='K'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -470,18 +474,20 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td></tr>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='G'";
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.mbflag='G'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -490,7 +496,7 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -575,44 +581,46 @@
echo '<br />
<input type="hidden" name="SelectedParent" value="' . $SelectedParent . '" />';
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>'. ('Edit Component Details') .'</font></b></th></tr>';
- echo '<tr><td>' . _('Component') . ':</td><td><b>' . $SelectedComponent . '</b></td></tr>';
+ echo '<tr><td>' . _('Component') . ':</td>
+ <td><b>' . $SelectedComponent . '</b></td>
+ </tr>';
} else { //end of if $SelectedComponent
echo '<input type=hidden name="SelectedParent" value="' . $SelectedParent . '" />';
/* echo "Enter the details of a new component in the fields below. <br />Click on 'Enter Information' to add the new component, once all fields are completed.";
*/
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>' . ('New Component Details') .'</font></b></th></tr>';
echo '<tr><td>' . _('Component code') . ':</td><td>';
echo '<select ' . (in_array('ComponentCode',$Errors) ? 'class="selecterror"' : '' ) .' tabindex="1" name="Component">';
if ($ParentMBflag=='A'){ /*Its an assembly */
$sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid = stockcategory.categoryid
- WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
- OR stockmaster.mbflag !='D')
- AND stockmaster.mbflag !='K'
- AND stockmaster.mbflag !='A'
- AND stockmaster.controlled = 0
- AND stockmaster.stockid != '".$SelectedParent."'
- ORDER BY stockmaster.stockid";
+ stockmaster.description
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid = stockcategory.categoryid
+ WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
+ OR stockmaster.mbflag !='D')
+ AND stockmaster.mbflag !='K'
+ AND stockmaster.mbflag !='A'
+ AND stockmaster.controlled = 0
+ AND stockmaster.stockid != '".$SelectedParent."'
+ ORDER BY stockmaster.stockid";
} else { /*Its either a normal manufac item, phantom, kitset - controlled items ok */
$sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid = stockcategory.categoryid
- WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
- OR stockmaster.mbflag !='D')
- AND stockmaster.mbflag !='K'
- AND stockmaster.mbflag !='A'
- AND stockmaster.stockid != '".$SelectedParent."'
- ORDER BY stockmaster.stockid";
+ stockmaster.description
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid = stockcategory.categoryid
+ WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
+ OR stockmaster.mbflag !='D')
+ AND stockmaster.mbflag !='K'
+ AND stockmaster.mbflag !='A'
+ AND stockmaster.stockid != '".$SelectedParent."'
+ ORDER BY stockmaster.stockid";
}
$ErrMsg = _('Could not retrieve the list of potential components because');
@@ -789,11 +797,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">' .
- '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
- _('to maintain the bill of material for using the options below') . '<br /><font size=1>' .
- _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
- ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'.
- '</font>
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br /><font size=1>' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '</font>
<br />
<table class="selection" cellpadding="3" colspan="4">
<tr><td><font size=1>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
@@ -808,7 +812,7 @@
if (isset($_POST['Search']) AND isset($result) AND !isset($SelectedParent)) {
- echo '<br /><table cellpadding=2 colspan=7 class=selection>';
+ echo '<br /><table cellpadding="2" colspan="7" class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('On Hand') . '</th>
@@ -834,13 +838,13 @@
}
$tab = $j+3;
printf('<td><input tabindex="' . $tab . '" type="submit" name="Select" value="%s"</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td>%s</td></tr>',
- $myrow['stockid'],
- $myrow['description'],
- $StockOnHand,
- $myrow['units']);
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td>%s</td></tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $StockOnHand,
+ $myrow['units']);
$j++;
//end of page full new headings if
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BankAccounts.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -170,16 +170,15 @@
/* Always show the list of accounts */
If (!isset($SelectedBankAccount)) {
$sql = "SELECT bankaccounts.accountcode,
- bankaccounts.bankaccountcode,
- chartmaster.accountname,
- bankaccountname,
- bankaccountnumber,
- bankaddress,
- currcode,
- invoice
- FROM bankaccounts,
- chartmaster
- WHERE bankaccounts.accountcode = chartmaster.accountcode";
+ bankaccounts.bankaccountcode,
+ chartmaster.accountname,
+ bankaccountname,
+ bankaccountnumber,
+ bankaddress,
+ currcode,
+ invoice
+ FROM bankaccounts INNER JOIN chartmaster
+ ON bankaccounts.accountcode = chartmaster.accountcode";
$ErrMsg = _('The bank accounts set up could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $sql;
@@ -198,7 +197,7 @@
</tr>';
$k=0; //row colour counter
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -206,33 +205,33 @@
echo '<tr class="OddTableRows">';
$k++;
}
- if ($myrow[7]==0) {
- $defacc=_('No');
+ if ($myrow['invoice']==0) {
+ $DefaultBankAccount=_('No');
} else {
- $defacc=_('Yes');
+ $DefaultBankAccount=_('Yes');
}
printf('<td>%s<br /><font size=2>%s</font></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
- <td><a href="%s?SelectedBankAccount=%s&delete=1">' . _('Delete') . '</td>
- </tr>',
- $myrow[0],
- $myrow[2],
- $myrow[3],
- $myrow[1],
- $myrow[4],
- $myrow[5],
- $myrow[6],
- $defacc,
- $_SERVER['PHP_SELF'],
- $myrow[0],
- $_SERVER['PHP_SELF'],
- $myrow[0]);
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</td>
+ </tr>',
+ $myrow['accountcode'],
+ $myrow['accountname'],
+ $myrow['bankaccountname'],
+ $myrow['bankaccountcode'],
+ $myrow['bankaccountnumber'],
+ $myrow['bankaddress'],
+ $myrow['currcode'],
+ $DefaultBankAccount,
+ $_SERVER['PHP_SELF'],
+ $myrow['accountcode'],
+ $_SERVER['PHP_SELF'],
+ $myrow['accountcode']);
}
//END WHILE LIST LOOP
@@ -243,25 +242,25 @@
if (isset($SelectedBankAccount)) {
echo '<p>';
- echo '<div class="centre"><p><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Bank Accounts Defined') . '</a></div>';
+ echo '<div class="centre"><p><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show All Bank Accounts Defined') . '</a></div>';
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($SelectedBankAccount) AND !isset($_GET['delete'])) {
//editing an existing bank account - not deleting
$sql = "SELECT accountcode,
- bankaccountname,
- bankaccountcode,
- bankaccountnumber,
- bankaddress,
- currcode,
- invoice
- FROM bankaccounts
- WHERE bankaccounts.accountcode='$SelectedBankAccount'";
+ bankaccountname,
+ bankaccountcode,
+ bankaccountnumber,
+ bankaddress,
+ currcode,
+ invoice
+ FROM bankaccounts
+ WHERE bankaccounts.accountcode='" . $SelectedBankAccount . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -274,30 +273,33 @@
$_POST['CurrCode'] = $myrow['currcode'];
$_POST['DefAccount'] = $myrow['invoice'];
- echo '<input type=hidden name=SelectedBankAccount VALUE=' . $SelectedBankAccount . '>';
- echo '<input type=hidden name=AccountCode VALUE=' . $_POST['AccountCode'] . '>';
- echo '<table class=selection> <tr><td>' . _('Bank Account GL Code') . ':</td><td>';
- echo $_POST['AccountCode'] . '</td></tr>';
+ echo '<input type=hidden name="SelectedBankAccount" value="' . $SelectedBankAccount . '">';
+ echo '<input type=hidden name="AccountCode" value="' . $_POST['AccountCode'] . '">';
+ echo '<table class="selection">
+ <tr><td>' . _('Bank Account GL Code') . ':</td>
+ <td>' . $_POST['AccountCode'] . '</td>
+ </tr>';
} else { //end of if $Selectedbank account only do the else when a new record is being entered
- echo '<table class=selection><tr><td>' . _('Bank Account GL Code') .
- ":</td><td><Select tabindex='1' " . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) ." name='AccountCode'>";
+ echo '<table class="selection">
+ <tr><td>' . _('Bank Account GL Code') . ':</td>
+ <td><select tabindex="1" ' . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) .' name="AccountCode">';
$sql = "SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_ = accountgroups.groupname
- AND accountgroups.pandl = 0
- ORDER BY accountcode";
-
+ accountname
+ FROM chartmaster,
+ accountgroups
+ WHERE chartmaster.group_ = accountgroups.groupname
+ AND accountgroups.pandl = 0
+ ORDER BY accountcode";
+
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected value="';
} else {
- echo '<option VALUE=';
+ echo '<option value="';
}
- echo $myrow['accountcode'] . '>' . $myrow['accountname'];
+ echo $myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
} //end while loop
@@ -319,43 +321,53 @@
}
echo '<tr><td>' . _('Bank Account Name') . ': </td>
- <td><input tabindex="2" ' . (in_array('AccountName',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountName" value="' . $_POST['BankAccountName'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="2" ' . (in_array('AccountName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountName" value="' . $_POST['BankAccountName'] . '" size=40 maxlength=50></td></tr>
<tr><td>' . _('Bank Account Code') . ': </td>
- <td><input tabindex="3" ' . (in_array('AccountCode',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountCode" value="' . $_POST['BankAccountCode'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="3" ' . (in_array('AccountCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountCode" value="' . $_POST['BankAccountCode'] . '" size=40 maxlength=50></td></tr>
<tr><td>' . _('Bank Account Number') . ': </td>
- <td><input tabindex="3" ' . (in_array('AccountNumber',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountNumber" value="' . $_POST['BankAccountNumber'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="3" ' . (in_array('AccountNumber',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountNumber" value="' . $_POST['BankAccountNumber'] . '" size="40" maxlength="50"></td></tr>
<tr><td>' . _('Bank Address') . ': </td>
- <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size=40 maxlength=50></td></tr>
- <tr><td>' . _('Currency Of Account') . ': </td><td><select tabindex="5" name="CurrCode">';
+ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50"></td></tr>
+ <tr><td>' . _('Currency Of Account') . ': </td>
+ <td><select tabindex="5" name="CurrCode">';
if (!isset($_POST['CurrCode']) OR $_POST['CurrCode']==''){
$_POST['CurrCode'] = $_SESSION['CompanyRecord']['currencydefault'];
}
-$result = DB_query('SELECT currabrev, currency FROM currencies',$db);
+$result = DB_query("SELECT currabrev,
+ currency
+ FROM currencies",$db);
+
while ($myrow = DB_fetch_array($result)) {
if ($myrow['currabrev']==$_POST['CurrCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected value="';
} else {
- echo '<option VALUE=';
+ echo '<option value="';
}
- echo $myrow['currabrev'] . '>' . $myrow['currabrev'];
+ echo $myrow['currabrev'] . '">' . $myrow['currabrev'] . '</option>';
} //end while loop
echo '</select></td>';
-echo '<tr><td>' . _('Default for Invoices') . ': </td><td><select tabindex="6" name="DefAccount">';
+echo '<tr><td>' . _('Default for Invoices') . ': </td>
+ <td><select tabindex="6" name="DefAccount">';
if (!isset($_POST['DefAccount']) OR $_POST['DefAccount']==''){
- $_POST['DefAccount'] = $_SESSION['CompanyRecord']['currencydefault'];
+ $_POST['DefAccount'] = $_SESSION['CompanyRecord']['currencydefault'];
}
if (isset($SelectedBankAccount)) {
- $result = DB_query("SELECT invoice FROM bankaccounts where accountcode ='" . $SelectedBankAccount ."'",$db);
+ $result = DB_query("SELECT invoice
+ FROM bankaccounts
+ WHERE accountcode ='" . $SelectedBankAccount ."'",
+ $db);
while ($myrow = DB_fetch_array($result)) {
if ($myrow['invoice']== 1) {
- echo '<option selected VALUE=1>'._('Yes').'</option><option value=0>'._('No').'</option>';
+ echo '<option selected value="1">'._('Yes').'</option>
+ <option value="0">'._('No').'</option>';
} else {
- echo '<option selected VALUE=0>'._('No').'</option><option value=1>'._('Yes').'</option>';
+ echo '<option selected value="0">'._('No').'</option>
+ <option value="1">'._('Yes').'</option>';
}
}//end while loop
} else {
@@ -366,8 +378,8 @@
echo '</select></td>';
echo '</tr></table><br />
- <div class="centre"><input tabindex="7" type="Submit" name="submit" value="'. _('Enter Information') .'"></div>';
+ <div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'"></div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BankMatching.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -57,13 +57,14 @@
((isset($_POST['AmtClear_' . $Counter]) AND $_POST['AmtClear_' . $Counter]<0 AND $Type=='Payments') OR
($Type=='Receipts' AND (isset($_POST['AmtClear_' . $Counter]) and $_POST['AmtClear_' . $Counter]>0)))){
/*if the amount entered was numeric and negative for a payment or positive for a receipt */
+
$sql = "UPDATE banktrans SET amountcleared=" . $_POST['AmtClear_' . $Counter] . "
WHERE banktransid='" . $_POST['BankTrans_' . $Counter]."'";
$ErrMsg = _('Could not update the amount matched off this bank transaction because');
$result = DB_query($sql,$db,$ErrMsg);
- } elseif (isset($_POST['Unclear_' . $Counter]) and $_POST['Unclear_' . $Counter]==True){
+ } elseif (isset($_POST['Unclear_' . $Counter]) AND $_POST['Unclear_' . $Counter]==True){
$sql = "UPDATE banktrans SET amountcleared = 0
WHERE banktransid='" . $_POST['BankTrans_' . $Counter]."'";
$ErrMsg = _('Could not unclear this bank transaction because');
@@ -76,13 +77,15 @@
echo '<div class="page_help_text">' . _('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.') . '</div><br>';
-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 '<input type="hidden" name="Type" Value="' . $Type . '">';
+echo '<input type="hidden" name="Type" value="' . $Type . '">';
-echo '<table class=selection><tr>';
-echo '<td align=left>' . _('Bank Account') . ':</td><td colspan=3><select tabindex="1" name="BankAccount">';
+echo '<table class="selection">
+ <tr>
+ <td align="left">' . _('Bank Account') . ':</td>
+ <td colspan=3><select tabindex="1" name="BankAccount">';
$sql = "SELECT accountcode, bankaccountname FROM bankaccounts";
$resultBankActs = DB_query($sql,$db);
@@ -117,23 +120,23 @@
echo '<option value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
} else {
echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
+ echo '<option selected value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td colspan=3>' . _('Choose to display only the first 20 matching') . ' ' . $TypeName . ' ' .
_('or all') . ' ' . $TypeName . ' ' . _('meeting the criteria') . ':</td><td><select tabindex="5" name="First20_or_All">';
if ($_POST['First20_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
+ echo '<option selected value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
+ echo '<option value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" VALUE="' . _('Show selected') . ' ' . $TypeName . '">';
+echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '">';
echo '<p><a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a></div>';
echo '<hr />';
@@ -165,10 +168,10 @@
amount/exrate as amt,
banktranstype
FROM banktrans
- WHERE amount <0
- AND transdate >= '". $SQLAfterDate . "'
- AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST['BankAccount'] . "'
+ WHERE amount < 0
+ AND transdate >= '". $SQLAfterDate . "'
+ AND transdate <= '" . $SQLBeforeDate . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -180,9 +183,9 @@
banktranstype
FROM banktrans
WHERE amount >0
- AND transdate >= '". $SQLAfterDate . "'
- AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST['BankAccount'] . "'
+ AND transdate >= '". $SQLAfterDate . "'
+ AND transdate <= '" . $SQLBeforeDate . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
}
} else { /*it must be only the outstanding bank trans required */
@@ -228,7 +231,7 @@
<th>' . _('Date') . '</th>
<th>' . _('Amount') . '</th>
<th>' . _('Outstanding') . '</th>
- <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
</tr>';
echo '<table cellpadding=2 class="selection">' . $TableHeader;
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/COGSGLPostings.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -15,8 +15,7 @@
$SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID'];
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
if (isset($_POST['submit'])) {
@@ -134,45 +133,39 @@
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
/* The required group does not seem to exist so we create it */
- $sql = "INSERT INTO accountgroups (
- groupname,
- sectioninaccounts,
- pandl,
- sequenceintb
- ) VALUES (
- 'Sales',
- '1',
- '1',
- '10')";
-
+ $sql = "INSERT INTO accountgroups ( groupname,
+ sectioninaccounts,
+ pandl,
+ sequenceintb )
+ VALUES ('Sales',
+ '1',
+ '1',
+ '10')";
+
$result = DB_query($sql,$db);
}
$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 */
- $sql = "INSERT INTO chartmaster (
- accountcode,
- accountname,
- group_
- )
- VALUES (
- '1',
- 'Default Sales/Discounts',
- 'Sales'
- )";
+ $sql = "INSERT INTO chartmaster (accountcode,
+ accountname,
+ group_)
+ VALUES ('1',
+ 'Default Sales/Discounts',
+ 'Sales'
+ )";
$result = DB_query($sql,$db);
}
- $sql = "INSERT INTO cogsglpostings (
- area,
- stkcat,
- salestype,
- glcode)
- VALUES ('AN',
- 'ANY',
- 'AN',
- '1')";
+ $sql = "INSERT INTO cogsglpostings ( area,
+ stkcat,
+ salestype,
+ glcode)
+ VALUES ('AN',
+ 'ANY',
+ 'AN',
+ '1')";
$result = DB_query($sql,$db);
}
@@ -205,21 +198,21 @@
}
printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
- </tr>',
- $myrow['area'],
- $myrow['stkcat'],
- $myrow['salestype'],
- $myrow['salestype'],
- $_SERVER['PHP_SELF'] . '?',
- $myrow['id'],
- $_SERVER['PHP_SELF'] . '?',
- $myrow['id']);
-
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ </tr>',
+ $myrow['area'],
+ $myrow['stkcat'],
+ $myrow['salestype'],
+ $myrow['salestype'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['id'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['id']);
+
}//END WHILE LIST LOOP
echo '</table>';
}
@@ -239,11 +232,11 @@
//editing an existing cost of sales posting record
$sql = "SELECT stkcat,
- glcode,
- area,
- salestype
- FROM cogsglpostings
- WHERE id='".$SelectedCOGSPostingID."'";
+ glcode,
+ area,
+ salestype
+ FROM cogsglpostings
+ WHERE id='".$SelectedCOGSPostingID."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -285,7 +278,7 @@
echo '</select></td></tr>
<tr><td>' . _('Stock Category') . ':</td>
<td><select tabindex=2 name="StkCat">
- <option VALUE="ANY">' . _('Any Other') . '</option>';
+ <option value="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['StkCat']) and $myrow['categoryid']==$_POST['StkCat']) {
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/CompanyPreferences.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -23,7 +23,6 @@
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
-
//first off validate inputs sensible
if (strlen($_POST['CoyName']) > 40 OR strlen($_POST['CoyName'])==0) {
@@ -95,33 +94,32 @@
if ($InputError !=1){
- $sql = "UPDATE companies SET
- coyname='" . $_POST['CoyName'] . "',
- companynumber = '" . $_POST['CompanyNumber'] . "',
- gstno='" . $_POST['GSTNo'] . "',
- regoffice1='" . $_POST['RegOffice1'] . "',
- regoffice2='" . $_POST['RegOffice2'] . "',
- regoffice3='" . $_POST['RegOffice3'] . "',
- regoffice4='" . $_POST['RegOffice4'] . "',
- regoffice5='" . $_POST['RegOffice5'] . "',
- regoffice6='" . $_POST['RegOffice6'] . "',
- telephone='" . $_POST['Telephone'] . "',
- fax='" . $_POST['Fax'] . "',
- email='" . $_POST['Email'] . "',
- currencydefault='" . $_POST['CurrencyDefault'] . "',
- debtorsact='" . $_POST['DebtorsAct'] . "',
- pytdiscountact='" . $_POST['PytDiscountAct'] . "',
- creditorsact='" . $_POST['CreditorsAct'] . "',
- payrollact='" . $_POST['PayrollAct'] . "',
- grnact='" . $_POST['GRNAct'] . "',
- exchangediffact='" . $_POST['ExchangeDiffAct'] . "',
- purchasesexchangediffact='" . $_POST['PurchasesExchangeDiffAct'] . "',
- retainedearnings='" . $_POST['RetainedEarnings'] . "',
- gllink_debtors='" . $_POST['GLLink_Debtors'] . "',
- gllink_creditors='" . $_POST['GLLink_Creditors'] . "',
- gllink_stock='" . $_POST['GLLink_Stock'] ."',
- freightact='" . $_POST['FreightAct'] . "'
- WHERE coycode=1";
+ $sql = "UPDATE companies SET coyname='" . $_POST['CoyName'] . "',
+ companynumber = '" . $_POST['CompanyNumber'] . "',
+ gstno='" . $_POST['GSTNo'] . "',
+ regoffice1='" . $_POST['RegOffice1'] . "',
+ regoffice2='" . $_POST['RegOffice2'] . "',
+ regoffice3='" . $_POST['RegOffice3'] . "',
+ regoffice4='" . $_POST['RegOffice4'] . "',
+ regoffice5='" . $_POST['RegOffice5'] . "',
+ regoffice6='" . $_POST['RegOffice6'] . "',
+ telephone='" . $_POST['Telephone'] . "',
+ fax='" . $_POST['Fax'] . "',
+ email='" . $_POST['Email'] . "',
+ currencydefault='" . $_POST['CurrencyDefault'] . "',
+ debtorsact='" . $_POST['DebtorsAct'] . "',
+ pytdiscountact='" . $_POST['PytDiscountAct'] . "',
+ creditorsact='" . $_POST['CreditorsAct'] . "',
+ payrollact='" . $_POST['PayrollAct'] . "',
+ grnact='" . $_POST['GRNAct'] . "',
+ exchangediffact='" . $_POST['ExchangeDiffAct'] . "',
+ purchasesexchangediffact='" . $_POST['PurchasesExchangeDiffAct'] . "',
+ retainedearnings='" . $_POST['RetainedEarnings'] . "',
+ gllink_debtors='" . $_POST['GLLink_Debtors'] . "',
+ gllink_creditors='" . $_POST['GLLink_Creditors'] . "',
+ gllink_stock='" . $_POST['GLLink_Stock'] ."',
+ freightact='" . $_POST['FreightAct'] . "'
+ WHERE coycode=1";
$ErrMsg = _('The company preferences could not be updated because');
$result = DB_query($sql,$db,$ErrMsg);
@@ -136,7 +134,7 @@
$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);
@@ -155,38 +153,38 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title.'</p><br />';
-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'] . '" />';
-echo '<table class=selection>';
+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);
@@ -222,63 +220,64 @@
}
echo '<tr><td>' . _('Name') . ' (' . _('to appear on reports') . '):</td>
- <td><input '.(in_array('CoyName',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="1" type="Text" Name="CoyName" value="' . stripslashes($_POST['CoyName']) . '" size=52 maxlength=50></td>
+ <td><input '.(in_array('CoyName',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="1" type="text" Name="CoyName" value="' . stripslashes($_POST['CoyName']) . '" size=52 maxlength=50></td>
</tr>';
echo '<tr><td>' . _('Official Company Number') . ':</td>
- <td><input '.(in_array('CoyNumber',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="2" type="Text" Name="CompanyNumber" value="' . $_POST['CompanyNumber'] . '" size=22 maxlength=20></td>
+ <td><input '.(in_array('CoyNumber',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="2" type="text" name="CompanyNumber" value="' . $_POST['CompanyNumber'] . '" size=22 maxlength=20></td>
</tr>';
echo '<tr><td>' . _('Tax Authority Reference') . ':</td>
- <td><input '.(in_array('TaxRef',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="3" type="Text" Name="GSTNo" value="' . $_POST['GSTNo'] . '" size=22 maxlength=20></td>
+ <td><input '.(in_array('TaxRef',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="3" type="text" name="GSTNo" value="' . $_POST['GSTNo'] . '" size=22 maxlength=20></td>
</tr>';
echo '<tr><td>' . _('Address Line 1') . ':</td>
- <td><input '.(in_array('RegOffice1',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="Text" Name="RegOffice1" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice1']) . '"></td>
+ <td><input '.(in_array('RegOffice1',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" name="RegOffice1" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice1']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 2') . ':</td>
- <td><input '.(in_array('RegOffice2',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="5" type="Text" Name="RegOffice2" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice2']) . '"></td>
+ <td><input '.(in_array('RegOffice2',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="5" type="text" name="RegOffice2" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice2']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 3') . ':</td>
- <td><input '.(in_array('RegOffice3',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="6" type="Text" Name="RegOffice3" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice3']) . '"></td>
+ <td><input '.(in_array('RegOffice3',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="6" type="text" name="RegOffice3" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice3']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 4') . ':</td>
- <td><input '.(in_array('RegOffice4',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="7" type="Text" Name="RegOffice4" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice4']) . '"></td>
+ <td><input '.(in_array('RegOffice4',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="7" type="text" name="RegOffice4" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice4']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 5') . ':</td>
- <td><input '.(in_array('RegOffice5',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="8" type="Text" Name="RegOffice5" size=22 maxlength=20 value="' . stripslashes($_POST['RegOffice5']) . '"></td>
+ <td><input '.(in_array('RegOffice5',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="8" type="text" name="RegOffice5" size=22 maxlength=20 value="' . stripslashes($_POST['RegOffice5']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 6') . ':</td>
- <td><input '.(in_array('RegOffice6',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="9" type="Text" Name="RegOffice6" size=17 maxlength=15 value="' . stripslashes($_POST['RegOffice6']) . '"></td>
+ <td><input '.(in_array('RegOffice6',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="9" type="text" name="RegOffice6" size=17 maxlength=15 value="' . stripslashes($_POST['RegOffice6']) . '"></td>
</tr>';
echo '<tr><td>' . _('Telephone Number') . ':</td>
- <td><input '.(in_array('Telephone',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="10" type="Text" Name="Telephone" size=26 maxlength=25 value="' . $_POST['Telephone'] . '"></td>
+ <td><input '.(in_array('Telephone',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="10" type="text" name="Telephone" size=26 maxlength=25 value="' . $_POST['Telephone'] . '"></td>
</tr>';
echo '<tr><td>' . _('Facsimile Number') . ':</td>
- <td><input '.(in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="Text" Name="Fax" size=26 maxlength=25 value="' . $_POST['Fax'] . '"></td>
+ <td><input '.(in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" name="Fax" size=26 maxlength=25 value="' . $_POST['Fax'] . '"></td>
</tr>';
echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input '.(in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="Text" Name="Email" size=50 maxlength=55 value="' . $_POST['Email'] . '"></td>
+ <td><input '.(in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="text" name="Email" size=50 maxlength=55 value="' . $_POST['Email'] . '"></td>
</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>';
+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'] . '</option>';
+ echo '<option selected value="'. $myrow['currabrev'] . '">' . $myrow['currency'] . '</opti...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-13 10:23:54
|
Revision: 4596
http://web-erp.svn.sourceforge.net/web-erp/?rev=4596&view=rev
Author: daintree
Date: 2011-06-13 10:23:44 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
xhtml case indent etc
Modified Paths:
--------------
trunk/Areas.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatch_Invoice.php
trunk/StockLocTransfer.php
trunk/doc/Change.log
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/Areas.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -68,7 +68,7 @@
$sql = "UPDATE areas SET
areadescription='" . $_POST['AreaDescription'] . "'
- WHERE areacode = '$SelectedArea'";
+ WHERE areacode = '" . $SelectedArea . "'";
$msg = _('Area code') . ' ' . $SelectedArea . ' ' . _('has been updated');
@@ -172,13 +172,13 @@
//end of ifs and buts!
if (isset($SelectedArea)) {
- echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Review Areas Defined') . '</a></div>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Review Areas Defined') . '</a></div>';
}
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><br>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '"><br>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -187,7 +187,7 @@
$sql = "SELECT areacode,
areadescription
FROM areas
- WHERE areacode='$SelectedArea'";
+ WHERE areacode='" . $SelectedArea . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -195,8 +195,8 @@
$_POST['AreaCode'] = $myrow['areacode'];
$_POST['AreaDescription'] = $myrow['areadescription'];
- echo '<input type=hidden name=SelectedArea VALUE=' . $SelectedArea . '>';
- echo '<input type=hidden name=AreaCode VALUE=' .$_POST['AreaCode'] . '>';
+ echo '<input type=hidden name=SelectedArea value="' . $SelectedArea . '">';
+ echo '<input type=hidden name=AreaCode value="' .$_POST['AreaCode'] . '">';
echo '<table class=selection><tr><td>' . _('Area Code') . ':</td><td>' . $_POST['AreaCode'] . '</td></tr>';
} else {
@@ -206,7 +206,7 @@
if (!isset($_POST['AreaDescription'])) {
$_POST['AreaDescription'] = '';
}
- echo '<table class=selection>
+ echo '<table class="selection">
<tr>
<td>' . _('Area Code') . ':</td>
<td><input tabindex="1" ' . (in_array('AreaCode',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="AreaCode" value="' . $_POST['AreaCode'] . '" size=3 maxlength=3></td>
@@ -217,7 +217,7 @@
<td><input tabindex="2" ' . (in_array('AreaDescription',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="AreaDescription" value="' . $_POST['AreaDescription'] .'" size=26 maxlength=25></td>
</tr>';
- echo '<tr><td colspan=2><div class="centre"><input tabindex="3" type="Submit" name="submit" value=' . _('Enter Information') .'></div></td></tr>';
+ echo '<tr><td colspan=2><div class="centre"><input tabindex="3" type="submit" name="submit" value=' . _('Enter Information') .'></div></td></tr>';
echo '</table></form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMInquiry.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.12 $ */
+
/* $Id$*/
-//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Costed Bill Of Material');
@@ -14,16 +13,20 @@
}
if (!isset($_POST['StockID'])) {
- echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." method=post><b><br></b>".
- '<div class="page_help_text">'. _('Select a manufactured part') . " (" . _('or Assembly or Kit part') . ") " .
- _('to view the costed bill of materials') . "." . "<br><font size=1>" .
- _('Parts must be defined in the stock item entry') . "/" . _('modification screen as manufactured') .
- ", " . _('kits or assemblies to be available for construction of a bill of material').'</div>'
- ."</font><br><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>" . _('Enter text extracts in the') .
- " <b>" . _('description') . "</b>:</font></td><td><input tabindex='1' type='Text' name='Keywords' size=20 maxlength=25></td>
- <td><font size=3><b>" . _('OR') . "</b></font></td><td><font size=1>" . _('Enter extract of the') .
- " <b>" . _('Stock Code') . "</b>:</font></td><td><input tabindex='2' type='Text' name='StockCode' size=15 maxlength=20></td>
- </tr></table><br><div class='centre'><input tabindex='3' type=submit name='Search' VALUE=" . _('Search Now') . "></div><br>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><b><br></b>'.
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
+ _('to view the costed bill of materials') . '<br /><font size=1>' .
+ _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
+ ', ' . _('kits or assemblies to be available for construction of a bill of material').'</div>'
+ .'</font><br />
+ <table class="selection" cellpadding="3" colspan="4">
+ <tr><td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25"></td>
+ <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20"></td>
+ </tr></table>
+ <br /><div class="centre"><input tabindex="3" type="submit" name="Search" value=' . _('Search Now') . '></div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
}
@@ -90,10 +93,10 @@
echo '<br><hr><br><table class=selection cellpadding=2 colspan=7>';
$TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ <th>' . _('Description') . '</th>
+ <th>' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
echo $TableHeader;
@@ -113,15 +116,14 @@
$StockOnHand = number_format($myrow['totalonhand'],2);
}
$tabindex=$j+4;
- printf("<td><input tabindex='".$tabindex."' type=submit name='StockID' VALUE='%s'</td>
+ printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s"</td>
<td>%s</td>
- <td class=number>%s</td>
- <td>%s</td></tr>",
- $myrow['stockid'],
- $myrow['description'],
- $StockOnHand,
- $myrow['units']
- );
+ <td class=number>%s</td>
+ <td>%s</td></tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $StockOnHand,
+ $myrow['units'] );
$j++;
//end of page full new headings if
}
@@ -131,17 +133,18 @@
}
if (isset($StockID) and $StockID!=""){
- /*CCF modification */
-// $result = DB_query("SELECT description, units FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $result = DB_query("SELECT description, units, labourcost, overheadcost FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- /*CCF end modification */
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
+ WHERE stockid='" . $StockID . "'",
+ $db);
$myrow = DB_fetch_array($result);
- /*CCF modification */
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
- /*CCF end modification */
-
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -149,7 +152,8 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster ON bom.component = stockmaster.stockid
+ FROM bom INNER JOIN stockmaster
+ ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
AND bom.effectiveto > Now()";
@@ -161,20 +165,17 @@
prnMsg(_('The bill of material for this part is not set up') . ' - ' . _('there are no components defined for it'),'warn');
} else {
echo '<a href="'.$rootpath.'/index.php">'._('Return to Main Menu').'</a>';
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo "<table class=selection cellpadding=2>";
- echo "<tr><th colspan=5><div class='centre'><font size=4><b>" . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] .
- "</b></font></div></th></tr>";
+ echo '<table class="selection" cellpadding="2">';
+ echo '<tr><th colspan=5><div class="centre"><font size=4><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b></font></div></th></tr>';
$TableHeader = '<tr>
- <th>' . _('Component') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Unit Cost') . '</th>
- <th>' . _('Total Cost') . '</th>
- </tr>';
-
+ <th>' . _('Component') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Unit Cost') . '</th>
+ <th>' . _('Total Cost') . '</th>
+ </tr>';
echo $TableHeader;
$j = 1;
@@ -192,39 +193,37 @@
$k++;
}
- $ComponentLink = "<a href='$rootpath/SelectProduct.php?" . SID . "&StockID=" . $myrow['component'] . "'>" . $myrow['component'] . "</a>";
+ $ComponentLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['component'] . '">' . $myrow['component'] . '</a>';
- /* Component Code Description Quantity Std Cost* Total Cost */
- printf("<td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td class=number>%.2f</td>
- <td class=number>%.2f</td>
- </tr>",
- $ComponentLink,
- $myrow['description'],
- number_format($myrow['quantity'],
- $myrow['decimalplaces']),
- $myrow['standardcost'],
- $myrow['componentcost']);
+ /* Component Code Description Quantity Std Cost Total Cost */
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%.2f</td>
+ <td class=number>%.2f</td>
+ </tr>',
+ $ComponentLink,
+ $myrow['description'],
+ number_format($myrow['quantity'],$myrow['decimalplaces']),
+ $myrow['standardcost'],
+ $myrow['componentcost']);
$TotalCost += $myrow['componentcost'];
$j++;
}
- /*CCF modification */
+
$TotalCost += $ParentLabourCost;
echo '<tr>
- <td colspan=4 class=number><b>' . _('Labour Cost') . '</b></td>
- <td class=number><b>' . number_format($ParentLabourCost,2) . '</b></td> </tr>';
+ <td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
+ <td class=number><b>' . number_format($ParentLabourCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td></tr>';
$TotalCost += $ParentOverheadCost;
- echo '<tr><td colspan=4 class=number><b>' . _('Overhead Cost') . '</b></td>
- <td class=number><b>' . number_format($ParentOverheadCost,2) . '</b></td></tr>';
- /*CCF end modification */
+ echo '<tr><td colspan="4" class="number"><b>' . _('Overhead Cost') . '</b></td>
+ <td class=number><b>' . number_format($ParentOverheadCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td></tr>';
echo '<tr>
<td colspan=4 class=number><b>' . _('Total Cost') . '</b></td>
- <td class=number><b>' . number_format($TotalCost,2) . '</b></td>
+ <td class=number><b>' . number_format($TotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
</tr>';
echo '</table>';
@@ -234,9 +233,9 @@
}
if (!isset($_POST['StockID']) or $_POST['StockID']=='') {
- echo "<script>defaultControl(document.forms[0].StockCode);</script>";
+ echo '<script>defaultControl(document.forms[0].StockCode);</script>';
}
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMListing.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -77,7 +77,7 @@
$SQL = "SELECT description FROM stockmaster WHERE stockmaster.stockid = '" . $BOMList['parent'] . "'";
$ParentResult = DB_query($SQL,$db);
$ParentRow = DB_fetch_row($ParentResult);
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,400-$Left_Margin,$FontSize,$BOMList['parent'] . ' - ' . $ParentRow[0],'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,400-$Left_Margin,$FontSize,$BOMList['parent'] . ' - ' . $ParentRow[0],'left');
$ParentPart = $BOMList['parent'];
}
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BOMs.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -18,7 +18,7 @@
$c_result = DB_query("SELECT parent,
component
FROM bom WHERE parent='" . $parent. "'"
- ,$db);
+ ,$db);
if (DB_num_rows($c_result) > 0) {
while ($row = DB_fetch_array($c_result)) {
@@ -143,7 +143,7 @@
<td class=number>%s</td>
<td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
<td>'.$DrillText.'</a></td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s">' . _('Delete') . '</a></td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
$myrow[0],
@@ -216,13 +216,13 @@
if (!Is_Date($_POST['EffectiveAfter'])) {
$InputError = 1;
- prnMsg(_('The effective after date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy'),'error');
+ prnMsg(_('The effective after date field must be a date in the format') . ' ' .$_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'EffectiveAfter';
$i++;
}
if (!Is_Date($_POST['EffectiveTo'])) {
$InputError = 1;
- prnMsg(_('The effective to date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy'),'error');
+ prnMsg(_('The effective to date field must be a date in the format') . ' ' .$_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'EffectiveTo';
$i++;
}
@@ -380,9 +380,9 @@
//DisplayBOMItems($SelectedParent, $db);
$sql = "SELECT stockmaster.description,
- stockmaster.mbflag
- FROM stockmaster
- WHERE stockmaster.stockid='" . $SelectedParent . "'";
+ stockmaster.mbflag
+ FROM stockmaster
+ WHERE stockmaster.stockid='" . $SelectedParent . "'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -410,16 +410,16 @@
break;
}
- echo '<br /><div class=centre><a href=' . $_SERVER['PHP_SELF'] . '?' . SID . '>' . _('Select a Different BOM') . '</a></div><br />';
+ echo '<br /><div class=centre><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Select a Different BOM') . '</a></div><br />';
echo '<table class="selection">';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
- stockmaster.description,
- stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='M'";
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom, stockmaster
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.stockid=bom.parent
+ AND stockmaster.mbflag='M'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -429,7 +429,7 @@
if( DB_num_rows($result) > 0 ) {
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -437,10 +437,12 @@
$reqnl = $ix;
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
@@ -450,18 +452,20 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td></tr>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='K'";
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.mbflag='K'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -470,18 +474,20 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
echo '</div></td></tr>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent, stockmaster.description, stockmaster.mbflag
- FROM bom, stockmaster
- WHERE bom.component='".$SelectedParent."'
- AND stockmaster.stockid=bom.parent
- AND stockmaster.mbflag='G'";
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM bom INNER JOIN stockmaster
+ ON bom.parent=stockmaster.stockid
+ WHERE bom.component='".$SelectedParent."'
+ AND stockmaster.mbflag='G'";
$ErrMsg = _('Could not retrieve the description of the parent part because');
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
@@ -490,7 +496,7 @@
echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?' . SID . 'Select='.$myrow['parent'].'">'.
+ echo (($ix)?', ':'').'<a href="'.$_SERVER['PHP_SELF'] . '?Select='.$myrow['parent'].'">'.
$myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
@@ -575,44 +581,46 @@
echo '<br />
<input type="hidden" name="SelectedParent" value="' . $SelectedParent . '" />';
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>'. ('Edit Component Details') .'</font></b></th></tr>';
- echo '<tr><td>' . _('Component') . ':</td><td><b>' . $SelectedComponent . '</b></td></tr>';
+ echo '<tr><td>' . _('Component') . ':</td>
+ <td><b>' . $SelectedComponent . '</b></td>
+ </tr>';
} else { //end of if $SelectedComponent
echo '<input type=hidden name="SelectedParent" value="' . $SelectedParent . '" />';
/* echo "Enter the details of a new component in the fields below. <br />Click on 'Enter Information' to add the new component, once all fields are completed.";
*/
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th colspan=13><div class="centre"><font color=blue size=3><b>' . ('New Component Details') .'</font></b></th></tr>';
echo '<tr><td>' . _('Component code') . ':</td><td>';
echo '<select ' . (in_array('ComponentCode',$Errors) ? 'class="selecterror"' : '' ) .' tabindex="1" name="Component">';
if ($ParentMBflag=='A'){ /*Its an assembly */
$sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid = stockcategory.categoryid
- WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
- OR stockmaster.mbflag !='D')
- AND stockmaster.mbflag !='K'
- AND stockmaster.mbflag !='A'
- AND stockmaster.controlled = 0
- AND stockmaster.stockid != '".$SelectedParent."'
- ORDER BY stockmaster.stockid";
+ stockmaster.description
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid = stockcategory.categoryid
+ WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
+ OR stockmaster.mbflag !='D')
+ AND stockmaster.mbflag !='K'
+ AND stockmaster.mbflag !='A'
+ AND stockmaster.controlled = 0
+ AND stockmaster.stockid != '".$SelectedParent."'
+ ORDER BY stockmaster.stockid";
} else { /*Its either a normal manufac item, phantom, kitset - controlled items ok */
$sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid = stockcategory.categoryid
- WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
- OR stockmaster.mbflag !='D')
- AND stockmaster.mbflag !='K'
- AND stockmaster.mbflag !='A'
- AND stockmaster.stockid != '".$SelectedParent."'
- ORDER BY stockmaster.stockid";
+ stockmaster.description
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid = stockcategory.categoryid
+ WHERE ((stockcategory.stocktype='L' AND stockmaster.mbflag ='D')
+ OR stockmaster.mbflag !='D')
+ AND stockmaster.mbflag !='K'
+ AND stockmaster.mbflag !='A'
+ AND stockmaster.stockid != '".$SelectedParent."'
+ ORDER BY stockmaster.stockid";
}
$ErrMsg = _('Could not retrieve the list of potential components because');
@@ -789,11 +797,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">' .
- '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
- _('to maintain the bill of material for using the options below') . '<br /><font size=1>' .
- _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
- ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'.
- '</font>
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br /><font size=1>' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '</font>
<br />
<table class="selection" cellpadding="3" colspan="4">
<tr><td><font size=1>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
@@ -808,7 +812,7 @@
if (isset($_POST['Search']) AND isset($result) AND !isset($SelectedParent)) {
- echo '<br /><table cellpadding=2 colspan=7 class=selection>';
+ echo '<br /><table cellpadding="2" colspan="7" class="selection">';
$TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('On Hand') . '</th>
@@ -834,13 +838,13 @@
}
$tab = $j+3;
printf('<td><input tabindex="' . $tab . '" type="submit" name="Select" value="%s"</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td>%s</td></tr>',
- $myrow['stockid'],
- $myrow['description'],
- $StockOnHand,
- $myrow['units']);
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td>%s</td></tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $StockOnHand,
+ $myrow['units']);
$j++;
//end of page full new headings if
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BankAccounts.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -170,16 +170,15 @@
/* Always show the list of accounts */
If (!isset($SelectedBankAccount)) {
$sql = "SELECT bankaccounts.accountcode,
- bankaccounts.bankaccountcode,
- chartmaster.accountname,
- bankaccountname,
- bankaccountnumber,
- bankaddress,
- currcode,
- invoice
- FROM bankaccounts,
- chartmaster
- WHERE bankaccounts.accountcode = chartmaster.accountcode";
+ bankaccounts.bankaccountcode,
+ chartmaster.accountname,
+ bankaccountname,
+ bankaccountnumber,
+ bankaddress,
+ currcode,
+ invoice
+ FROM bankaccounts INNER JOIN chartmaster
+ ON bankaccounts.accountcode = chartmaster.accountcode";
$ErrMsg = _('The bank accounts set up could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $sql;
@@ -198,7 +197,7 @@
</tr>';
$k=0; //row colour counter
- while ($myrow = DB_fetch_row($result)) {
+ while ($myrow = DB_fetch_array($result)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -206,33 +205,33 @@
echo '<tr class="OddTableRows">';
$k++;
}
- if ($myrow[7]==0) {
- $defacc=_('No');
+ if ($myrow['invoice']==0) {
+ $DefaultBankAccount=_('No');
} else {
- $defacc=_('Yes');
+ $DefaultBankAccount=_('Yes');
}
printf('<td>%s<br /><font size=2>%s</font></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
- <td><a href="%s?SelectedBankAccount=%s&delete=1">' . _('Delete') . '</td>
- </tr>',
- $myrow[0],
- $myrow[2],
- $myrow[3],
- $myrow[1],
- $myrow[4],
- $myrow[5],
- $myrow[6],
- $defacc,
- $_SERVER['PHP_SELF'],
- $myrow[0],
- $_SERVER['PHP_SELF'],
- $myrow[0]);
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</td>
+ </tr>',
+ $myrow['accountcode'],
+ $myrow['accountname'],
+ $myrow['bankaccountname'],
+ $myrow['bankaccountcode'],
+ $myrow['bankaccountnumber'],
+ $myrow['bankaddress'],
+ $myrow['currcode'],
+ $DefaultBankAccount,
+ $_SERVER['PHP_SELF'],
+ $myrow['accountcode'],
+ $_SERVER['PHP_SELF'],
+ $myrow['accountcode']);
}
//END WHILE LIST LOOP
@@ -243,25 +242,25 @@
if (isset($SelectedBankAccount)) {
echo '<p>';
- echo '<div class="centre"><p><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Bank Accounts Defined') . '</a></div>';
+ echo '<div class="centre"><p><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show All Bank Accounts Defined') . '</a></div>';
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($SelectedBankAccount) AND !isset($_GET['delete'])) {
//editing an existing bank account - not deleting
$sql = "SELECT accountcode,
- bankaccountname,
- bankaccountcode,
- bankaccountnumber,
- bankaddress,
- currcode,
- invoice
- FROM bankaccounts
- WHERE bankaccounts.accountcode='$SelectedBankAccount'";
+ bankaccountname,
+ bankaccountcode,
+ bankaccountnumber,
+ bankaddress,
+ currcode,
+ invoice
+ FROM bankaccounts
+ WHERE bankaccounts.accountcode='" . $SelectedBankAccount . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -274,30 +273,33 @@
$_POST['CurrCode'] = $myrow['currcode'];
$_POST['DefAccount'] = $myrow['invoice'];
- echo '<input type=hidden name=SelectedBankAccount VALUE=' . $SelectedBankAccount . '>';
- echo '<input type=hidden name=AccountCode VALUE=' . $_POST['AccountCode'] . '>';
- echo '<table class=selection> <tr><td>' . _('Bank Account GL Code') . ':</td><td>';
- echo $_POST['AccountCode'] . '</td></tr>';
+ echo '<input type=hidden name="SelectedBankAccount" value="' . $SelectedBankAccount . '">';
+ echo '<input type=hidden name="AccountCode" value="' . $_POST['AccountCode'] . '">';
+ echo '<table class="selection">
+ <tr><td>' . _('Bank Account GL Code') . ':</td>
+ <td>' . $_POST['AccountCode'] . '</td>
+ </tr>';
} else { //end of if $Selectedbank account only do the else when a new record is being entered
- echo '<table class=selection><tr><td>' . _('Bank Account GL Code') .
- ":</td><td><Select tabindex='1' " . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) ." name='AccountCode'>";
+ echo '<table class="selection">
+ <tr><td>' . _('Bank Account GL Code') . ':</td>
+ <td><select tabindex="1" ' . (in_array('AccountCode',$Errors) ? 'class="selecterror"' : '' ) .' name="AccountCode">';
$sql = "SELECT accountcode,
- accountname
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_ = accountgroups.groupname
- AND accountgroups.pandl = 0
- ORDER BY accountcode";
-
+ accountname
+ FROM chartmaster,
+ accountgroups
+ WHERE chartmaster.group_ = accountgroups.groupname
+ AND accountgroups.pandl = 0
+ ORDER BY accountcode";
+
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected value="';
} else {
- echo '<option VALUE=';
+ echo '<option value="';
}
- echo $myrow['accountcode'] . '>' . $myrow['accountname'];
+ echo $myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
} //end while loop
@@ -319,43 +321,53 @@
}
echo '<tr><td>' . _('Bank Account Name') . ': </td>
- <td><input tabindex="2" ' . (in_array('AccountName',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountName" value="' . $_POST['BankAccountName'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="2" ' . (in_array('AccountName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountName" value="' . $_POST['BankAccountName'] . '" size=40 maxlength=50></td></tr>
<tr><td>' . _('Bank Account Code') . ': </td>
- <td><input tabindex="3" ' . (in_array('AccountCode',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountCode" value="' . $_POST['BankAccountCode'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="3" ' . (in_array('AccountCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountCode" value="' . $_POST['BankAccountCode'] . '" size=40 maxlength=50></td></tr>
<tr><td>' . _('Bank Account Number') . ': </td>
- <td><input tabindex="3" ' . (in_array('AccountNumber',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAccountNumber" value="' . $_POST['BankAccountNumber'] . '" size=40 maxlength=50></td></tr>
+ <td><input tabindex="3" ' . (in_array('AccountNumber',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAccountNumber" value="' . $_POST['BankAccountNumber'] . '" size="40" maxlength="50"></td></tr>
<tr><td>' . _('Bank Address') . ': </td>
- <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size=40 maxlength=50></td></tr>
- <tr><td>' . _('Currency Of Account') . ': </td><td><select tabindex="5" name="CurrCode">';
+ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50"></td></tr>
+ <tr><td>' . _('Currency Of Account') . ': </td>
+ <td><select tabindex="5" name="CurrCode">';
if (!isset($_POST['CurrCode']) OR $_POST['CurrCode']==''){
$_POST['CurrCode'] = $_SESSION['CompanyRecord']['currencydefault'];
}
-$result = DB_query('SELECT currabrev, currency FROM currencies',$db);
+$result = DB_query("SELECT currabrev,
+ currency
+ FROM currencies",$db);
+
while ($myrow = DB_fetch_array($result)) {
if ($myrow['currabrev']==$_POST['CurrCode']) {
- echo '<option selected VALUE=';
+ echo '<option selected value="';
} else {
- echo '<option VALUE=';
+ echo '<option value="';
}
- echo $myrow['currabrev'] . '>' . $myrow['currabrev'];
+ echo $myrow['currabrev'] . '">' . $myrow['currabrev'] . '</option>';
} //end while loop
echo '</select></td>';
-echo '<tr><td>' . _('Default for Invoices') . ': </td><td><select tabindex="6" name="DefAccount">';
+echo '<tr><td>' . _('Default for Invoices') . ': </td>
+ <td><select tabindex="6" name="DefAccount">';
if (!isset($_POST['DefAccount']) OR $_POST['DefAccount']==''){
- $_POST['DefAccount'] = $_SESSION['CompanyRecord']['currencydefault'];
+ $_POST['DefAccount'] = $_SESSION['CompanyRecord']['currencydefault'];
}
if (isset($SelectedBankAccount)) {
- $result = DB_query("SELECT invoice FROM bankaccounts where accountcode ='" . $SelectedBankAccount ."'",$db);
+ $result = DB_query("SELECT invoice
+ FROM bankaccounts
+ WHERE accountcode ='" . $SelectedBankAccount ."'",
+ $db);
while ($myrow = DB_fetch_array($result)) {
if ($myrow['invoice']== 1) {
- echo '<option selected VALUE=1>'._('Yes').'</option><option value=0>'._('No').'</option>';
+ echo '<option selected value="1">'._('Yes').'</option>
+ <option value="0">'._('No').'</option>';
} else {
- echo '<option selected VALUE=0>'._('No').'</option><option value=1>'._('Yes').'</option>';
+ echo '<option selected value="0">'._('No').'</option>
+ <option value="1">'._('Yes').'</option>';
}
}//end while loop
} else {
@@ -366,8 +378,8 @@
echo '</select></td>';
echo '</tr></table><br />
- <div class="centre"><input tabindex="7" type="Submit" name="submit" value="'. _('Enter Information') .'"></div>';
+ <div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'"></div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/BankMatching.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -57,13 +57,14 @@
((isset($_POST['AmtClear_' . $Counter]) AND $_POST['AmtClear_' . $Counter]<0 AND $Type=='Payments') OR
($Type=='Receipts' AND (isset($_POST['AmtClear_' . $Counter]) and $_POST['AmtClear_' . $Counter]>0)))){
/*if the amount entered was numeric and negative for a payment or positive for a receipt */
+
$sql = "UPDATE banktrans SET amountcleared=" . $_POST['AmtClear_' . $Counter] . "
WHERE banktransid='" . $_POST['BankTrans_' . $Counter]."'";
$ErrMsg = _('Could not update the amount matched off this bank transaction because');
$result = DB_query($sql,$db,$ErrMsg);
- } elseif (isset($_POST['Unclear_' . $Counter]) and $_POST['Unclear_' . $Counter]==True){
+ } elseif (isset($_POST['Unclear_' . $Counter]) AND $_POST['Unclear_' . $Counter]==True){
$sql = "UPDATE banktrans SET amountcleared = 0
WHERE banktransid='" . $_POST['BankTrans_' . $Counter]."'";
$ErrMsg = _('Could not unclear this bank transaction because');
@@ -76,13 +77,15 @@
echo '<div class="page_help_text">' . _('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.') . '</div><br>';
-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 '<input type="hidden" name="Type" Value="' . $Type . '">';
+echo '<input type="hidden" name="Type" value="' . $Type . '">';
-echo '<table class=selection><tr>';
-echo '<td align=left>' . _('Bank Account') . ':</td><td colspan=3><select tabindex="1" name="BankAccount">';
+echo '<table class="selection">
+ <tr>
+ <td align="left">' . _('Bank Account') . ':</td>
+ <td colspan=3><select tabindex="1" name="BankAccount">';
$sql = "SELECT accountcode, bankaccountname FROM bankaccounts";
$resultBankActs = DB_query($sql,$db);
@@ -117,23 +120,23 @@
echo '<option value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
} else {
echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
+ echo '<option selected value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td colspan=3>' . _('Choose to display only the first 20 matching') . ' ' . $TypeName . ' ' .
_('or all') . ' ' . $TypeName . ' ' . _('meeting the criteria') . ':</td><td><select tabindex="5" name="First20_or_All">';
if ($_POST['First20_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
+ echo '<option selected value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
- echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
+ echo '<option value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
}
echo '</select></td></tr>';
-echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" VALUE="' . _('Show selected') . ' ' . $TypeName . '">';
+echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '">';
echo '<p><a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a></div>';
echo '<hr />';
@@ -165,10 +168,10 @@
amount/exrate as amt,
banktranstype
FROM banktrans
- WHERE amount <0
- AND transdate >= '". $SQLAfterDate . "'
- AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST['BankAccount'] . "'
+ WHERE amount < 0
+ AND transdate >= '". $SQLAfterDate . "'
+ AND transdate <= '" . $SQLBeforeDate . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -180,9 +183,9 @@
banktranstype
FROM banktrans
WHERE amount >0
- AND transdate >= '". $SQLAfterDate . "'
- AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST['BankAccount'] . "'
+ AND transdate >= '". $SQLAfterDate . "'
+ AND transdate <= '" . $SQLBeforeDate . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
}
} else { /*it must be only the outstanding bank trans required */
@@ -228,7 +231,7 @@
<th>' . _('Date') . '</th>
<th>' . _('Amount') . '</th>
<th>' . _('Outstanding') . '</th>
- <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
</tr>';
echo '<table cellpadding=2 class="selection">' . $TableHeader;
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/COGSGLPostings.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -15,8 +15,7 @@
$SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID'];
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
if (isset($_POST['submit'])) {
@@ -134,45 +133,39 @@
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
/* The required group does not seem to exist so we create it */
- $sql = "INSERT INTO accountgroups (
- groupname,
- sectioninaccounts,
- pandl,
- sequenceintb
- ) VALUES (
- 'Sales',
- '1',
- '1',
- '10')";
-
+ $sql = "INSERT INTO accountgroups ( groupname,
+ sectioninaccounts,
+ pandl,
+ sequenceintb )
+ VALUES ('Sales',
+ '1',
+ '1',
+ '10')";
+
$result = DB_query($sql,$db);
}
$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 */
- $sql = "INSERT INTO chartmaster (
- accountcode,
- accountname,
- group_
- )
- VALUES (
- '1',
- 'Default Sales/Discounts',
- 'Sales'
- )";
+ $sql = "INSERT INTO chartmaster (accountcode,
+ accountname,
+ group_)
+ VALUES ('1',
+ 'Default Sales/Discounts',
+ 'Sales'
+ )";
$result = DB_query($sql,$db);
}
- $sql = "INSERT INTO cogsglpostings (
- area,
- stkcat,
- salestype,
- glcode)
- VALUES ('AN',
- 'ANY',
- 'AN',
- '1')";
+ $sql = "INSERT INTO cogsglpostings ( area,
+ stkcat,
+ salestype,
+ glcode)
+ VALUES ('AN',
+ 'ANY',
+ 'AN',
+ '1')";
$result = DB_query($sql,$db);
}
@@ -205,21 +198,21 @@
}
printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
- </tr>',
- $myrow['area'],
- $myrow['stkcat'],
- $myrow['salestype'],
- $myrow['salestype'],
- $_SERVER['PHP_SELF'] . '?',
- $myrow['id'],
- $_SERVER['PHP_SELF'] . '?',
- $myrow['id']);
-
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
+ </tr>',
+ $myrow['area'],
+ $myrow['stkcat'],
+ $myrow['salestype'],
+ $myrow['salestype'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['id'],
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow['id']);
+
}//END WHILE LIST LOOP
echo '</table>';
}
@@ -239,11 +232,11 @@
//editing an existing cost of sales posting record
$sql = "SELECT stkcat,
- glcode,
- area,
- salestype
- FROM cogsglpostings
- WHERE id='".$SelectedCOGSPostingID."'";
+ glcode,
+ area,
+ salestype
+ FROM cogsglpostings
+ WHERE id='".$SelectedCOGSPostingID."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -285,7 +278,7 @@
echo '</select></td></tr>
<tr><td>' . _('Stock Category') . ':</td>
<td><select tabindex=2 name="StkCat">
- <option VALUE="ANY">' . _('Any Other') . '</option>';
+ <option value="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['StkCat']) and $myrow['categoryid']==$_POST['StkCat']) {
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2011-06-12 09:30:10 UTC (rev 4595)
+++ trunk/CompanyPreferences.php 2011-06-13 10:23:44 UTC (rev 4596)
@@ -23,7 +23,6 @@
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
-
//first off validate inputs sensible
if (strlen($_POST['CoyName']) > 40 OR strlen($_POST['CoyName'])==0) {
@@ -95,33 +94,32 @@
if ($InputError !=1){
- $sql = "UPDATE companies SET
- coyname='" . $_POST['CoyName'] . "',
- companynumber = '" . $_POST['CompanyNumber'] . "',
- gstno='" . $_POST['GSTNo'] . "',
- regoffice1='" . $_POST['RegOffice1'] . "',
- regoffice2='" . $_POST['RegOffice2'] . "',
- regoffice3='" . $_POST['RegOffice3'] . "',
- regoffice4='" . $_POST['RegOffice4'] . "',
- regoffice5='" . $_POST['RegOffice5'] . "',
- regoffice6='" . $_POST['RegOffice6'] . "',
- telephone='" . $_POST['Telephone'] . "',
- fax='" . $_POST['Fax'] . "',
- email='" . $_POST['Email'] . "',
- currencydefault='" . $_POST['CurrencyDefault'] . "',
- debtorsact='" . $_POST['DebtorsAct'] . "',
- pytdiscountact='" . $_POST['PytDiscountAct'] . "',
- creditorsact='" . $_POST['CreditorsAct'] . "',
- payrollact='" . $_POST['PayrollAct'] . "',
- grnact='" . $_POST['GRNAct'] . "',
- exchangediffact='" . $_POST['ExchangeDiffAct'] . "',
- purchasesexchangediffact='" . $_POST['PurchasesExchangeDiffAct'] . "',
- retainedearnings='" . $_POST['RetainedEarnings'] . "',
- gllink_debtors='" . $_POST['GLLink_Debtors'] . "',
- gllink_creditors='" . $_POST['GLLink_Creditors'] . "',
- gllink_stock='" . $_POST['GLLink_Stock'] ."',
- freightact='" . $_POST['FreightAct'] . "'
- WHERE coycode=1";
+ $sql = "UPDATE companies SET coyname='" . $_POST['CoyName'] . "',
+ companynumber = '" . $_POST['CompanyNumber'] . "',
+ gstno='" . $_POST['GSTNo'] . "',
+ regoffice1='" . $_POST['RegOffice1'] . "',
+ regoffice2='" . $_POST['RegOffice2'] . "',
+ regoffice3='" . $_POST['RegOffice3'] . "',
+ regoffice4='" . $_POST['RegOffice4'] . "',
+ regoffice5='" . $_POST['RegOffice5'] . "',
+ regoffice6='" . $_POST['RegOffice6'] . "',
+ telephone='" . $_POST['Telephone'] . "',
+ fax='" . $_POST['Fax'] . "',
+ email='" . $_POST['Email'] . "',
+ currencydefault='" . $_POST['CurrencyDefault'] . "',
+ debtorsact='" . $_POST['DebtorsAct'] . "',
+ pytdiscountact='" . $_POST['PytDiscountAct'] . "',
+ creditorsact='" . $_POST['CreditorsAct'] . "',
+ payrollact='" . $_POST['PayrollAct'] . "',
+ grnact='" . $_POST['GRNAct'] . "',
+ exchangediffact='" . $_POST['ExchangeDiffAct'] . "',
+ purchasesexchangediffact='" . $_POST['PurchasesExchangeDiffAct'] . "',
+ retainedearnings='" . $_POST['RetainedEarnings'] . "',
+ gllink_debtors='" . $_POST['GLLink_Debtors'] . "',
+ gllink_creditors='" . $_POST['GLLink_Creditors'] . "',
+ gllink_stock='" . $_POST['GLLink_Stock'] ."',
+ freightact='" . $_POST['FreightAct'] . "'
+ WHERE coycode=1";
$ErrMsg = _('The company preferences could not be updated because');
$result = DB_query($sql,$db,$ErrMsg);
@@ -136,7 +134,7 @@
$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);
@@ -155,38 +153,38 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title.'</p><br />';
-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'] . '" />';
-echo '<table class=selection>';
+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);
@@ -222,63 +220,64 @@
}
echo '<tr><td>' . _('Name') . ' (' . _('to appear on reports') . '):</td>
- <td><input '.(in_array('CoyName',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="1" type="Text" Name="CoyName" value="' . stripslashes($_POST['CoyName']) . '" size=52 maxlength=50></td>
+ <td><input '.(in_array('CoyName',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="1" type="text" Name="CoyName" value="' . stripslashes($_POST['CoyName']) . '" size=52 maxlength=50></td>
</tr>';
echo '<tr><td>' . _('Official Company Number') . ':</td>
- <td><input '.(in_array('CoyNumber',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="2" type="Text" Name="CompanyNumber" value="' . $_POST['CompanyNumber'] . '" size=22 maxlength=20></td>
+ <td><input '.(in_array('CoyNumber',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="2" type="text" name="CompanyNumber" value="' . $_POST['CompanyNumber'] . '" size=22 maxlength=20></td>
</tr>';
echo '<tr><td>' . _('Tax Authority Reference') . ':</td>
- <td><input '.(in_array('TaxRef',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="3" type="Text" Name="GSTNo" value="' . $_POST['GSTNo'] . '" size=22 maxlength=20></td>
+ <td><input '.(in_array('TaxRef',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="3" type="text" name="GSTNo" value="' . $_POST['GSTNo'] . '" size=22 maxlength=20></td>
</tr>';
echo '<tr><td>' . _('Address Line 1') . ':</td>
- <td><input '.(in_array('RegOffice1',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="Text" Name="RegOffice1" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice1']) . '"></td>
+ <td><input '.(in_array('RegOffice1',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" name="RegOffice1" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice1']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 2') . ':</td>
- <td><input '.(in_array('RegOffice2',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="5" type="Text" Name="RegOffice2" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice2']) . '"></td>
+ <td><input '.(in_array('RegOffice2',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="5" type="text" name="RegOffice2" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice2']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 3') . ':</td>
- <td><input '.(in_array('RegOffice3',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="6" type="Text" Name="RegOffice3" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice3']) . '"></td>
+ <td><input '.(in_array('RegOffice3',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="6" type="text" name="RegOffice3" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice3']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 4') . ':</td>
- <td><input '.(in_array('RegOffice4',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="7" type="Text" Name="RegOffice4" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice4']) . '"></td>
+ <td><input '.(in_array('RegOffice4',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="7" type="text" name="RegOffice4" size=42 maxlength=40 value="' . stripslashes($_POST['RegOffice4']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 5') . ':</td>
- <td><input '.(in_array('RegOffice5',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="8" type="Text" Name="RegOffice5" size=22 maxlength=20 value="' . stripslashes($_POST['RegOffice5']) . '"></td>
+ <td><input '.(in_array('RegOffice5',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="8" type="text" name="RegOffice5" size=22 maxlength=20 value="' . stripslashes($_POST['RegOffice5']) . '"></td>
</tr>';
echo '<tr><td>' . _('Address Line 6') . ':</td>
- <td><input '.(in_array('RegOffice6',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="9" type="Text" Name="RegOffice6" size=17 maxlength=15 value="' . stripslashes($_POST['RegOffice6']) . '"></td>
+ <td><input '.(in_array('RegOffice6',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="9" type="text" name="RegOffice6" size=17 maxlength=15 value="' . stripslashes($_POST['RegOffice6']) . '"></td>
</tr>';
echo '<tr><td>' . _('Telephone Number') . ':</td>
- <td><input '.(in_array('Telephone',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="10" type="Text" Name="Telephone" size=26 maxlength=25 value="' . $_POST['Telephone'] . '"></td>
+ <td><input '.(in_array('Telephone',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="10" type="text" name="Telephone" size=26 maxlength=25 value="' . $_POST['Telephone'] . '"></td>
</tr>';
echo '<tr><td>' . _('Facsimile Number') . ':</td>
- <td><input '.(in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="Text" Name="Fax" size=26 maxlength=25 value="' . $_POST['Fax'] . '"></td>
+ <td><input '.(in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" name="Fax" size=26 maxlength=25 value="' . $_POST['Fax'] . '"></td>
</tr>';
echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input '.(in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="Text" Name="Email" size=50 maxlength=55 value="' . $_POST['Email'] . '"></td>
+ <td><input '.(in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="text" name="Email" size=50 maxlength=55 value="' . $_POST['Email'] . '"></td>
</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>';
+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'] . '</option>';
+ echo '<option selected value="'. $myrow['currabrev'] . '">' . $myrow['currency'] . '</opti...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-12 09:30:22
|
Revision: 4595
http://web-erp.svn.sourceforge.net/web-erp/?rev=4595&view=rev
Author: daintree
Date: 2011-06-12 09:30:10 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-11 07:26:47 UTC (rev 4594)
+++ trunk/doc/Change.log 2011-06-12 09:30:10 UTC (rev 4595)
@@ -1,6 +1,10 @@
webERP Change Log
-9/6/11 Phil : Prices.php now updates the end date of a price when a new default (no end date) price is added
+12/6/11 Version 4.04.4
+
+12/6/11 Phil: Customers.php included telephone and email from the first branch found - removed as could be confusing. Customer contact information is stored in CustomerContacts and custbranch table
+12/6/11 Phil: SupplierCredit.php variables containing value case consistency
+9/6/11 Phil: Prices.php now updates the end date of a price when a new default (no end date) price is added
9/6/11 Ricard: PcExpensesTypeTab.php deletion question message fixed as does not delete any expenses set up with this expense type
9/6/11 Daniel Richert: includes/LanguageSetup.php changed to set $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']); as using LC_ALL over-rides numeric and we need decimal points as . - commas stuff things up
9/6/11 Ricard: Added new field current to salesman table to flag if the salesman is currently still on the team or not - modified WWW_Users.php and CustomerBranches to only allow selection of current salesfolk
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-06-11 07:26:47 UTC (rev 4594)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-12 09:30:10 UTC (rev 4595)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-30 20:51+1200\n"
+"POT-Creation-Date: 2011-06-12 21:24+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -141,8 +141,8 @@
#: Locations.php:293 Locations.php:301 MRPDemandTypes.php:87
#: PaymentMethods.php:140 PaymentTerms.php:147 PaymentTerms.php:154
#: PcExpenses.php:152 SalesCategories.php:125 SalesCategories.php:133
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:145
-#: SalesTypes.php:155 Shippers.php:82 Shippers.php:94 StockCategories.php:179
+#: SalesPeople.php:149 SalesPeople.php:156 SalesTypes.php:150
+#: SalesTypes.php:160 Shippers.php:82 Shippers.php:94 StockCategories.php:179
#: Stocks.php:475 Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
#: Stocks.php:516 Suppliers.php:609 Suppliers.php:618 Suppliers.php:626
#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:127
@@ -199,7 +199,7 @@
#: BOMExtendedQty.php:272 BOMIndented.php:247 BOMIndentedReverse.php:246
#: BOMInquiry.php:165 BOMListing.php:112 BOMs.php:208 BOMs.php:790
#: COGSGLPostings.php:18 CompanyPreferences.php:155 CounterSales.php:1983
-#: CounterSales.php:2107 Credit_Invoice.php:257 CreditStatus.php:20
+#: CounterSales.php:2107 Credit_Invoice.php:255 CreditStatus.php:20
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:10
#: DebtorsAtPeriodEnd.php:124 DiscountCategories.php:10
#: DiscountCategories.php:128 DiscountMatrix.php:16 EDIMessageFormat.php:104
@@ -217,7 +217,7 @@
#: PurchData.php:146 PurchData.php:257 PurchData.php:276
#: RecurringSalesOrders.php:310 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:34
-#: SalesPeople.php:22 SalesTypes.php:20 SelectAsset.php:45
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
@@ -279,7 +279,8 @@
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
#: SalesAnalReptCols.php:404 SalesAnalRepts.php:404 SalesAnalRepts.php:407
#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
+#: SalesAnalRepts.php:459 SalesPeople.php:208 SalesPeople.php:316
+#: SalesPeople.php:318 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
#: SystemParameters.php:380 SystemParameters.php:403 SystemParameters.php:419
@@ -315,7 +316,8 @@
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
#: SalesAnalReptCols.php:405 SalesAnalRepts.php:403 SalesAnalRepts.php:406
#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
+#: SalesAnalRepts.php:458 SalesPeople.php:208 SalesPeople.php:321
+#: SalesPeople.php:323 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
#: SystemParameters.php:381 SystemParameters.php:404 SystemParameters.php:420
@@ -343,8 +345,8 @@
#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
-#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:210
-#: SalesTypes.php:204 SecurityTokens.php:110 SelectCustomer.php:613
+#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:219
+#: SalesTypes.php:209 SecurityTokens.php:110 SelectCustomer.php:613
#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
#: SelectCustomer.php:694 SelectCustomer.php:710 Shippers.php:144
#: StockCategories.php:240 SupplierContacts.php:157 SupplierTypes.php:189
@@ -361,7 +363,7 @@
#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:165
#: BankAccounts.php:222 BOMs.php:146 COGSGLPostings.php:109
#: COGSGLPostings.php:212 ContractBOM.php:270 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:386 CreditStatus.php:175
+#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:175
#: Currencies.php:241 CustLoginSetup.php:308 CustomerReceipt.php:863
#: Customers.php:958 CustomerTypes.php:203 DiscountCategories.php:215
#: DiscountMatrix.php:173 EDIMessageFormat.php:151
@@ -374,7 +376,7 @@
#: PO_AuthorisationLevels.php:151 PO_Items.php:687 Prices_Customer.php:281
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
-#: SalesGLPostings.php:246 SalesPeople.php:211 SalesTypes.php:205
+#: SalesGLPostings.php:246 SalesPeople.php:220 SalesTypes.php:210
#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:614
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:695 SelectCustomer.php:711 SelectOrderItems.php:1370
@@ -385,7 +387,7 @@
#: SuppShiptChgs.php:89 SuppTransGLAnalysis.php:119 TaxAuthorities.php:173
#: TaxCategories.php:183 TaxGroups.php:179 TaxProvinces.php:177
#: UnitsOfMeasure.php:189 WorkCentres.php:138 WOSerialNos.php:303
-#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:57
+#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:59
#: includes/OutputSerialItems.php:98
#, php-format
msgid "Delete"
@@ -439,7 +441,7 @@
#: OffersReceived.php:52 OffersReceived.php:129 PaymentMethods.php:282
#: PaymentTerms.php:284 PO_AuthorisationLevels.php:244 Prices_Customer.php:350
#: SalesAnalReptCols.php:510 SalesAnalRepts.php:494 SalesGLPostings.php:416
-#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:557
+#: SalesPeople.php:329 Shippers.php:196 StockCategories.php:557
#: SupplierContacts.php:258 SuppLoginSetup.php:529 TaxAuthorities.php:312
#: TaxCategories.php:233 TaxProvinces.php:227 UnitsOfMeasure.php:240
#: WorkCentres.php:261 WWW_Users.php:638
@@ -545,7 +547,7 @@
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
-#: SalesPeople.php:94 SalesTypes.php:61 Stocks.php:355 Suppliers.php:510
+#: SalesPeople.php:96 SalesTypes.php:66 Stocks.php:355 Suppliers.php:510
#: SupplierTypes.php:67
msgid "has been updated"
msgstr "byla aktualizována"
@@ -560,7 +562,7 @@
#: AddCustomerContacts.php:112 CompanyPreferences.php:224
#: CustomerBranches.php:368 Customers.php:915 Customers.php:921
-#: Customers.php:986 SalesPeople.php:185 SelectCustomer.php:609
+#: Customers.php:986 SalesPeople.php:191 SelectCustomer.php:609
#: StockDispatch.php:185 StockDispatch.php:197 SupplierContacts.php:145
#: SupplierCredit.php:441 SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
@@ -664,9 +666,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:167 UpgradeDatabase.php:170
-#: UpgradeDatabase.php:173 UpgradeDatabase.php:176 UpgradeDatabase.php:179
-#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
+#: Stocks.php:882 UpgradeDatabase.php:169 UpgradeDatabase.php:172
+#: UpgradeDatabase.php:175 UpgradeDatabase.php:178 UpgradeDatabase.php:181
+#: UpgradeDatabase.php:184 UpgradeDatabase.php:187 UpgradeDatabase.php:190
#: 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
@@ -781,7 +783,7 @@
#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:162
#: BOMExtendedQty.php:259 BOMIndented.php:153 BOMIndented.php:234
#: BOMIndentedReverse.php:154 BOMIndentedReverse.php:232 BOMListing.php:47
-#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
+#: Credit_Invoice.php:184 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
#: FTP_RadioBeacon.php:187 GetStockImage.php:154 GLBalanceSheet.php:93
#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:175 GLTagProfit_Loss.php:187
@@ -844,7 +846,7 @@
#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
-#: CounterSales.php:1337 Credit_Invoice.php:705 Credit_Invoice.php:727
+#: CounterSales.php:1337 Credit_Invoice.php:703 Credit_Invoice.php:725
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
@@ -1058,7 +1060,7 @@
#: MRPDemands.php:247 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:166
#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:137
-#: SalesTypes.php:161 StockCategories.php:196 Suppliers.php:635
+#: SalesTypes.php:166 StockCategories.php:196 Suppliers.php:635
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
msgid "has been deleted"
msgstr "byl zrušen"
@@ -1393,7 +1395,7 @@
msgstr "od"
#: BankMatching.php:110 ConfirmDispatchControlled_Invoice.php:58
-#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
+#: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
#: GLAccountCSV.php:171 GLAccountReport.php:102 Payments.php:717
#: PcReportTab.php:102 PDFChequeListing.php:107 PDFChequeListing.php:117
#: PDFChequeListing.php:192 PDFDeliveryDifferences.php:166
@@ -1506,7 +1508,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:281
+#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
#: CustomerAllocations.php:358 CustomerReceipt.php:842
#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
@@ -1641,7 +1643,7 @@
#: BankReconciliation.php:196 BankReconciliation.php:268
#: CustomerAllocations.php:330 CustomerAllocations.php:356
#: CustomerInquiry.php:191 CustomerTransInquiry.php:86 CustWhereAlloc.php:89
-#: EmailCustTrans.php:17 GLAccountInquiry.php:153 GLAccountReportphp:156
+#: EmailCustTrans.php:15 GLAccountInquiry.php:153 GLAccountReportphp:156
#: PrintCustTrans.php:450 PrintCustTrans.php:651 PrintCustTrans.php:871
#: PrintCustTrans.php:918 PrintCustTransPortrait.php:502
#: PrintCustTransPortrait.php:703 PrintCustTransPortrait.php:922
@@ -1786,7 +1788,7 @@
#: ContractCosting.php:80 ContractCosting.php:131 ContractOtherReqts.php:95
#: Contracts.php:932 Contracts.php:956 CounterSales.php:701
#: CounterSales.php:1994 CounterSales.php:2174 CounterSales.php:2302
-#: Credit_Invoice.php:275 DeliveryDetails.php:822 DeliveryDetails.php:887
+#: Credit_Invoice.php:273 DeliveryDetails.php:822 DeliveryDetails.php:887
#: GoodsReceived.php:88 GoodsReceived.php:92 GoodsReceived.php:95
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
@@ -2184,7 +2186,7 @@
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
#: SalesCategories.php:422 SelectProduct.php:512 Shipt_Select.php:166
-#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
+#: StockAdjustments.php:76 StockAdjustments.php:335 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
#: StockUsage.php:58 SupplierTenders.php:359 WorkOrderEntry.php:582
@@ -2237,7 +2239,7 @@
#: PDFOrderStatus.php:315 PDFPrintLabel.php:238 PO_Header.php:542
#: PO_Items.php:928 PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:177
#: PricesByCost.php:151 PurchData.php:339 ReorderLevelLocation.php:54
-#: ReorderLevelLocation.php:203 SalesPeople.php:184
+#: ReorderLevelLocation.php:203 SalesPeople.php:190
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:709
@@ -2251,7 +2253,7 @@
#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:266
#: ContractBOM.php:342 CounterSales.php:1989 CounterSales.php:2169
-#: Credit_Invoice.php:274 GoodsReceived.php:89 GoodsReceived.php:93
+#: Credit_Invoice.php:272 GoodsReceived.php:89 GoodsReceived.php:93
#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:932
#: PO_SelectOSPurchOrder.php:214 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
@@ -2293,7 +2295,7 @@
#: BOMInquiry.php:174 ContractBOM.php:243 ContractCosting.php:76
#: ContractCosting.php:82 ContractCosting.php:132 ContractOtherReqts.php:96
#: Contracts.php:934 Contracts.php:957 MRPPlannedWorkOrders.php:260
-#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:340
+#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:351
msgid "Unit Cost"
msgstr "Jednotková cena"
@@ -2406,12 +2408,12 @@
"Účinné k dnešnímu dni pole musí být data ve formátu dd / mm / rr nebo dd / "
"mm / rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
-#: BOMs.php:231 StockAdjustments.php:89 StockTransfers.php:150
+#: BOMs.php:231 StockAdjustments.php:100 StockTransfers.php:150
#: WorkOrderEntry.php:260
msgid "The quantity entered must be numeric"
msgstr "Množství uvedené musí být číslo"
-#: BOMs.php:237 StockAdjustments.php:92
+#: BOMs.php:237 StockAdjustments.php:103
msgid "The quantity entered cannot be zero"
msgstr "Množství uvedené nemůže být nula"
@@ -2536,7 +2538,7 @@
msgstr "SQL slouží k získání popisu mateřské část byla"
#: BOMs.php:397 ConfirmDispatch_Invoice.php:1009 CounterSales.php:1372
-#: Credit_Invoice.php:763 Credit_Invoice.php:792 SelectCreditItems.php:1417
+#: Credit_Invoice.php:761 Credit_Invoice.php:790 SelectCreditItems.php:1417
#: Stocks.php:810 Stocks.php:812
msgid "Assembly"
msgstr "Sestava"
@@ -2925,10 +2927,10 @@
msgstr "Vytvořte GL údaje pro obchodů s akciemi"
#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:618
-#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1528
+#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1526
#: FixedAssetItems.php:120 FixedAssetItems.php:566 GLBudgets.php:216
#: GLTags.php:62 GoodsReceived.php:229 GoodsReceived.php:235
-#: GoodsReceived.php:242 GoodsReceived.php:699 Labels.php:262
+#: GoodsReceived.php:242 GoodsReceived.php:698 Labels.php:262
#: MRPCalendar.php:307 Payments.php:860 PcAuthorizeExpenses.php:283
#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:221 PurchData.php:505
#: ReorderLevelLocation.php:156 SecurityTokens.php:89
@@ -2989,7 +2991,7 @@
msgstr "Zpět na Potvrzení o odeslání"
#: ConfirmDispatchControlled_Invoice.php:56 CounterSales.php:1207
-#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:11
+#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:9
#: PaymentAllocations.php:33 SelectSalesOrder.php:742 SelectSalesOrder.php:811
#: SelectSalesOrder.php:838 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
@@ -3031,7 +3033,7 @@
msgid "The SQL to get the order header was"
msgstr "SQL získat pořadí záhlaví byl"
-#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:127 OrderDetails.php:140
+#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:125 OrderDetails.php:140
#: RecurringSalesOrders.php:125 SelectOrderItems.php:220
msgid "The line items of the order cannot be retrieved because"
msgstr "Řádkové položky v řádu nelze načíst, protože"
@@ -3105,7 +3107,7 @@
#: ConfirmDispatch_Invoice.php:263 ContractBOM.php:239 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
-#: CounterSales.php:2301 Credit_Invoice.php:271 DeliveryDetails.php:820
+#: CounterSales.php:2301 Credit_Invoice.php:269 DeliveryDetails.php:820
#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:639
#: PO_OrderDetails.php:142 PrintCustTrans.php:799 PrintCustTrans.php:887
#: PrintCustTrans.php:934 PrintCustTransPortrait.php:855
@@ -3130,7 +3132,7 @@
#: ConfirmDispatch_Invoice.php:264 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
-#: Credit_Invoice.php:272 DeliveryDetails.php:821 DeliveryDetails.php:886
+#: Credit_Invoice.php:270 DeliveryDetails.php:821 DeliveryDetails.php:886
#: OrderDetails.php:154 PO_Items.php:706 PO_OrderDetails.php:143
#: PrintCustTrans.php:800 PrintCustTrans.php:888 PrintCustTrans.php:935
#: PrintCustTransPortrait.php:856 PrintCustTransPortrait.php:939
@@ -3168,7 +3170,7 @@
msgid "This Dispatch"
msgstr "Tato zásilka"
-#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:276
+#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:274
#: DeliveryDetails.php:824 DeliveryDetails.php:889 GoodsReceived.php:98
#: OffersReceived.php:97 OffersReceived.php:197 OffersReceived.php:244
#: OrderDetails.php:157 PDFOrdersInvoiced.php:385 PDFPriceList.php:359
@@ -3190,7 +3192,7 @@
msgid "Price"
msgstr "Cena"
-#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:275
#: CustomerReceipt.php:843 DeliveryDetails.php:825 OrderDetails.php:158
#: PrintCustTrans.php:804 PrintCustTrans.php:892 PrintCustTrans.php:939
#: PrintCustTransPortrait.php:860 PrintCustTransPortrait.php:943
@@ -3204,8 +3206,8 @@
msgstr "Sleva"
#: ConfirmDispatch_Invoice.php:271 ConfirmDispatch_Invoice.php:275
-#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:278
-#: Credit_Invoice.php:282 CustomerAllocations.php:332
+#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:276
+#: Credit_Invoice.php:280 CustomerAllocations.php:332
#: CustomerAllocations.php:358 CustomerInquiry.php:197 DeliveryDetails.php:826
#: DeliveryDetails.php:890 GLBalanceSheet.php:172 GLBalanceSheet.php:181
#: GLBalanceSheet.php:258 GLBalanceSheet.php:267 GLBudgets.php:195
@@ -3234,12 +3236,12 @@
msgid "Total"
msgstr "Celkem"
-#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:278
+#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:276
#: SelectCreditItems.php:656
msgid "Excl Tax"
msgstr "bez DPH"
-#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:279
+#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:277
#: SelectCreditItems.php:657 SupplierInvoice.php:233 TaxGroups.php:270
msgid "Tax Authority"
msgstr "Daňový úřad"
@@ -3248,15 +3250,15 @@
msgid "Tax %"
msgstr "DPH %"
-#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:280
-#: Credit_Invoice.php:281 PrintCustTrans.php:391 PrintCustTrans.php:976
+#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:278
+#: Credit_Invoice.php:279 PrintCustTrans.php:391 PrintCustTrans.php:976
#: PrintCustTransPortrait.php:450 PrintCustTransPortrait.php:1023
#: SelectCreditItems.php:658 SelectCreditItems.php:659
#: includes/PDFTaxPageHeader.inc:40
msgid "Tax"
msgstr "DPH"
-#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:282
+#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:280
#: SelectCreditItems.php:660
msgid "Incl Tax"
msgstr "včetně DPH"
@@ -3292,8 +3294,8 @@
"nákladní společnost mají být použity"
#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244 Prices.php:342
-#: includes/InputSerialItemsExisting.php:58
-#: includes/InputSerialItemsKeyed.php:139
+#: includes/InputSerialItemsExisting.php:59
+#: includes/InputSerialItemsKeyed.php:141
#: includes/InputSerialItemsSequential.php:48
#: includes/OutputSerialItems.php:204
msgid "Enter"
@@ -3382,12 +3384,12 @@
msgid "Please remedy this"
msgstr "Prosím nápravě tohoto"
-#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:483
#: GoodsReceived.php:252
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:645 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:483
#: GoodsReceived.php:252
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
@@ -3490,19 +3492,19 @@
#: CounterSales.php:1336 CounterSales.php:1379 CounterSales.php:1389
#: CounterSales.php:1473 CounterSales.php:1494 CounterSales.php:1656
#: CounterSales.php:1678 CounterSales.php:1704 CounterSales.php:1726
-#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:193
-#: Credit_Invoice.php:543 Credit_Invoice.php:584 Credit_Invoice.php:601
-#: Credit_Invoice.php:617 Credit_Invoice.php:667 Credit_Invoice.php:682
-#: Credit_Invoice.php:798 Credit_Invoice.php:808 Credit_Invoice.php:890
-#: Credit_Invoice.php:905 Credit_Invoice.php:920 Credit_Invoice.php:930
-#: Credit_Invoice.php:945 Credit_Invoice.php:989 Credit_Invoice.php:1028
-#: Credit_Invoice.php:1069 Credit_Invoice.php:1092 Credit_Invoice.php:1263
-#: Credit_Invoice.php:1303 Credit_Invoice.php:1330 Credit_Invoice.php:1351
-#: Credit_Invoice.php:1380 Credit_Invoice.php:1406 Credit_Invoice.php:1432
-#: GoodsReceived.php:271 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:636 GoodsReceived.php:661 PDFStockCheckComparison.php:122
+#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:191
+#: Credit_Invoice.php:541 Credit_Invoice.php:582 Credit_Invoice.php:599
+#: Credit_Invoice.php:615 Credit_Invoice.php:665 Credit_Invoice.php:680
+#: Credit_Invoice.php:796 Credit_Invoice.php:806 Credit_Invoice.php:888
+#: Credit_Invoice.php:903 Credit_Invoice.php:918 Credit_Invoice.php:928
+#: Credit_Invoice.php:943 Credit_Invoice.php:987 Credit_Invoice.php:1026
+#: Credit_Invoice.php:1067 Credit_Invoice.php:1090 Credit_Invoice.php:1261
+#: Credit_Invoice.php:1301 Credit_Invoice.php:1328 Credit_Invoice.php:1349
+#: Credit_Invoice.php:1378 Credit_Invoice.php:1404 Credit_Invoice.php:1430
+#: GoodsReceived.php:271 GoodsReceived.php:351 GoodsReceived.php:392
+#: GoodsReceived.php:422 GoodsReceived.php:450 GoodsReceived.php:481
+#: GoodsReceived.php:499 GoodsReceived.php:528 GoodsReceived.php:545
+#: GoodsReceived.php:635 GoodsReceived.php:660 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3528,9 +3530,9 @@
#: ShipmentCosting.php:243 ShipmentCosting.php:289 ShipmentCosting.php:310
#: ShipmentCosting.php:324 ShipmentCosting.php:358 ShipmentCosting.php:381
#: ShipmentCosting.php:413 ShipmentCosting.php:431 ShipmentCosting.php:444
-#: StockAdjustments.php:157 StockAdjustments.php:191 StockAdjustments.php:208
-#: StockAdjustments.php:224 StockAdjustments.php:237 StockAdjustments.php:265
-#: StockAdjustments.php:287 StockDispatch.php:177 StockLocTransfer.php:74
+#: StockAdjustments.php:168 StockAdjustments.php:202 StockAdjustments.php:219
+#: StockAdjustments.php:235 StockAdjustments.php:248 StockAdjustments.php:276
+#: StockAdjustments.php:298 StockDispatch.php:177 StockLocTransfer.php:74
#: StockLocTransfer.php:96 StockLocTransfer.php:100
#: StockLocTransferReceive.php:105 StockLocTransferReceive.php:139
#: StockLocTransferReceive.php:153 StockLocTransferReceive.php:172
@@ -3599,19 +3601,19 @@
#: CounterSales.php:1336 CounterSales.php:1379 CounterSales.php:1389
#: CounterSales.php:1473 CounterSales.php:1494 CounterSales.php:1656
#: CounterSales.php:1678 CounterSales.php:1704 CounterSales.php:1726
-#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:543
-#: Credit_Invoice.php:584 Credit_Invoice.php:601 Credit_Invoice.php:617
-#: Credit_Invoice.php:667 Credit_Invoice.php:682 Credit_Invoice.php:798
-#: Credit_Invoice.php:808 Credit_Invoice.php:890 Credit_Invoice.php:905
-#: Credit_Invoice.php:920 Credit_Invoice.php:930 Credit_Invoice.php:945
-#: Credit_Invoice.php:989 Credit_Invoice.php:1028 Credit_Invoice.php:1069
-#: Credit_Invoice.php:1092 Credit_Invoice.php:1263 Credit_Invoice.php:1303
-#: Credit_Invoice.php:1330 Credit_Invoice.php:1351 Credit_Invoice.php:1380
-#: Credit_Invoice.php:1406 Credit_Invoice.php:1432 GoodsReceived.php:271
-#: 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:636
-#: GoodsReceived.php:661 PDFStockCheckComparison.php:122
+#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:541
+#: Credit_Invoice.php:582 Credit_Invoice.php:599 Credit_Invoice.php:615
+#: Credit_Invoice.php:665 Credit_Invoice.php:680 Credit_Invoice.php:796
+#: Credit_Invoice.php:806 Credit_Invoice.php:888 Credit_Invoice.php:903
+#: Credit_Invoice.php:918 Credit_Invoice.php:928 Credit_Invoice.php:943
+#: Credit_Invoice.php:987 Credit_Invoice.php:1026 Credit_Invoice.php:1067
+#: Credit_Invoice.php:1090 Credit_Invoice.php:1261 Credit_Invoice.php:1301
+#: Credit_Invoice.php:1328 Credit_Invoice.php:1349 Credit_Invoice.php:1378
+#: Credit_Invoice.php:1404 Credit_Invoice.php:1430 GoodsReceived.php:271
+#: GoodsReceived.php:351 GoodsReceived.php:392 GoodsReceived.php:422
+#: GoodsReceived.php:450 GoodsReceived.php:481 GoodsReceived.php:499
+#: GoodsReceived.php:528 GoodsReceived.php:545 GoodsReceived.php:635
+#: GoodsReceived.php:660 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3637,9 +3639,9 @@
#: ShipmentCosting.php:243 ShipmentCosting.php:289 ShipmentCosting.php:310
#: ShipmentCosting.php:324 ShipmentCosting.php:358 ShipmentCosting.php:381
#: ShipmentCosting.php:413 ShipmentCosting.php:431 ShipmentCosting.php:444
-#: StockAdjustments.php:157 StockAdjustments.php:191 StockAdjustments.php:208
-#: StockAdjustments.php:224 StockAdjustments.php:237 StockAdjustments.php:265
-#: StockAdjustments.php:287 StockLocTransferReceive.php:105
+#: StockAdjustments.php:168 StockAdjustments.php:202 StockAdjustments.php:219
+#: StockAdjustments.php:235 StockAdjustments.php:248 StockAdjustments.php:276
+#: StockAdjustments.php:298 StockLocTransferReceive.php:105
#: StockLocTransferReceive.php:139 StockLocTransferReceive.php:153
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:218
#: StockLocTransferReceive.php:254 StockLocTransferReceive.php:268
@@ -3705,13 +3707,13 @@
msgstr "Následující SQL vložit dlužníka transakce záznam byl použit"
#: ConfirmDispatch_Invoice.php:795 CounterSales.php:1266
-#: Credit_Invoice.php:601 RecurringSalesOrdersProcess.php:694
+#: Credit_Invoice.php:599 RecurringSalesOrdersProcess.php:694
#: SelectCreditItems.php:1107
msgid "The debtor transaction taxes records could not be inserted because"
msgstr "Dlužník transakčních daní záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:796 CounterSales.php:1267
-#: Credit_Invoice.php:602 RecurringSalesOrdersProcess.php:695
+#: Credit_Invoice.php:600 RecurringSalesOrdersProcess.php:695
#: SelectCreditItems.php:1108
msgid ""
"The following SQL to insert the debtor transaction taxes record was used"
@@ -3727,7 +3729,7 @@
msgstr "Prodejní objednávky detail záznamu nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:828 ConfirmDispatch_Invoice.php:906
-#: Credit_Invoice.php:668 RecurringSalesOrdersProcess.php:322
+#: Credit_Invoice.php:666 RecurringSalesOrdersProcess.php:322
msgid "The following SQL to update the sales order detail record was used"
msgstr ""
"Následující SQL aktualizovat prodejní objednávky detail záznam byl použit"
@@ -3756,12 +3758,12 @@
msgstr "Nepodařilo se získat aktuální polohu vozidla"
#: ConfirmDispatch_Invoice.php:942 CounterSales.php:1303
-#: Credit_Invoice.php:682 SelectCreditItems.php:1350
+#: Credit_Invoice.php:680 SelectCreditItems.php:1350
msgid "Location stock record could not be updated because"
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:943 ContractCosting.php:306
-#: CounterSales.php:1304 Credit_Invoice.php:683 GoodsReceived.php:452
+#: CounterSales.php:1304 Credit_Invoice.php:681 GoodsReceived.php:451
#: ReverseGRN.php:220 SelectCreditItems.php:1351 StockTransfers.php:411
#: StockTransfers.php:421 WorkOrderIssue.php:161 WorkOrderReceive.php:318
#: WorkOrderReceive.php:424
@@ -3769,12 +3771,12 @@
msgstr "Následující SQL aktualizovat umístění skladové evidenci byl používán"
#: ConfirmDispatch_Invoice.php:961 CounterSales.php:1322
-#: Credit_Invoice.php:704 SelectCreditItems.php:1371
+#: Credit_Invoice.php:702 SelectCreditItems.php:1371
msgid "Could not retrieve assembly components from the database for"
msgstr "Nepodařilo se načíst součásti sestavy z databáze"
#: ConfirmDispatch_Invoice.php:961 CounterSales.php:1322
-#: Credit_Invoice.php:704 EDIMessageFormat.php:43 EDISendInvoices.php:105
+#: Credit_Invoice.php:702 EDIMessageFormat.php:43 EDISendInvoices.php:105
#: FixedAssetCategories.php:86 FixedAssetCategories.php:106
#: PricesBasedOnMarkUp.php:337 PricesBasedOnMarkUp.php:353
#: SelectCreditItems.php:1371 SpecialOrder.php:423 StockCategories.php:21
@@ -3801,12 +3803,12 @@
msgstr "Objednávka"
#: ConfirmDispatch_Invoice.php:1015 CounterSales.php:1379
-#: Credit_Invoice.php:798 SelectCreditItems.php:1423
+#: Credit_Invoice.php:796 SelectCreditItems.php:1423
msgid "Stock movement records for the assembly components of"
msgstr "Sklad pohyb záznamy pro montáž komponent"
#: ConfirmDispatch_Invoice.php:1015 CounterSales.php:1379
-#: Credit_Invoice.php:798 SelectCreditItems.php:1423 ShipmentCosting.php:381
+#: Credit_Invoice.php:796 SelectCreditItems.php:1423 ShipmentCosting.php:381
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:56
#: includes/PDFPaymentRun_PymtFooter.php:86
#: includes/PDFPaymentRun_PymtFooter.php:115
@@ -3817,7 +3819,7 @@
msgstr "nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1016 CounterSales.php:1380
-#: Credit_Invoice.php:799 SelectCreditItems.php:1424
+#: Credit_Invoice.php:797 SelectCreditItems.php:1424
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
@@ -3825,7 +3827,7 @@
"Následující SQL vložit součásti sestavy záznamy pohyb zásob byla použita"
#: ConfirmDispatch_Invoice.php:1025 CounterSales.php:1389
-#: Credit_Invoice.php:808 SelectCreditItems.php:1433
+#: Credit_Invoice.php:806 SelectCreditItems.php:1433
msgid ""
"Location stock record could not be updated for an assembly component because"
msgstr ""
@@ -3841,15 +3843,15 @@
"použita"
#: ConfirmDispatch_Invoice.php:1108 CounterSales.php:1473
-#: Credit_Invoice.php:890 Credit_Invoice.php:989 Credit_Invoice.php:1028
-#: Credit_Invoice.php:1069 RecurringSalesOrdersProcess.php:361
+#: Credit_Invoice.php:888 Credit_Invoice.php:987 Credit_Invoice.php:1026
+#: Credit_Invoice.php:1067 RecurringSalesOrdersProcess.php:361
#: ReverseGRN.php:248 SelectCreditItems.php:1175 SelectCreditItems.php:1248
msgid "Stock movement records could not be inserted because"
msgstr "Pohyb zásob záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1109 ContractCosting.php:335
-#: CounterSales.php:1474 Credit_Invoice.php:891 Credit_Invoice.php:990
-#: Credit_Invoice.php:1029 GoodsReceived.php:483
+#: CounterSales.php:1474 Credit_Invoice.php:889 Credit_Invoice.php:988
+#: Credit_Invoice.php:1027 GoodsReceived.php:482
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1249 WorkOrderIssue.php:192 WorkOrderReceive.php:347
#: WorkOrderReceive.php:454
@@ -3864,39 +3866,39 @@
msgstr "Daně a sazby platné pro tato faktura řádku nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1130 CounterSales.php:1495
-#: Credit_Invoice.php:1093 RecurringSalesOrdersProcess.php:383
+#: Credit_Invoice.php:1091 RecurringSalesOrdersProcess.php:383
#: SelectCreditItems.php:1270
msgid ""
"The following SQL to insert the stock movement tax detail records was used"
msgstr "Následující SQL vložit pohyb zásob daňově detail byl použit"
-#: ConfirmDispatch_Invoice.php:1146 Credit_Invoice.php:920
-#: Credit_Invoice.php:930 SelectCreditItems.php:1314 StockAdjustments.php:191
-#: StockAdjustments.php:208 StockLocTransferReceive.php:139
+#: ConfirmDispatch_Invoice.php:1146 Credit_Invoice.php:918
+#: Credit_Invoice.php:928 SelectCreditItems.php:1314 StockAdjustments.php:202
+#: StockAdjustments.php:219 StockLocTransferReceive.php:139
#: StockTransfers.php:251 StockTransfers.php:366
msgid "The serial stock item record could not be updated because"
msgstr "Pořadové skladová položka záznamu nelze aktualizovat, protože"
-#: ConfirmDispatch_Invoice.php:1147 Credit_Invoice.php:921
-#: Credit_Invoice.php:931 SelectCreditItems.php:1315
-#: SelectCreditItems.php:1538 StockAdjustments.php:192
-#: StockAdjustments.php:209 StockLocTransferReceive.php:140
+#: ConfirmDispatch_Invoice.php:1147 Credit_Invoice.php:919
+#: Credit_Invoice.php:929 SelectCreditItems.php:1315
+#: SelectCreditItems.php:1538 StockAdjustments.php:203
+#: StockAdjustments.php:220 StockLocTransferReceive.php:140
#: StockLocTransferReceive.php:154 StockLocTransferReceive.php:255
#: StockLocTransferReceive.php:269 StockTransfers.php:252
#: StockTransfers.php:367
msgid "The following SQL to update the serial stock item record was used"
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
-#: ConfirmDispatch_Invoice.php:1161 Credit_Invoice.php:945
-#: GoodsReceived.php:546 SelectCreditItems.php:1330 StockAdjustments.php:224
+#: ConfirmDispatch_Invoice.php:1161 Credit_Invoice.php:943
+#: GoodsReceived.php:545 SelectCreditItems.php:1330 StockAdjustments.php:235
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:285
#: StockTransfers.php:287 StockTransfers.php:398 WorkOrderIssue.php:228
#: WorkOrderIssue.php:283 WorkOrderReceive.php:505 WorkOrderReceive.php:576
msgid "The serial stock movement record could not be inserted because"
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1162 Credit_Invoice.php:946
-#: GoodsReceived.php:547 StockAdjustments.php:225
+#: ConfirmDispatch_Invoice.php:1162 Credit_Invoice.php:944
+#: GoodsReceived.php:546 StockAdjustments.php:236
#: StockLocTransferReceive.php:173 StockLocTransferReceive.php:286
#: StockTransfers.php:288 StockTransfers.php:399 WorkOrderIssue.php:229
#: WorkOrderIssue.php:284 WorkOrderReceive.php:506 WorkOrderReceive.php:577
@@ -3909,7 +3911,7 @@
msgstr "Počet existujících záznamů Prodej analýza nemohla spustit, protože"
#: ConfirmDispatch_Invoice.php:1203 CounterSales.php:1574
-#: Credit_Invoice.php:1121 RecurringSalesOrdersProcess.php:422
+#: Credit_Invoice.php:1119 RecurringSalesOrdersProcess.php:422
#: SelectCreditItems.php:1592
msgid "SQL to count the no of sales analysis records"
msgstr "SQL počítat žádné prodeje analýzy záznamů"
@@ -3920,13 +3922,13 @@
msgstr "Prodej analýza záznamu nebylo možné přidat ani aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:1260 CounterSales.php:1632
-#: Credit_Invoice.php:1233 RecurringSalesOrdersProcess.php:481
+#: Credit_Invoice.php:1231 RecurringSalesOrdersProcess.php:481
#: SelectCreditItems.php:1702
msgid "The following SQL to insert the sales analysis record was used"
msgstr "Následující SQL vložit prodejní rekord analýza byla použita"
#: ConfirmDispatch_Invoice.php:1285 CounterSales.php:1656
-#: Credit_Invoice.php:1263
+#: Credit_Invoice.php:1261
msgid "The cost of sales GL posting could not be inserted because"
msgstr "Náklady na prodej GL vysílání nemohly být zařazeny, protože"
@@ -3937,9 +3939,9 @@
#: ConfirmDispatch_Invoice.php:1561 ConfirmDispatch_Invoice.php:1583
#: ContractCosting.php:225 ContractCosting.php:243 CounterSales.php:1657
#: CounterSales.php:1679 CounterSales.php:1705 CounterSales.php:1727
-#: CounterSales.php:1776 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
+#: CounterSales.php:1776 Credit_Invoice.php:1262 Credit_Invoice.php:1302
+#: Credit_Invoice.php:1329 Credit_Invoice.php:1350 Credit_Invoice.php:1379
+#: Credit_Invoice.php:1405 Credit_Invoice.php:1431
#: RecurringSalesOrdersProcess.php:509 RecurringSalesOrdersProcess.php:536
#: RecurringSalesOrdersProcess.php:630 SelectCreditItems.php:1736
#: SelectCreditItems.php:1764 SelectCreditItems.php:1789
@@ -4009,7 +4011,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:1498 GoodsReceived.php:585 ReverseGRN.php:176
+#: ConfirmDispatch_Invoice.php:1498 GoodsReceived.php:584 ReverseGRN.php:176
#: SupplierCredit.php:1201 SupplierCredit.php:1289 SupplierInvoice.php:1168
#: SupplierInvoice.php:1254
msgid "The following SQL to insert the fixed asset transaction record was used"
@@ -4040,7 +4042,7 @@
msgstr "Nákladní GL vysílání nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1582 CounterSales.php:1775
-#: Credit_Invoice.php:1432 RecurringSalesOrdersProcess.php:575
+#: Credit_Invoice.php:1430 RecurringSalesOrdersProcess.php:575
#: SelectCreditItems.php:1924
msgid "The tax GL posting could not be inserted because"
msgstr "Daň GL vysílání nemohly být zařazeny, protože"
@@ -4135,7 +4137,7 @@
#: ContractBOM.php:41 ContractOtherReqts.php:45 Contracts.php:88
#: Contracts.php:97 DeliveryDetails.php:259 DeliveryDetails.php:268
-#: EmailCustTrans.php:24 EmailCustTrans.php:28 GLAccountCSV.php:261
+#: EmailCustTrans.php:22 EmailCustTrans.php:26 GLAccountCSV.php:261
#: PO_Header.php:237 POReport.php:1467 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1158 StockQties_csv.php:43 StockUsage.php:22
#: SupplierCredit.php:216 SupplierCredit.php:228 SupplierCredit.php:240
@@ -4438,8 +4440,8 @@
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
-#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:237
+#: ContractCosting.php:305 GoodsReceived.php:450
+#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:248
#: StockLocTransferReceive.php:297 StockLocTransferReceive.php:306
#: StockTransfers.php:410 StockTransfers.php:420 WorkOrderIssue.php:160
#: WorkOrderReceive.php:423
@@ -4589,7 +4591,7 @@
"Měli byste být automaticky předána na vstup smlouvy stránku řádkové položky"
#: Contracts.php:87 Contracts.php:96 Customers.php:287 DeliveryDetails.php:259
-#: DeliveryDetails.php:268 EmailCustTrans.php:24 PO_Header.php:236
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:236
#: SalesAnalysis_UserDefined.php:46 StockUsage.php:21 SupplierCredit.php:214
#: SupplierCredit.php:226 SupplierCredit.php:238 SupplierCredit.php:248
#: SupplierCredit.php:256 SupplierInvoice.php:190 SupplierInvoice.php:198
@@ -4599,7 +4601,7 @@
msgstr "Pokud se tak nestane"
#: Contracts.php:87 Contracts.php:96 Customers.php:287 DeliveryDetails.php:259
-#: DeliveryDetails.php:268 EmailCustTrans.php:24 PO_Header.php:236
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:236
#: SelectOrderItems.php:1157 StockUsage.php:21 SupplierCredit.php:214
#: SupplierCredit.php:226 SupplierCredit.php:238 SupplierCredit.php:248
#: SupplierCredit.php:256 SupplierInvoice.php:190 SupplierInvoice.php:198
@@ -5787,59 +5789,59 @@
msgid "from the customer inquiry screen click the link to credit an invoice"
msgstr "z obrazovky zákazníka šetření klikněte na odkaz na úvěrové faktury"
-#: Credit_Invoice.php:69
+#: Credit_Invoice.php:67
msgid "A credit cannot be produced for the selected invoice"
msgstr "Úvěr nemůže být vyrobeny pro vybrané faktury"
-#: Credit_Invoice.php:69
+#: Credit_Invoice.php:67
msgid "The invoice details cannot be retrieved because"
msgstr "Fakturační údaje nelze získat, protože"
-#: Credit_Invoice.php:70
+#: Credit_Invoice.php:68
msgid "The SQL used to retrieve the invoice details was"
msgstr "SQL používá k načtení fakturační údaje byly"
-#: Credit_Invoice.php:127 Credit_Invoice.php:173
+#: Credit_Invoice.php:125 Credit_Invoice.php:171
msgid "This invoice can not be credited using this program"
msgstr "Tato faktura nemůže být připsána pomocí tohoto programu"
-#: Credit_Invoice.php:127 Credit_Invoice.php:173
+#: Credit_Invoice.php:125 Credit_Invoice.php:171
msgid "A manual credit note will need to be prepared"
msgstr "Manuální dobropisu bude muset být připraven"
-#: Credit_Invoice.php:128
+#: Credit_Invoice.php:126
msgid "The SQL used to get the transaction header was"
msgstr "SQL používá k získání transakce záhlaví byl"
-#: Credit_Invoice.php:173
+#: Credit_Invoice.php:171
msgid "The line item"
msgstr "Řádková položka"
-#: Credit_Invoice.php:173
+#: Credit_Invoice.php:171
msgid ""
"is controlled but the serial numbers or batch numbers could not be retrieved "
"because"
msgstr ""
"je řízen, ale sériová čísla nebo čísla šarže se nepodařilo získat, protože"
-#: Credit_Invoice.php:174
+#: Credit_Invoice.php:172
msgid "The SQL used to get the controlled item details was"
msgstr "SQL používá k získání kontrolované položky detaily o"
-#: Credit_Invoice.php:187
+#: Credit_Invoice.php:185
msgid "There are no line items that were retrieved for this invoice"
msgstr "Nejsou žádné řádkové položky, které byly získány na této faktuře"
-#: Credit_Invoice.php:187
+#: Credit_Invoice.php:185
msgid ""
"The automatic credit program can not create a credit note from this invoice"
msgstr "Automatické úvěrový program nemůže vytvořit dobropis od této faktuře"
-#: Credit_Invoice.php:193
+#: Credit_Invoice.php:191
msgid "This invoice can not be credited using the automatic facility"
msgstr "Tato faktura nemůže být připsána za použití automatického zařízení"
-#: Credit_Invoice.php:193
+#: Credit_Invoice.php:191
msgid ""
"Please report that a duplicate DebtorTrans header record was found for "
"invoice"
@@ -5847,7 +5849,7 @@
"Prosím oznamte, že duplicitní DebtorTrans hlavičku záznam byl nalezen na "
"faktuře"
-#: Credit_Invoice.php:238 SelectCreditItems.php:553
+#: Credit_Invoice.php:236 SelectCreditItems.php:553
msgid ""
"The item could not be updated because you are attempting to set the quantity "
"credited to less than 0 or the price less than 0 or the discount more than "
@@ -5856,39 +5858,39 @@
"Položku nelze aktualizovat, protože se snažíte nastavit množství připsána na "
"méně než 0 nebo je cena nižší než 0 nebo slevu více než 100% nebo méně než 0%"
-#: Credit_Invoice.php:267
+#: Credit_Invoice.php:265
msgid "Credit Invoice"
msgstr "Úvěrové faktury"
-#: Credit_Invoice.php:269
+#: Credit_Invoice.php:267
msgid "Credit Note amounts stated in"
msgstr "Dobropisu částky uvedené v"
-#: Credit_Invoice.php:273 PDFOrdersInvoiced.php:344 PDFOrderStatus.php:318
+#: Credit_Invoice.php:271 PDFOrdersInvoiced.php:344 PDFOrderStatus.php:318
#: ReverseGRN.php:380 SalesInquiry.php:822 ShipmentCosting.php:144
#: ShipmentCosting.php:146 Shipments.php:388
msgid "Invoiced"
msgstr "Fakturováno"
-#: Credit_Invoice.php:275 FixedAssetJournal.php:356 GLAccountInquiry.php:156
+#: Credit_Invoice.php:273 FixedAssetJournal.php:356 GLAccountInquiry.php:156
#: GLAccountReportphp:159 GLAccountReport.php:371 GLJournal.php:325
#: GLJournal.php:343 GLJournal.php:395 SuppCreditGRNs.php:230
msgid "Credit"
msgstr "Úvěr"
-#: Credit_Invoice.php:399
+#: Credit_Invoice.php:397
msgid "Freight cost charged on invoice"
msgstr "Přepravní náklady účtovány na faktuře"
-#: Credit_Invoice.php:402
+#: Credit_Invoice.php:400
msgid "Credit Freight Cost"
msgstr "Úvěrové náklady na dopravu"
-#: Credit_Invoice.php:451 SelectCreditItems.php:812
+#: Credit_Invoice.php:449 SelectCreditItems.php:812
msgid "Credit Totals"
msgstr "Úvěrové součtů"
-#: Credit_Invoice.php:463 SelectCreditItems.php:895
+#: Credit_Invoice.php:461 SelectCreditItems.php:895
msgid ""
"The GL code to write off the credit value to must be specified. Please "
"select the appropriate GL code for the selection box"
@@ -5896,7 +5898,7 @@
"Kód GL odepsat hodnotu úvěru musí být upřesněny. Prosím, vyberte příslušnou "
"GL kód pro výběr pole"
-#: Credit_Invoice.php:543
+#: Credit_Invoice.php:541
msgid ""
"The alteration to the invoice record to reflect the allocation of the credit "
"note to the invoice could not be done because"
@@ -5904,46 +5906,46 @@
"Změna k faktuře záznam odrážet rozdělení dobropisu k faktuře nemohlo být "
"provedeno, protože"
-#: Credit_Invoice.php:544
+#: Credit_Invoice.php:542
msgid "The following SQL to update the invoice allocation was used"
msgstr "Následující SQL aktualizovat fakturu alokace byl použit"
-#: Credit_Invoice.php:584 SelectCreditItems.php:1090
+#: Credit_Invoice.php:582 SelectCreditItems.php:1090
msgid ""
"The customer credit note transaction could not be added to the database "
"because"
msgstr "Zákazník dobropisu transakce nemůže být přidány do databáze, protože"
-#: Credit_Invoice.php:585 SelectCreditItems.php:1030
+#: Credit_Invoice.php:583 SelectCreditItems.php:1030
#: SelectCreditItems.php:1091
msgid "The following SQL to insert the customer credit note was used"
msgstr "Následující SQL vložit zákazníkovi dobropis byl použit"
-#: Credit_Invoice.php:617
+#: Credit_Invoice.php:615
msgid ""
"The allocation record for the credit note could not be added to the database "
"because"
msgstr "Rozdělení záznamu na dobropisu nemohl být přidán do databáze, protože"
-#: Credit_Invoice.php:618
+#: Credit_Invoice.php:616
msgid ""
"The following SQL to insert the allocation record for the credit note was "
"used"
msgstr "Následující SQL vložit přidělení rekord pro dobropisu byla použita"
-#: Credit_Invoice.php:634
+#: Credit_Invoice.php:632
msgid "Could not determine if the item"
msgstr "Nepodařilo se určit, zda položka"
-#: Credit_Invoice.php:634
+#: Credit_Invoice.php:632
msgid "is purchased or manufactured"
msgstr "Je nakoupených nebo vyrobených"
-#: Credit_Invoice.php:635
+#: Credit_Invoice.php:633
msgid "The SQL used that failed was"
msgstr "SQL použitý, která selhala byl"
-#: Credit_Invoice.php:667
+#: Credit_Invoice.php:665
msgid ""
"The sales order detail record could not be updated for the reduced quantity "
"invoiced because"
@@ -5951,35 +5953,35 @@
"Prodejní objednávky detail záznamu nelze aktualizovat na snížené množství "
"fakturované protože"
-#: Credit_Invoice.php:727
+#: Credit_Invoice.php:725
msgid "Could not get the current location stock of the assembly component"
msgstr "Nelze získat aktuální umístění zásob komponenty sestavení"
-#: Credit_Invoice.php:763 Credit_Invoice.php:792 Credit_Invoice.php:850
-#: Credit_Invoice.php:882 Credit_Invoice.php:982 Credit_Invoice.php:1060
+#: Credit_Invoice.php:761 Credit_Invoice.php:790 Credit_Invoice.php:848
+#: Credit_Invoice.php:880 Credit_Invoice.php:980 Credit_Invoice.php:1058
msgid "Ex Inv"
msgstr "Ex Inv"
-#: Credit_Invoice.php:809
+#: Credit_Invoice.php:807
msgid ""
"The following SQL to update the components location stock record was used"
msgstr ""
"Následující SQL k aktualizaci komponenty umístění skladové evidenci byl "
"používán"
-#: Credit_Invoice.php:905
+#: Credit_Invoice.php:903
msgid "The serial stock item record could not be selected because"
msgstr "Pořadové skladová položka záznamu nemohla být vybrána, protože"
-#: Credit_Invoice.php:906
+#: Credit_Invoice.php:904
msgid "The following SQL to select the serial stock item record was used"
msgstr "Následující SQL pro výběr sériového skladě záznam byl použit"
-#: Credit_Invoice.php:1020
+#: Credit_Invoice.php:1018
msgid "Written off ex Inv"
msgstr "Odepsány ex Inv"
-#: Credit_Invoice.php:1070 SelectCreditItems.php:1176
+#: Credit_Invoice.php:1068 SelectCreditItems.php:1176
msgid ""
"The following SQL to insert the stock movement records for the purpose of "
"display on the credit note was used"
@@ -5987,7 +5989,7 @@
"Následující SQL vložit záznamy pohyb zásob pro účely zobrazení na dobropisu "
"byla použita"
-#: Credit_Invoice.php:1092 SelectCreditItems.php:1269
+#: Credit_Invoice.php:1090 SelectCreditItems.php:1269
msgid ""
"Taxes and rates applicable to this credit note line item could not be "
"inserted because"
@@ -5995,18 +5997,18 @@
"Daně a sazeb platných pro tento řádek dobropisu položka nemůže být vložen, "
"protože"
-#: Credit_Invoice.php:1120 SelectCreditItems.php:1591
+#: Credit_Invoice.php:1118 SelectCreditItems.php:1591
msgid ""
"The count to check for existing Sales analysis records could not run because"
msgstr ""
"Počet zkontrolovat existující záznamy Prodej analýza nemohla spustit, protože"
-#: Credit_Invoice.php:1232 SelectCreditItems.php:1701
+#: Credit_Invoice.php:1230 SelectCreditItems.php:1701
msgid ""
"The sales analysis record for this credit note could not be added because"
msgstr "Analýza prodejní rekord pro tento dobropis nelze přidat, protože"
-#: Credit_Invoice.php:1303
+#: Credit_Invoice.php:1301
msgid ""
"The stock side or write off of the cost of sales GL posting could not be "
"inserted because"
@@ -6014,69 +6016,69 @@
"Populace strany nebo odepsat náklady na prodej GL vysílání nemohly být "
"zařazeny, protože"
-#: Credit_Invoice.php:1330 SelectCreditItems.php:1821
+#: Credit_Invoice.php:1328 SelectCreditItems.php:1821
msgid "The credit note GL posting could not be inserted because"
msgstr "Dobropis GL vysílání nemohly být zařazeny, protože"
-#: Credit_Invoice.php:1351 SelectCreditItems.php:1846
+#: Credit_Invoice.php:1349 SelectCreditItems.php:1846
msgid "The credit note discount GL posting could not be inserted because"
msgstr "Dobropis sleva GL vysílání nemohly být zařazeny, protože"
-#: Credit_Invoice.php:1380 SelectCreditItems.php:1876
+#: Credit_Invoice.php:1378 SelectCreditItems.php:1876
msgid ""
"The total debtor GL posting for the credit note could not be inserted because"
msgstr "Celková dlužník GL vysílání pro dobropisu nemůže být vložen, protože"
-#: Credit_Invoice.php:1406 SelectCreditItems.php:1899
+#: Credit_Invoice.php:1404 SelectCreditItems.php:1899
msgid ""
"The freight GL posting for this credit note could not be inserted because"
msgstr "Nákladní GL vysílání tohoto dobropisu nemůže být vložen, protože"
-#: Credit_Invoice.php:1445 SelectCreditItems.php:1936
+#: Credit_Invoice.php:1443 SelectCreditItems.php:1936
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1445 GoodsReceived.php:687 SupplierCredit.php:1302
+#: Credit_Invoice.php:1443 GoodsReceived.php:686 SupplierCredit.php:1302
#: SupplierInvoice.php:1275 WorkOrderIssue.php:352 WorkOrderReceive.php:672
#: Z_BottomUpCosts.php:33
msgid "has been processed"
msgstr "byla zpracována"
-#: Credit_Invoice.php:1447 Credit_Invoice.php:1449
+#: Credit_Invoice.php:1445 Credit_Invoice.php:1447
msgid "Print this credit note"
msgstr "Vytisknout tuto dobropis"
-#: Credit_Invoice.php:1459 SelectCreditItems.php:822
+#: Credit_Invoice.php:1457 SelectCreditItems.php:822
msgid "Credit Note Type"
msgstr "Poznámka: Typ úvěru"
-#: Credit_Invoice.php:1463 Credit_Invoice.php:1468 Credit_Invoice.php:1472
+#: Credit_Invoice.php:1461 Credit_Invoice.php:1466 Credit_Invoice.php:1470
#: SelectCreditItems.php:824 SelectCreditItems.php:829
msgid "Goods returned to store"
msgstr "Zboží se vrátil k ukládání"
-#: Credit_Invoice.php:1464 Credit_Invoice.php:1467 Credit_Invoice.php:1471
+#: Credit_Invoice.php:1462 Credit_Invoice.php:1465 Credit_Invoice.php:1469
#: SelectCreditItems.php:825 SelectCreditItems.php:828
msgid "Goods written off"
msgstr "Zboží odepsány"
-#: Credit_Invoice.php:1465 Credit_Invoice.php:1469 Credit_Invoice.php:1473
+#: Credit_Invoice.php:1463 Credit_Invoice.php:1467 Credit_Invoice.php:1471
msgid "Reverse overcharge"
msgstr "Reverzní přebíjením"
-#: Credit_Invoice.php:1482
+#: Credit_Invoice.php:1480
msgid "Goods returned to location"
msgstr "Zboží se vrátil k umístění"
-#: Credit_Invoice.php:1503 SelectCreditItems.php:864
+#: Credit_Invoice.php:1501 SelectCreditItems.php:864
msgid "Write off the cost of the goods to"
msgstr "Odepsat náklady na zboží"
-#: Credit_Invoice.php:1527
+#: Credit_Invoice.php:1525
msgid "Credit note text"
msgstr "Dobropis text"
-#: Credit_Invoice.php:1530
+#: Credit_Invoice.php:1528
msgid "Process Credit"
msgstr "Proces Úvěrové"
@@ -6108,7 +6110,7 @@
msgid "Back to Credit Note Entry"
msgstr "Zpět na dobropis Vstup"
-#: CreditItemsControlled.php:58 StockAdjustmentsControlled.php:32
+#: CreditItemsControlled.php:58 StockAdjustmentsControlled.php:34
#: StockTransferControlled.php:49
msgid "Notice"
msgstr "Poznámka"
@@ -6389,13 +6391,13 @@
msgstr "Povolit zasílání EDI faktur"
#: CustEDISetup.php:103 CustEDISetup.php:106 CustEDISetup.php:117
-#: CustEDISetup.php:120 CustomerBranches.php:733 CustomerBranches.php:735
+#: CustEDISetup.php:120 CustomerBranches.php:743 CustomerBranches.php:745
#: SystemParameters.php:796
msgid "Disabled"
msgstr "Zakázáno"
#: CustEDISetup.php:104 CustEDISetup.php:107 CustEDISetup.php:118
-#: CustEDISetup.php:121 CustomerBranches.php:732 CustomerBranches.php:736
+#: CustEDISetup.php:121 CustomerBranches.php:742 CustomerBranches.php:746
msgid "Enabled"
msgstr "Povoleno"
@@ -6587,13 +6589,13 @@
#: Customers.php:715 Factors.php:222 Factors.php:261 OrderDetails.php:99
#: PrintCustTrans.php:662 PrintCustTrans.php:882 PrintCustTrans.php:929
#: PrintCustTransPortrait.php:713 PrintCustTransPortrait.php:933
-#: PrintCustTransPortrait.php:977 SalesPeople.php:186 Suppliers.php:670
+#: PrintCustTransPortrait.php:977 SalesPeople.php:192 Suppliers.php:670
#: Suppliers.php:849 SuppLoginSetup.php:236 WWW_Users.php:260
msgid "Telephone"
msgstr "Telefon"
-#: CustLoginSetup.php:271 CustomerBranches.php:374 CustomerBranches.php:706
-#: CustomerInquiry.php:249 EmailCustTrans.php:17 EmailCustTrans.php:65
+#: CustLoginSetup.php:271 CustomerBranches.php:374 CustomerBranches.php:716
+#: CustomerInquiry.php:249 EmailCustTrans.php:15 EmailCustTrans.php:63
#: Factors.php:226 Factors.php:263 Locations.php:533 OrderDetails.php:105
#: PDFRemittanceAdvice.php:251 PO_PDFPurchOr...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-12 09:30:22
|
Revision: 4595
http://web-erp.svn.sourceforge.net/web-erp/?rev=4595&view=rev
Author: daintree
Date: 2011-06-12 09:30:10 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-11 07:26:47 UTC (rev 4594)
+++ trunk/doc/Change.log 2011-06-12 09:30:10 UTC (rev 4595)
@@ -1,6 +1,10 @@
webERP Change Log
-9/6/11 Phil : Prices.php now updates the end date of a price when a new default (no end date) price is added
+12/6/11 Version 4.04.4
+
+12/6/11 Phil: Customers.php included telephone and email from the first branch found - removed as could be confusing. Customer contact information is stored in CustomerContacts and custbranch table
+12/6/11 Phil: SupplierCredit.php variables containing value case consistency
+9/6/11 Phil: Prices.php now updates the end date of a price when a new default (no end date) price is added
9/6/11 Ricard: PcExpensesTypeTab.php deletion question message fixed as does not delete any expenses set up with this expense type
9/6/11 Daniel Richert: includes/LanguageSetup.php changed to set $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']); as using LC_ALL over-rides numeric and we need decimal points as . - commas stuff things up
9/6/11 Ricard: Added new field current to salesman table to flag if the salesman is currently still on the team or not - modified WWW_Users.php and CustomerBranches to only allow selection of current salesfolk
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-06-11 07:26:47 UTC (rev 4594)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-06-12 09:30:10 UTC (rev 4595)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-30 20:51+1200\n"
+"POT-Creation-Date: 2011-06-12 21:24+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -141,8 +141,8 @@
#: Locations.php:293 Locations.php:301 MRPDemandTypes.php:87
#: PaymentMethods.php:140 PaymentTerms.php:147 PaymentTerms.php:154
#: PcExpenses.php:152 SalesCategories.php:125 SalesCategories.php:133
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:145
-#: SalesTypes.php:155 Shippers.php:82 Shippers.php:94 StockCategories.php:179
+#: SalesPeople.php:149 SalesPeople.php:156 SalesTypes.php:150
+#: SalesTypes.php:160 Shippers.php:82 Shippers.php:94 StockCategories.php:179
#: Stocks.php:475 Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
#: Stocks.php:516 Suppliers.php:609 Suppliers.php:618 Suppliers.php:626
#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:127
@@ -199,7 +199,7 @@
#: BOMExtendedQty.php:272 BOMIndented.php:247 BOMIndentedReverse.php:246
#: BOMInquiry.php:165 BOMListing.php:112 BOMs.php:208 BOMs.php:790
#: COGSGLPostings.php:18 CompanyPreferences.php:155 CounterSales.php:1983
-#: CounterSales.php:2107 Credit_Invoice.php:257 CreditStatus.php:20
+#: CounterSales.php:2107 Credit_Invoice.php:255 CreditStatus.php:20
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:10
#: DebtorsAtPeriodEnd.php:124 DiscountCategories.php:10
#: DiscountCategories.php:128 DiscountMatrix.php:16 EDIMessageFormat.php:104
@@ -217,7 +217,7 @@
#: PurchData.php:146 PurchData.php:257 PurchData.php:276
#: RecurringSalesOrders.php:310 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:34
-#: SalesPeople.php:22 SalesTypes.php:20 SelectAsset.php:45
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
@@ -279,7 +279,8 @@
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
#: SalesAnalReptCols.php:404 SalesAnalRepts.php:404 SalesAnalRepts.php:407
#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
+#: SalesAnalRepts.php:459 SalesPeople.php:208 SalesPeople.php:316
+#: SalesPeople.php:318 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
#: SystemParameters.php:380 SystemParameters.php:403 SystemParameters.php:419
@@ -315,7 +316,8 @@
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
#: SalesAnalReptCols.php:405 SalesAnalRepts.php:403 SalesAnalRepts.php:406
#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
+#: SalesAnalRepts.php:458 SalesPeople.php:208 SalesPeople.php:321
+#: SalesPeople.php:323 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
#: SystemParameters.php:381 SystemParameters.php:404 SystemParameters.php:420
@@ -343,8 +345,8 @@
#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
-#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:210
-#: SalesTypes.php:204 SecurityTokens.php:110 SelectCustomer.php:613
+#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:219
+#: SalesTypes.php:209 SecurityTokens.php:110 SelectCustomer.php:613
#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
#: SelectCustomer.php:694 SelectCustomer.php:710 Shippers.php:144
#: StockCategories.php:240 SupplierContacts.php:157 SupplierTypes.php:189
@@ -361,7 +363,7 @@
#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:165
#: BankAccounts.php:222 BOMs.php:146 COGSGLPostings.php:109
#: COGSGLPostings.php:212 ContractBOM.php:270 ContractOtherReqts.php:121
-#: CounterSales.php:781 Credit_Invoice.php:386 CreditStatus.php:175
+#: CounterSales.php:781 Credit_Invoice.php:384 CreditStatus.php:175
#: Currencies.php:241 CustLoginSetup.php:308 CustomerReceipt.php:863
#: Customers.php:958 CustomerTypes.php:203 DiscountCategories.php:215
#: DiscountMatrix.php:173 EDIMessageFormat.php:151
@@ -374,7 +376,7 @@
#: PO_AuthorisationLevels.php:151 PO_Items.php:687 Prices_Customer.php:281
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
-#: SalesGLPostings.php:246 SalesPeople.php:211 SalesTypes.php:205
+#: SalesGLPostings.php:246 SalesPeople.php:220 SalesTypes.php:210
#: SecurityTokens.php:111 SelectCreditItems.php:745 SelectCustomer.php:614
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:695 SelectCustomer.php:711 SelectOrderItems.php:1370
@@ -385,7 +387,7 @@
#: SuppShiptChgs.php:89 SuppTransGLAnalysis.php:119 TaxAuthorities.php:173
#: TaxCategories.php:183 TaxGroups.php:179 TaxProvinces.php:177
#: UnitsOfMeasure.php:189 WorkCentres.php:138 WOSerialNos.php:303
-#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:57
+#: WWW_Access.php:124 WWW_Users.php:306 includes/InputSerialItemsKeyed.php:59
#: includes/OutputSerialItems.php:98
#, php-format
msgid "Delete"
@@ -439,7 +441,7 @@
#: OffersReceived.php:52 OffersReceived.php:129 PaymentMethods.php:282
#: PaymentTerms.php:284 PO_AuthorisationLevels.php:244 Prices_Customer.php:350
#: SalesAnalReptCols.php:510 SalesAnalRepts.php:494 SalesGLPostings.php:416
-#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:557
+#: SalesPeople.php:329 Shippers.php:196 StockCategories.php:557
#: SupplierContacts.php:258 SuppLoginSetup.php:529 TaxAuthorities.php:312
#: TaxCategories.php:233 TaxProvinces.php:227 UnitsOfMeasure.php:240
#: WorkCentres.php:261 WWW_Users.php:638
@@ -545,7 +547,7 @@
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
-#: SalesPeople.php:94 SalesTypes.php:61 Stocks.php:355 Suppliers.php:510
+#: SalesPeople.php:96 SalesTypes.php:66 Stocks.php:355 Suppliers.php:510
#: SupplierTypes.php:67
msgid "has been updated"
msgstr "byla aktualizována"
@@ -560,7 +562,7 @@
#: AddCustomerContacts.php:112 CompanyPreferences.php:224
#: CustomerBranches.php:368 Customers.php:915 Customers.php:921
-#: Customers.php:986 SalesPeople.php:185 SelectCustomer.php:609
+#: Customers.php:986 SalesPeople.php:191 SelectCustomer.php:609
#: StockDispatch.php:185 StockDispatch.php:197 SupplierContacts.php:145
#: SupplierCredit.php:441 SupplierInvoice.php:408 SuppTransGLAnalysis.php:103
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
@@ -664,9 +666,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:167 UpgradeDatabase.php:170
-#: UpgradeDatabase.php:173 UpgradeDatabase.php:176 UpgradeDatabase.php:179
-#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
+#: Stocks.php:882 UpgradeDatabase.php:169 UpgradeDatabase.php:172
+#: UpgradeDatabase.php:175 UpgradeDatabase.php:178 UpgradeDatabase.php:181
+#: UpgradeDatabase.php:184 UpgradeDatabase.php:187 UpgradeDatabase.php:190
#: 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
@@ -781,7 +783,7 @@
#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:162
#: BOMExtendedQty.php:259 BOMIndented.php:153 BOMIndented.php:234
#: BOMIndentedReverse.php:154 BOMIndentedReverse.php:232 BOMListing.php:47
-#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
+#: Credit_Invoice.php:184 DebtorsAtPeriodEnd.php:59 DebtorsAtPeriodEnd.php:71
#: FTP_RadioBeacon.php:187 GetStockImage.php:154 GLBalanceSheet.php:93
#: GLBalanceSheet.php:131 GLBalanceSheet.php:294 GLProfit_Loss.php:160
#: GLProfit_Loss.php:172 GLTagProfit_Loss.php:175 GLTagProfit_Loss.php:187
@@ -844,7 +846,7 @@
#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
-#: CounterSales.php:1337 Credit_Invoice.php:705 Credit_Invoice.php:727
+#: CounterSales.php:1337 Credit_Invoice.php:703 Credit_Invoice.php:725
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
@@ -1058,7 +1060,7 @@
#: MRPDemands.php:247 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:166
#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:137
-#: SalesTypes.php:161 StockCategories.php:196 Suppliers.php:635
+#: SalesTypes.php:166 StockCategories.php:196 Suppliers.php:635
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
msgid "has been deleted"
msgstr "byl zrušen"
@@ -1393,7 +1395,7 @@
msgstr "od"
#: BankMatching.php:110 ConfirmDispatchControlled_Invoice.php:58
-#: EmailCustTrans.php:65 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
+#: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
#: GLAccountCSV.php:171 GLAccountReport.php:102 Payments.php:717
#: PcReportTab.php:102 PDFChequeListing.php:107 PDFChequeListing.php:117
#: PDFChequeListing.php:192 PDFDeliveryDifferences.php:166
@@ -1506,7 +1508,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:281
+#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
#: CustomerAllocations.php:358 CustomerReceipt.php:842
#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
@@ -1641,7 +1643,7 @@
#: BankReconciliation.php:196 BankReconciliation.php:268
#: CustomerAllocations.php:330 CustomerAllocations.php:356
#: CustomerInquiry.php:191 CustomerTransInquiry.php:86 CustWhereAlloc.php:89
-#: EmailCustTrans.php:17 GLAccountInquiry.php:153 GLAccountReportphp:156
+#: EmailCustTrans.php:15 GLAccountInquiry.php:153 GLAccountReportphp:156
#: PrintCustTrans.php:450 PrintCustTrans.php:651 PrintCustTrans.php:871
#: PrintCustTrans.php:918 PrintCustTransPortrait.php:502
#: PrintCustTransPortrait.php:703 PrintCustTransPortrait.php:922
@@ -1786,7 +1788,7 @@
#: ContractCosting.php:80 ContractCosting.php:131 ContractOtherReqts.php:95
#: Contracts.php:932 Contracts.php:956 CounterSales.php:701
#: CounterSales.php:1994 CounterSales.php:2174 CounterSales.php:2302
-#: Credit_Invoice.php:275 DeliveryDetails.php:822 DeliveryDetails.php:887
+#: Credit_Invoice.php:273 DeliveryDetails.php:822 DeliveryDetails.php:887
#: GoodsReceived.php:88 GoodsReceived.php:92 GoodsReceived.php:95
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
@@ -2184,7 +2186,7 @@
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
#: SalesCategories.php:422 SelectProduct.php:512 Shipt_Select.php:166
-#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
+#: StockAdjustments.php:76 StockAdjustments.php:335 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
#: StockUsage.php:58 SupplierTenders.php:359 WorkOrderEntry.php:582
@@ -2237,7 +2239,7 @@
#: PDFOrderStatus.php:315 PDFPrintLabel.php:238 PO_Header.php:542
#: PO_Items.php:928 PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:177
#: PricesByCost.php:151 PurchData.php:339 ReorderLevelLocation.php:54
-#: ReorderLevelLocation.php:203 SalesPeople.php:184
+#: ReorderLevelLocation.php:203 SalesPeople.php:190
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:709
@@ -2251,7 +2253,7 @@
#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:266
#: ContractBOM.php:342 CounterSales.php:1989 CounterSales.php:2169
-#: Credit_Invoice.php:274 GoodsReceived.php:89 GoodsReceived.php:93
+#: Credit_Invoice.php:272 GoodsReceived.php:89 GoodsReceived.php:93
#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:932
#: PO_SelectOSPurchOrder.php:214 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
@@ -2293,7 +2295,7 @@
#: BOMInquiry.php:174 ContractBOM.php:243 ContractCosting.php:76
#: ContractCosting.php:82 ContractCosting.php:132 ContractOtherReqts.php:96
#: Contracts.php:934 Contracts.php:957 MRPPlannedWorkOrders.php:260
-#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:340
+#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:351
msgid "Unit Cost"
msgstr "Jednotková cena"
@@ -2406,12 +2408,12 @@
"Účinné k dnešnímu dni pole musí být data ve formátu dd / mm / rr nebo dd / "
"mm / rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
-#: BOMs.php:231 StockAdjustments.php:89 StockTransfers.php:150
+#: BOMs.php:231 StockAdjustments.php:100 StockTransfers.php:150
#: WorkOrderEntry.php:260
msgid "The quantity entered must be numeric"
msgstr "Množství uvedené musí být číslo"
-#: BOMs.php:237 StockAdjustments.php:92
+#: BOMs.php:237 StockAdjustments.php:103
msgid "The quantity entered cannot be zero"
msgstr "Množství uvedené nemůže být nula"
@@ -2536,7 +2538,7 @@
msgstr "SQL slouží k získání popisu mateřské část byla"
#: BOMs.php:397 ConfirmDispatch_Invoice.php:1009 CounterSales.php:1372
-#: Credit_Invoice.php:763 Credit_Invoice.php:792 SelectCreditItems.php:1417
+#: Credit_Invoice.php:761 Credit_Invoice.php:790 SelectCreditItems.php:1417
#: Stocks.php:810 Stocks.php:812
msgid "Assembly"
msgstr "Sestava"
@@ -2925,10 +2927,10 @@
msgstr "Vytvořte GL údaje pro obchodů s akciemi"
#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:618
-#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1528
+#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1526
#: FixedAssetItems.php:120 FixedAssetItems.php:566 GLBudgets.php:216
#: GLTags.php:62 GoodsReceived.php:229 GoodsReceived.php:235
-#: GoodsReceived.php:242 GoodsReceived.php:699 Labels.php:262
+#: GoodsReceived.php:242 GoodsReceived.php:698 Labels.php:262
#: MRPCalendar.php:307 Payments.php:860 PcAuthorizeExpenses.php:283
#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:221 PurchData.php:505
#: ReorderLevelLocation.php:156 SecurityTokens.php:89
@@ -2989,7 +2991,7 @@
msgstr "Zpět na Potvrzení o odeslání"
#: ConfirmDispatchControlled_Invoice.php:56 CounterSales.php:1207
-#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:11
+#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:9
#: PaymentAllocations.php:33 SelectSalesOrder.php:742 SelectSalesOrder.php:811
#: SelectSalesOrder.php:838 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
@@ -3031,7 +3033,7 @@
msgid "The SQL to get the order header was"
msgstr "SQL získat pořadí záhlaví byl"
-#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:127 OrderDetails.php:140
+#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:125 OrderDetails.php:140
#: RecurringSalesOrders.php:125 SelectOrderItems.php:220
msgid "The line items of the order cannot be retrieved because"
msgstr "Řádkové položky v řádu nelze načíst, protože"
@@ -3105,7 +3107,7 @@
#: ConfirmDispatch_Invoice.php:263 ContractBOM.php:239 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
-#: CounterSales.php:2301 Credit_Invoice.php:271 DeliveryDetails.php:820
+#: CounterSales.php:2301 Credit_Invoice.php:269 DeliveryDetails.php:820
#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:639
#: PO_OrderDetails.php:142 PrintCustTrans.php:799 PrintCustTrans.php:887
#: PrintCustTrans.php:934 PrintCustTransPortrait.php:855
@@ -3130,7 +3132,7 @@
#: ConfirmDispatch_Invoice.php:264 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
-#: Credit_Invoice.php:272 DeliveryDetails.php:821 DeliveryDetails.php:886
+#: Credit_Invoice.php:270 DeliveryDetails.php:821 DeliveryDetails.php:886
#: OrderDetails.php:154 PO_Items.php:706 PO_OrderDetails.php:143
#: PrintCustTrans.php:800 PrintCustTrans.php:888 PrintCustTrans.php:935
#: PrintCustTransPortrait.php:856 PrintCustTransPortrait.php:939
@@ -3168,7 +3170,7 @@
msgid "This Dispatch"
msgstr "Tato zásilka"
-#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:276
+#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:274
#: DeliveryDetails.php:824 DeliveryDetails.php:889 GoodsReceived.php:98
#: OffersReceived.php:97 OffersReceived.php:197 OffersReceived.php:244
#: OrderDetails.php:157 PDFOrdersInvoiced.php:385 PDFPriceList.php:359
@@ -3190,7 +3192,7 @@
msgid "Price"
msgstr "Cena"
-#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:275
#: CustomerReceipt.php:843 DeliveryDetails.php:825 OrderDetails.php:158
#: PrintCustTrans.php:804 PrintCustTrans.php:892 PrintCustTrans.php:939
#: PrintCustTransPortrait.php:860 PrintCustTransPortrait.php:943
@@ -3204,8 +3206,8 @@
msgstr "Sleva"
#: ConfirmDispatch_Invoice.php:271 ConfirmDispatch_Invoice.php:275
-#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:278
-#: Credit_Invoice.php:282 CustomerAllocations.php:332
+#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:276
+#: Credit_Invoice.php:280 CustomerAllocations.php:332
#: CustomerAllocations.php:358 CustomerInquiry.php:197 DeliveryDetails.php:826
#: DeliveryDetails.php:890 GLBalanceSheet.php:172 GLBalanceSheet.php:181
#: GLBalanceSheet.php:258 GLBalanceSheet.php:267 GLBudgets.php:195
@@ -3234,12 +3236,12 @@
msgid "Total"
msgstr "Celkem"
-#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:278
+#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:276
#: SelectCreditItems.php:656
msgid "Excl Tax"
msgstr "bez DPH"
-#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:279
+#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:277
#: SelectCreditItems.php:657 SupplierInvoice.php:233 TaxGroups.php:270
msgid "Tax Authority"
msgstr "Daňový úřad"
@@ -3248,15 +3250,15 @@
msgid "Tax %"
msgstr "DPH %"
-#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:280
-#: Credit_Invoice.php:281 PrintCustTrans.php:391 PrintCustTrans.php:976
+#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:278
+#: Credit_Invoice.php:279 PrintCustTrans.php:391 PrintCustTrans.php:976
#: PrintCustTransPortrait.php:450 PrintCustTransPortrait.php:1023
#: SelectCreditItems.php:658 SelectCreditItems.php:659
#: includes/PDFTaxPageHeader.inc:40
msgid "Tax"
msgstr "DPH"
-#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:282
+#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:280
#: SelectCreditItems.php:660
msgid "Incl Tax"
msgstr "včetně DPH"
@@ -3292,8 +3294,8 @@
"nákladní společnost mají být použity"
#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244 Prices.php:342
-#: includes/InputSerialItemsExisting.php:58
-#: includes/InputSerialItemsKeyed.php:139
+#: includes/InputSerialItemsExisting.php:59
+#: includes/InputSerialItemsKeyed.php:141
#: includes/InputSerialItemsSequential.php:48
#: includes/OutputSerialItems.php:204
msgid "Enter"
@@ -3382,12 +3384,12 @@
msgid "Please remedy this"
msgstr "Prosím nápravě tohoto"
-#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:483
#: GoodsReceived.php:252
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:645 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:483
#: GoodsReceived.php:252
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
@@ -3490,19 +3492,19 @@
#: CounterSales.php:1336 CounterSales.php:1379 CounterSales.php:1389
#: CounterSales.php:1473 CounterSales.php:1494 CounterSales.php:1656
#: CounterSales.php:1678 CounterSales.php:1704 CounterSales.php:1726
-#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:193
-#: Credit_Invoice.php:543 Credit_Invoice.php:584 Credit_Invoice.php:601
-#: Credit_Invoice.php:617 Credit_Invoice.php:667 Credit_Invoice.php:682
-#: Credit_Invoice.php:798 Credit_Invoice.php:808 Credit_Invoice.php:890
-#: Credit_Invoice.php:905 Credit_Invoice.php:920 Credit_Invoice.php:930
-#: Credit_Invoice.php:945 Credit_Invoice.php:989 Credit_Invoice.php:1028
-#: Credit_Invoice.php:1069 Credit_Invoice.php:1092 Credit_Invoice.php:1263
-#: Credit_Invoice.php:1303 Credit_Invoice.php:1330 Credit_Invoice.php:1351
-#: Credit_Invoice.php:1380 Credit_Invoice.php:1406 Credit_Invoice.php:1432
-#: GoodsReceived.php:271 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:636 GoodsReceived.php:661 PDFStockCheckComparison.php:122
+#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:191
+#: Credit_Invoice.php:541 Credit_Invoice.php:582 Credit_Invoice.php:599
+#: Credit_Invoice.php:615 Credit_Invoice.php:665 Credit_Invoice.php:680
+#: Credit_Invoice.php:796 Credit_Invoice.php:806 Credit_Invoice.php:888
+#: Credit_Invoice.php:903 Credit_Invoice.php:918 Credit_Invoice.php:928
+#: Credit_Invoice.php:943 Credit_Invoice.php:987 Credit_Invoice.php:1026
+#: Credit_Invoice.php:1067 Credit_Invoice.php:1090 Credit_Invoice.php:1261
+#: Credit_Invoice.php:1301 Credit_Invoice.php:1328 Credit_Invoice.php:1349
+#: Credit_Invoice.php:1378 Credit_Invoice.php:1404 Credit_Invoice.php:1430
+#: GoodsReceived.php:271 GoodsReceived.php:351 GoodsReceived.php:392
+#: GoodsReceived.php:422 GoodsReceived.php:450 GoodsReceived.php:481
+#: GoodsReceived.php:499 GoodsReceived.php:528 GoodsReceived.php:545
+#: GoodsReceived.php:635 GoodsReceived.php:660 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3528,9 +3530,9 @@
#: ShipmentCosting.php:243 ShipmentCosting.php:289 ShipmentCosting.php:310
#: ShipmentCosting.php:324 ShipmentCosting.php:358 ShipmentCosting.php:381
#: ShipmentCosting.php:413 ShipmentCosting.php:431 ShipmentCosting.php:444
-#: StockAdjustments.php:157 StockAdjustments.php:191 StockAdjustments.php:208
-#: StockAdjustments.php:224 StockAdjustments.php:237 StockAdjustments.php:265
-#: StockAdjustments.php:287 StockDispatch.php:177 StockLocTransfer.php:74
+#: StockAdjustments.php:168 StockAdjustments.php:202 StockAdjustments.php:219
+#: StockAdjustments.php:235 StockAdjustments.php:248 StockAdjustments.php:276
+#: StockAdjustments.php:298 StockDispatch.php:177 StockLocTransfer.php:74
#: StockLocTransfer.php:96 StockLocTransfer.php:100
#: StockLocTransferReceive.php:105 StockLocTransferReceive.php:139
#: StockLocTransferReceive.php:153 StockLocTransferReceive.php:172
@@ -3599,19 +3601,19 @@
#: CounterSales.php:1336 CounterSales.php:1379 CounterSales.php:1389
#: CounterSales.php:1473 CounterSales.php:1494 CounterSales.php:1656
#: CounterSales.php:1678 CounterSales.php:1704 CounterSales.php:1726
-#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:543
-#: Credit_Invoice.php:584 Credit_Invoice.php:601 Credit_Invoice.php:617
-#: Credit_Invoice.php:667 Credit_Invoice.php:682 Credit_Invoice.php:798
-#: Credit_Invoice.php:808 Credit_Invoice.php:890 Credit_Invoice.php:905
-#: Credit_Invoice.php:920 Credit_Invoice.php:930 Credit_Invoice.php:945
-#: Credit_Invoice.php:989 Credit_Invoice.php:1028 Credit_Invoice.php:1069
-#: Credit_Invoice.php:1092 Credit_Invoice.php:1263 Credit_Invoice.php:1303
-#: Credit_Invoice.php:1330 Credit_Invoice.php:1351 Credit_Invoice.php:1380
-#: Credit_Invoice.php:1406 Credit_Invoice.php:1432 GoodsReceived.php:271
-#: 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:636
-#: GoodsReceived.php:661 PDFStockCheckComparison.php:122
+#: CounterSales.php:1752 CounterSales.php:1775 Credit_Invoice.php:541
+#: Credit_Invoice.php:582 Credit_Invoice.php:599 Credit_Invoice.php:615
+#: Credit_Invoice.php:665 Credit_Invoice.php:680 Credit_Invoice.php:796
+#: Credit_Invoice.php:806 Credit_Invoice.php:888 Credit_Invoice.php:903
+#: Credit_Invoice.php:918 Credit_Invoice.php:928 Credit_Invoice.php:943
+#: Credit_Invoice.php:987 Credit_Invoice.php:1026 Credit_Invoice.php:1067
+#: Credit_Invoice.php:1090 Credit_Invoice.php:1261 Credit_Invoice.php:1301
+#: Credit_Invoice.php:1328 Credit_Invoice.php:1349 Credit_Invoice.php:1378
+#: Credit_Invoice.php:1404 Credit_Invoice.php:1430 GoodsReceived.php:271
+#: GoodsReceived.php:351 GoodsReceived.php:392 GoodsReceived.php:422
+#: GoodsReceived.php:450 GoodsReceived.php:481 GoodsReceived.php:499
+#: GoodsReceived.php:528 GoodsReceived.php:545 GoodsReceived.php:635
+#: GoodsReceived.php:660 PDFStockCheckComparison.php:122
#: PDFStockCheckComparison.php:130 PDFStockCheckComparison.php:137
#: PDFStockCheckComparison.php:156 PDFStockCheckComparison.php:175
#: RecurringSalesOrdersProcess.php:321 RecurringSalesOrdersProcess.php:361
@@ -3637,9 +3639,9 @@
#: ShipmentCosting.php:243 ShipmentCosting.php:289 ShipmentCosting.php:310
#: ShipmentCosting.php:324 ShipmentCosting.php:358 ShipmentCosting.php:381
#: ShipmentCosting.php:413 ShipmentCosting.php:431 ShipmentCosting.php:444
-#: StockAdjustments.php:157 StockAdjustments.php:191 StockAdjustments.php:208
-#: StockAdjustments.php:224 StockAdjustments.php:237 StockAdjustments.php:265
-#: StockAdjustments.php:287 StockLocTransferReceive.php:105
+#: StockAdjustments.php:168 StockAdjustments.php:202 StockAdjustments.php:219
+#: StockAdjustments.php:235 StockAdjustments.php:248 StockAdjustments.php:276
+#: StockAdjustments.php:298 StockLocTransferReceive.php:105
#: StockLocTransferReceive.php:139 StockLocTransferReceive.php:153
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:218
#: StockLocTransferReceive.php:254 StockLocTransferReceive.php:268
@@ -3705,13 +3707,13 @@
msgstr "Následující SQL vložit dlužníka transakce záznam byl použit"
#: ConfirmDispatch_Invoice.php:795 CounterSales.php:1266
-#: Credit_Invoice.php:601 RecurringSalesOrdersProcess.php:694
+#: Credit_Invoice.php:599 RecurringSalesOrdersProcess.php:694
#: SelectCreditItems.php:1107
msgid "The debtor transaction taxes records could not be inserted because"
msgstr "Dlužník transakčních daní záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:796 CounterSales.php:1267
-#: Credit_Invoice.php:602 RecurringSalesOrdersProcess.php:695
+#: Credit_Invoice.php:600 RecurringSalesOrdersProcess.php:695
#: SelectCreditItems.php:1108
msgid ""
"The following SQL to insert the debtor transaction taxes record was used"
@@ -3727,7 +3729,7 @@
msgstr "Prodejní objednávky detail záznamu nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:828 ConfirmDispatch_Invoice.php:906
-#: Credit_Invoice.php:668 RecurringSalesOrdersProcess.php:322
+#: Credit_Invoice.php:666 RecurringSalesOrdersProcess.php:322
msgid "The following SQL to update the sales order detail record was used"
msgstr ""
"Následující SQL aktualizovat prodejní objednávky detail záznam byl použit"
@@ -3756,12 +3758,12 @@
msgstr "Nepodařilo se získat aktuální polohu vozidla"
#: ConfirmDispatch_Invoice.php:942 CounterSales.php:1303
-#: Credit_Invoice.php:682 SelectCreditItems.php:1350
+#: Credit_Invoice.php:680 SelectCreditItems.php:1350
msgid "Location stock record could not be updated because"
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:943 ContractCosting.php:306
-#: CounterSales.php:1304 Credit_Invoice.php:683 GoodsReceived.php:452
+#: CounterSales.php:1304 Credit_Invoice.php:681 GoodsReceived.php:451
#: ReverseGRN.php:220 SelectCreditItems.php:1351 StockTransfers.php:411
#: StockTransfers.php:421 WorkOrderIssue.php:161 WorkOrderReceive.php:318
#: WorkOrderReceive.php:424
@@ -3769,12 +3771,12 @@
msgstr "Následující SQL aktualizovat umístění skladové evidenci byl používán"
#: ConfirmDispatch_Invoice.php:961 CounterSales.php:1322
-#: Credit_Invoice.php:704 SelectCreditItems.php:1371
+#: Credit_Invoice.php:702 SelectCreditItems.php:1371
msgid "Could not retrieve assembly components from the database for"
msgstr "Nepodařilo se načíst součásti sestavy z databáze"
#: ConfirmDispatch_Invoice.php:961 CounterSales.php:1322
-#: Credit_Invoice.php:704 EDIMessageFormat.php:43 EDISendInvoices.php:105
+#: Credit_Invoice.php:702 EDIMessageFormat.php:43 EDISendInvoices.php:105
#: FixedAssetCategories.php:86 FixedAssetCategories.php:106
#: PricesBasedOnMarkUp.php:337 PricesBasedOnMarkUp.php:353
#: SelectCreditItems.php:1371 SpecialOrder.php:423 StockCategories.php:21
@@ -3801,12 +3803,12 @@
msgstr "Objednávka"
#: ConfirmDispatch_Invoice.php:1015 CounterSales.php:1379
-#: Credit_Invoice.php:798 SelectCreditItems.php:1423
+#: Credit_Invoice.php:796 SelectCreditItems.php:1423
msgid "Stock movement records for the assembly components of"
msgstr "Sklad pohyb záznamy pro montáž komponent"
#: ConfirmDispatch_Invoice.php:1015 CounterSales.php:1379
-#: Credit_Invoice.php:798 SelectCreditItems.php:1423 ShipmentCosting.php:381
+#: Credit_Invoice.php:796 SelectCreditItems.php:1423 ShipmentCosting.php:381
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:56
#: includes/PDFPaymentRun_PymtFooter.php:86
#: includes/PDFPaymentRun_PymtFooter.php:115
@@ -3817,7 +3819,7 @@
msgstr "nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1016 CounterSales.php:1380
-#: Credit_Invoice.php:799 SelectCreditItems.php:1424
+#: Credit_Invoice.php:797 SelectCreditItems.php:1424
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
@@ -3825,7 +3827,7 @@
"Následující SQL vložit součásti sestavy záznamy pohyb zásob byla použita"
#: ConfirmDispatch_Invoice.php:1025 CounterSales.php:1389
-#: Credit_Invoice.php:808 SelectCreditItems.php:1433
+#: Credit_Invoice.php:806 SelectCreditItems.php:1433
msgid ""
"Location stock record could not be updated for an assembly component because"
msgstr ""
@@ -3841,15 +3843,15 @@
"použita"
#: ConfirmDispatch_Invoice.php:1108 CounterSales.php:1473
-#: Credit_Invoice.php:890 Credit_Invoice.php:989 Credit_Invoice.php:1028
-#: Credit_Invoice.php:1069 RecurringSalesOrdersProcess.php:361
+#: Credit_Invoice.php:888 Credit_Invoice.php:987 Credit_Invoice.php:1026
+#: Credit_Invoice.php:1067 RecurringSalesOrdersProcess.php:361
#: ReverseGRN.php:248 SelectCreditItems.php:1175 SelectCreditItems.php:1248
msgid "Stock movement records could not be inserted because"
msgstr "Pohyb zásob záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1109 ContractCosting.php:335
-#: CounterSales.php:1474 Credit_Invoice.php:891 Credit_Invoice.php:990
-#: Credit_Invoice.php:1029 GoodsReceived.php:483
+#: CounterSales.php:1474 Credit_Invoice.php:889 Credit_Invoice.php:988
+#: Credit_Invoice.php:1027 GoodsReceived.php:482
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1249 WorkOrderIssue.php:192 WorkOrderReceive.php:347
#: WorkOrderReceive.php:454
@@ -3864,39 +3866,39 @@
msgstr "Daně a sazby platné pro tato faktura řádku nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1130 CounterSales.php:1495
-#: Credit_Invoice.php:1093 RecurringSalesOrdersProcess.php:383
+#: Credit_Invoice.php:1091 RecurringSalesOrdersProcess.php:383
#: SelectCreditItems.php:1270
msgid ""
"The following SQL to insert the stock movement tax detail records was used"
msgstr "Následující SQL vložit pohyb zásob daňově detail byl použit"
-#: ConfirmDispatch_Invoice.php:1146 Credit_Invoice.php:920
-#: Credit_Invoice.php:930 SelectCreditItems.php:1314 StockAdjustments.php:191
-#: StockAdjustments.php:208 StockLocTransferReceive.php:139
+#: ConfirmDispatch_Invoice.php:1146 Credit_Invoice.php:918
+#: Credit_Invoice.php:928 SelectCreditItems.php:1314 StockAdjustments.php:202
+#: StockAdjustments.php:219 StockLocTransferReceive.php:139
#: StockTransfers.php:251 StockTransfers.php:366
msgid "The serial stock item record could not be updated because"
msgstr "Pořadové skladová položka záznamu nelze aktualizovat, protože"
-#: ConfirmDispatch_Invoice.php:1147 Credit_Invoice.php:921
-#: Credit_Invoice.php:931 SelectCreditItems.php:1315
-#: SelectCreditItems.php:1538 StockAdjustments.php:192
-#: StockAdjustments.php:209 StockLocTransferReceive.php:140
+#: ConfirmDispatch_Invoice.php:1147 Credit_Invoice.php:919
+#: Credit_Invoice.php:929 SelectCreditItems.php:1315
+#: SelectCreditItems.php:1538 StockAdjustments.php:203
+#: StockAdjustments.php:220 StockLocTransferReceive.php:140
#: StockLocTransferReceive.php:154 StockLocTransferReceive.php:255
#: StockLocTransferReceive.php:269 StockTransfers.php:252
#: StockTransfers.php:367
msgid "The following SQL to update the serial stock item record was used"
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
-#: ConfirmDispatch_Invoice.php:1161 Credit_Invoice.php:945
-#: GoodsReceived.php:546 SelectCreditItems.php:1330 StockAdjustments.php:224
+#: ConfirmDispatch_Invoice.php:1161 Credit_Invoice.php:943
+#: GoodsReceived.php:545 SelectCreditItems.php:1330 StockAdjustments.php:235
#: StockLocTransferReceive.php:172 StockLocTransferReceive.php:285
#: StockTransfers.php:287 StockTransfers.php:398 WorkOrderIssue.php:228
#: WorkOrderIssue.php:283 WorkOrderReceive.php:505 WorkOrderReceive.php:576
msgid "The serial stock movement record could not be inserted because"
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1162 Credit_Invoice.php:946
-#: GoodsReceived.php:547 StockAdjustments.php:225
+#: ConfirmDispatch_Invoice.php:1162 Credit_Invoice.php:944
+#: GoodsReceived.php:546 StockAdjustments.php:236
#: StockLocTransferReceive.php:173 StockLocTransferReceive.php:286
#: StockTransfers.php:288 StockTransfers.php:399 WorkOrderIssue.php:229
#: WorkOrderIssue.php:284 WorkOrderReceive.php:506 WorkOrderReceive.php:577
@@ -3909,7 +3911,7 @@
msgstr "Počet existujících záznamů Prodej analýza nemohla spustit, protože"
#: ConfirmDispatch_Invoice.php:1203 CounterSales.php:1574
-#: Credit_Invoice.php:1121 RecurringSalesOrdersProcess.php:422
+#: Credit_Invoice.php:1119 RecurringSalesOrdersProcess.php:422
#: SelectCreditItems.php:1592
msgid "SQL to count the no of sales analysis records"
msgstr "SQL počítat žádné prodeje analýzy záznamů"
@@ -3920,13 +3922,13 @@
msgstr "Prodej analýza záznamu nebylo možné přidat ani aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:1260 CounterSales.php:1632
-#: Credit_Invoice.php:1233 RecurringSalesOrdersProcess.php:481
+#: Credit_Invoice.php:1231 RecurringSalesOrdersProcess.php:481
#: SelectCreditItems.php:1702
msgid "The following SQL to insert the sales analysis record was used"
msgstr "Následující SQL vložit prodejní rekord analýza byla použita"
#: ConfirmDispatch_Invoice.php:1285 CounterSales.php:1656
-#: Credit_Invoice.php:1263
+#: Credit_Invoice.php:1261
msgid "The cost of sales GL posting could not be inserted because"
msgstr "Náklady na prodej GL vysílání nemohly být zařazeny, protože"
@@ -3937,9 +3939,9 @@
#: ConfirmDispatch_Invoice.php:1561 ConfirmDispatch_Invoice.php:1583
#: ContractCosting.php:225 ContractCosting.php:243 CounterSales.php:1657
#: CounterSales.php:1679 CounterSales.php:1705 CounterSales.php:1727
-#: CounterSales.php:1776 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
+#: CounterSales.php:1776 Credit_Invoice.php:1262 Credit_Invoice.php:1302
+#: Credit_Invoice.php:1329 Credit_Invoice.php:1350 Credit_Invoice.php:1379
+#: Credit_Invoice.php:1405 Credit_Invoice.php:1431
#: RecurringSalesOrdersProcess.php:509 RecurringSalesOrdersProcess.php:536
#: RecurringSalesOrdersProcess.php:630 SelectCreditItems.php:1736
#: SelectCreditItems.php:1764 SelectCreditItems.php:1789
@@ -4009,7 +4011,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:1498 GoodsReceived.php:585 ReverseGRN.php:176
+#: ConfirmDispatch_Invoice.php:1498 GoodsReceived.php:584 ReverseGRN.php:176
#: SupplierCredit.php:1201 SupplierCredit.php:1289 SupplierInvoice.php:1168
#: SupplierInvoice.php:1254
msgid "The following SQL to insert the fixed asset transaction record was used"
@@ -4040,7 +4042,7 @@
msgstr "Nákladní GL vysílání nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1582 CounterSales.php:1775
-#: Credit_Invoice.php:1432 RecurringSalesOrdersProcess.php:575
+#: Credit_Invoice.php:1430 RecurringSalesOrdersProcess.php:575
#: SelectCreditItems.php:1924
msgid "The tax GL posting could not be inserted because"
msgstr "Daň GL vysílání nemohly být zařazeny, protože"
@@ -4135,7 +4137,7 @@
#: ContractBOM.php:41 ContractOtherReqts.php:45 Contracts.php:88
#: Contracts.php:97 DeliveryDetails.php:259 DeliveryDetails.php:268
-#: EmailCustTrans.php:24 EmailCustTrans.php:28 GLAccountCSV.php:261
+#: EmailCustTrans.php:22 EmailCustTrans.php:26 GLAccountCSV.php:261
#: PO_Header.php:237 POReport.php:1467 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1158 StockQties_csv.php:43 StockUsage.php:22
#: SupplierCredit.php:216 SupplierCredit.php:228 SupplierCredit.php:240
@@ -4438,8 +4440,8 @@
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
-#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:237
+#: ContractCosting.php:305 GoodsReceived.php:450
+#: PDFStockCheckComparison.php:130 ReverseGRN.php:219 StockAdjustments.php:248
#: StockLocTransferReceive.php:297 StockLocTransferReceive.php:306
#: StockTransfers.php:410 StockTransfers.php:420 WorkOrderIssue.php:160
#: WorkOrderReceive.php:423
@@ -4589,7 +4591,7 @@
"Měli byste být automaticky předána na vstup smlouvy stránku řádkové položky"
#: Contracts.php:87 Contracts.php:96 Customers.php:287 DeliveryDetails.php:259
-#: DeliveryDetails.php:268 EmailCustTrans.php:24 PO_Header.php:236
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:236
#: SalesAnalysis_UserDefined.php:46 StockUsage.php:21 SupplierCredit.php:214
#: SupplierCredit.php:226 SupplierCredit.php:238 SupplierCredit.php:248
#: SupplierCredit.php:256 SupplierInvoice.php:190 SupplierInvoice.php:198
@@ -4599,7 +4601,7 @@
msgstr "Pokud se tak nestane"
#: Contracts.php:87 Contracts.php:96 Customers.php:287 DeliveryDetails.php:259
-#: DeliveryDetails.php:268 EmailCustTrans.php:24 PO_Header.php:236
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:236
#: SelectOrderItems.php:1157 StockUsage.php:21 SupplierCredit.php:214
#: SupplierCredit.php:226 SupplierCredit.php:238 SupplierCredit.php:248
#: SupplierCredit.php:256 SupplierInvoice.php:190 SupplierInvoice.php:198
@@ -5787,59 +5789,59 @@
msgid "from the customer inquiry screen click the link to credit an invoice"
msgstr "z obrazovky zákazníka šetření klikněte na odkaz na úvěrové faktury"
-#: Credit_Invoice.php:69
+#: Credit_Invoice.php:67
msgid "A credit cannot be produced for the selected invoice"
msgstr "Úvěr nemůže být vyrobeny pro vybrané faktury"
-#: Credit_Invoice.php:69
+#: Credit_Invoice.php:67
msgid "The invoice details cannot be retrieved because"
msgstr "Fakturační údaje nelze získat, protože"
-#: Credit_Invoice.php:70
+#: Credit_Invoice.php:68
msgid "The SQL used to retrieve the invoice details was"
msgstr "SQL používá k načtení fakturační údaje byly"
-#: Credit_Invoice.php:127 Credit_Invoice.php:173
+#: Credit_Invoice.php:125 Credit_Invoice.php:171
msgid "This invoice can not be credited using this program"
msgstr "Tato faktura nemůže být připsána pomocí tohoto programu"
-#: Credit_Invoice.php:127 Credit_Invoice.php:173
+#: Credit_Invoice.php:125 Credit_Invoice.php:171
msgid "A manual credit note will need to be prepared"
msgstr "Manuální dobropisu bude muset být připraven"
-#: Credit_Invoice.php:128
+#: Credit_Invoice.php:126
msgid "The SQL used to get the transaction header was"
msgstr "SQL používá k získání transakce záhlaví byl"
-#: Credit_Invoice.php:173
+#: Credit_Invoice.php:171
msgid "The line item"
msgstr "Řádková položka"
-#: Credit_Invoice.php:173
+#: Credit_Invoice.php:171
msgid ""
"is controlled but the serial numbers or batch numbers could not be retrieved "
"because"
msgstr ""
"je řízen, ale sériová čísla nebo čísla šarže se nepodařilo získat, protože"
-#: Credit_Invoice.php:174
+#: Credit_Invoice.php:172
msgid "The SQL used to get the controlled item details was"
msgstr "SQL používá k získání kontrolované položky detaily o"
-#: Credit_Invoice.php:187
+#: Credit_Invoice.php:185
msgid "There are no line items that were retrieved for this invoice"
msgstr "Nejsou žádné řádkové položky, které byly získány na této faktuře"
-#: Credit_Invoice.php:187
+#: Credit_Invoice.php:185
msgid ""
"The automatic credit program can not create a credit note from this invoice"
msgstr "Automatické úvěrový program nemůže vytvořit dobropis od této faktuře"
-#: Credit_Invoice.php:193
+#: Credit_Invoice.php:191
msgid "This invoice can not be credited using the automatic facility"
msgstr "Tato faktura nemůže být připsána za použití automatického zařízení"
-#: Credit_Invoice.php:193
+#: Credit_Invoice.php:191
msgid ""
"Please report that a duplicate DebtorTrans header record was found for "
"invoice"
@@ -5847,7 +5849,7 @@
"Prosím oznamte, že duplicitní DebtorTrans hlavičku záznam byl nalezen na "
"faktuře"
-#: Credit_Invoice.php:238 SelectCreditItems.php:553
+#: Credit_Invoice.php:236 SelectCreditItems.php:553
msgid ""
"The item could not be updated because you are attempting to set the quantity "
"credited to less than 0 or the price less than 0 or the discount more than "
@@ -5856,39 +5858,39 @@
"Položku nelze aktualizovat, protože se snažíte nastavit množství připsána na "
"méně než 0 nebo je cena nižší než 0 nebo slevu více než 100% nebo méně než 0%"
-#: Credit_Invoice.php:267
+#: Credit_Invoice.php:265
msgid "Credit Invoice"
msgstr "Úvěrové faktury"
-#: Credit_Invoice.php:269
+#: Credit_Invoice.php:267
msgid "Credit Note amounts stated in"
msgstr "Dobropisu částky uvedené v"
-#: Credit_Invoice.php:273 PDFOrdersInvoiced.php:344 PDFOrderStatus.php:318
+#: Credit_Invoice.php:271 PDFOrdersInvoiced.php:344 PDFOrderStatus.php:318
#: ReverseGRN.php:380 SalesInquiry.php:822 ShipmentCosting.php:144
#: ShipmentCosting.php:146 Shipments.php:388
msgid "Invoiced"
msgstr "Fakturováno"
-#: Credit_Invoice.php:275 FixedAssetJournal.php:356 GLAccountInquiry.php:156
+#: Credit_Invoice.php:273 FixedAssetJournal.php:356 GLAccountInquiry.php:156
#: GLAccountReportphp:159 GLAccountReport.php:371 GLJournal.php:325
#: GLJournal.php:343 GLJournal.php:395 SuppCreditGRNs.php:230
msgid "Credit"
msgstr "Úvěr"
-#: Credit_Invoice.php:399
+#: Credit_Invoice.php:397
msgid "Freight cost charged on invoice"
msgstr "Přepravní náklady účtovány na faktuře"
-#: Credit_Invoice.php:402
+#: Credit_Invoice.php:400
msgid "Credit Freight Cost"
msgstr "Úvěrové náklady na dopravu"
-#: Credit_Invoice.php:451 SelectCreditItems.php:812
+#: Credit_Invoice.php:449 SelectCreditItems.php:812
msgid "Credit Totals"
msgstr "Úvěrové součtů"
-#: Credit_Invoice.php:463 SelectCreditItems.php:895
+#: Credit_Invoice.php:461 SelectCreditItems.php:895
msgid ""
"The GL code to write off the credit value to must be specified. Please "
"select the appropriate GL code for the selection box"
@@ -5896,7 +5898,7 @@
"Kód GL odepsat hodnotu úvěru musí být upřesněny. Prosím, vyberte příslušnou "
"GL kód pro výběr pole"
-#: Credit_Invoice.php:543
+#: Credit_Invoice.php:541
msgid ""
"The alteration to the invoice record to reflect the allocation of the credit "
"note to the invoice could not be done because"
@@ -5904,46 +5906,46 @@
"Změna k faktuře záznam odrážet rozdělení dobropisu k faktuře nemohlo být "
"provedeno, protože"
-#: Credit_Invoice.php:544
+#: Credit_Invoice.php:542
msgid "The following SQL to update the invoice allocation was used"
msgstr "Následující SQL aktualizovat fakturu alokace byl použit"
-#: Credit_Invoice.php:584 SelectCreditItems.php:1090
+#: Credit_Invoice.php:582 SelectCreditItems.php:1090
msgid ""
"The customer credit note transaction could not be added to the database "
"because"
msgstr "Zákazník dobropisu transakce nemůže být přidány do databáze, protože"
-#: Credit_Invoice.php:585 SelectCreditItems.php:1030
+#: Credit_Invoice.php:583 SelectCreditItems.php:1030
#: SelectCreditItems.php:1091
msgid "The following SQL to insert the customer credit note was used"
msgstr "Následující SQL vložit zákazníkovi dobropis byl použit"
-#: Credit_Invoice.php:617
+#: Credit_Invoice.php:615
msgid ""
"The allocation record for the credit note could not be added to the database "
"because"
msgstr "Rozdělení záznamu na dobropisu nemohl být přidán do databáze, protože"
-#: Credit_Invoice.php:618
+#: Credit_Invoice.php:616
msgid ""
"The following SQL to insert the allocation record for the credit note was "
"used"
msgstr "Následující SQL vložit přidělení rekord pro dobropisu byla použita"
-#: Credit_Invoice.php:634
+#: Credit_Invoice.php:632
msgid "Could not determine if the item"
msgstr "Nepodařilo se určit, zda položka"
-#: Credit_Invoice.php:634
+#: Credit_Invoice.php:632
msgid "is purchased or manufactured"
msgstr "Je nakoupených nebo vyrobených"
-#: Credit_Invoice.php:635
+#: Credit_Invoice.php:633
msgid "The SQL used that failed was"
msgstr "SQL použitý, která selhala byl"
-#: Credit_Invoice.php:667
+#: Credit_Invoice.php:665
msgid ""
"The sales order detail record could not be updated for the reduced quantity "
"invoiced because"
@@ -5951,35 +5953,35 @@
"Prodejní objednávky detail záznamu nelze aktualizovat na snížené množství "
"fakturované protože"
-#: Credit_Invoice.php:727
+#: Credit_Invoice.php:725
msgid "Could not get the current location stock of the assembly component"
msgstr "Nelze získat aktuální umístění zásob komponenty sestavení"
-#: Credit_Invoice.php:763 Credit_Invoice.php:792 Credit_Invoice.php:850
-#: Credit_Invoice.php:882 Credit_Invoice.php:982 Credit_Invoice.php:1060
+#: Credit_Invoice.php:761 Credit_Invoice.php:790 Credit_Invoice.php:848
+#: Credit_Invoice.php:880 Credit_Invoice.php:980 Credit_Invoice.php:1058
msgid "Ex Inv"
msgstr "Ex Inv"
-#: Credit_Invoice.php:809
+#: Credit_Invoice.php:807
msgid ""
"The following SQL to update the components location stock record was used"
msgstr ""
"Následující SQL k aktualizaci komponenty umístění skladové evidenci byl "
"používán"
-#: Credit_Invoice.php:905
+#: Credit_Invoice.php:903
msgid "The serial stock item record could not be selected because"
msgstr "Pořadové skladová položka záznamu nemohla být vybrána, protože"
-#: Credit_Invoice.php:906
+#: Credit_Invoice.php:904
msgid "The following SQL to select the serial stock item record was used"
msgstr "Následující SQL pro výběr sériového skladě záznam byl použit"
-#: Credit_Invoice.php:1020
+#: Credit_Invoice.php:1018
msgid "Written off ex Inv"
msgstr "Odepsány ex Inv"
-#: Credit_Invoice.php:1070 SelectCreditItems.php:1176
+#: Credit_Invoice.php:1068 SelectCreditItems.php:1176
msgid ""
"The following SQL to insert the stock movement records for the purpose of "
"display on the credit note was used"
@@ -5987,7 +5989,7 @@
"Následující SQL vložit záznamy pohyb zásob pro účely zobrazení na dobropisu "
"byla použita"
-#: Credit_Invoice.php:1092 SelectCreditItems.php:1269
+#: Credit_Invoice.php:1090 SelectCreditItems.php:1269
msgid ""
"Taxes and rates applicable to this credit note line item could not be "
"inserted because"
@@ -5995,18 +5997,18 @@
"Daně a sazeb platných pro tento řádek dobropisu položka nemůže být vložen, "
"protože"
-#: Credit_Invoice.php:1120 SelectCreditItems.php:1591
+#: Credit_Invoice.php:1118 SelectCreditItems.php:1591
msgid ""
"The count to check for existing Sales analysis records could not run because"
msgstr ""
"Počet zkontrolovat existující záznamy Prodej analýza nemohla spustit, protože"
-#: Credit_Invoice.php:1232 SelectCreditItems.php:1701
+#: Credit_Invoice.php:1230 SelectCreditItems.php:1701
msgid ""
"The sales analysis record for this credit note could not be added because"
msgstr "Analýza prodejní rekord pro tento dobropis nelze přidat, protože"
-#: Credit_Invoice.php:1303
+#: Credit_Invoice.php:1301
msgid ""
"The stock side or write off of the cost of sales GL posting could not be "
"inserted because"
@@ -6014,69 +6016,69 @@
"Populace strany nebo odepsat náklady na prodej GL vysílání nemohly být "
"zařazeny, protože"
-#: Credit_Invoice.php:1330 SelectCreditItems.php:1821
+#: Credit_Invoice.php:1328 SelectCreditItems.php:1821
msgid "The credit note GL posting could not be inserted because"
msgstr "Dobropis GL vysílání nemohly být zařazeny, protože"
-#: Credit_Invoice.php:1351 SelectCreditItems.php:1846
+#: Credit_Invoice.php:1349 SelectCreditItems.php:1846
msgid "The credit note discount GL posting could not be inserted because"
msgstr "Dobropis sleva GL vysílání nemohly být zařazeny, protože"
-#: Credit_Invoice.php:1380 SelectCreditItems.php:1876
+#: Credit_Invoice.php:1378 SelectCreditItems.php:1876
msgid ""
"The total debtor GL posting for the credit note could not be inserted because"
msgstr "Celková dlužník GL vysílání pro dobropisu nemůže být vložen, protože"
-#: Credit_Invoice.php:1406 SelectCreditItems.php:1899
+#: Credit_Invoice.php:1404 SelectCreditItems.php:1899
msgid ""
"The freight GL posting for this credit note could not be inserted because"
msgstr "Nákladní GL vysílání tohoto dobropisu nemůže být vložen, protože"
-#: Credit_Invoice.php:1445 SelectCreditItems.php:1936
+#: Credit_Invoice.php:1443 SelectCreditItems.php:1936
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1445 GoodsReceived.php:687 SupplierCredit.php:1302
+#: Credit_Invoice.php:1443 GoodsReceived.php:686 SupplierCredit.php:1302
#: SupplierInvoice.php:1275 WorkOrderIssue.php:352 WorkOrderReceive.php:672
#: Z_BottomUpCosts.php:33
msgid "has been processed"
msgstr "byla zpracována"
-#: Credit_Invoice.php:1447 Credit_Invoice.php:1449
+#: Credit_Invoice.php:1445 Credit_Invoice.php:1447
msgid "Print this credit note"
msgstr "Vytisknout tuto dobropis"
-#: Credit_Invoice.php:1459 SelectCreditItems.php:822
+#: Credit_Invoice.php:1457 SelectCreditItems.php:822
msgid "Credit Note Type"
msgstr "Poznámka: Typ úvěru"
-#: Credit_Invoice.php:1463 Credit_Invoice.php:1468 Credit_Invoice.php:1472
+#: Credit_Invoice.php:1461 Credit_Invoice.php:1466 Credit_Invoice.php:1470
#: SelectCreditItems.php:824 SelectCreditItems.php:829
msgid "Goods returned to store"
msgstr "Zboží se vrátil k ukládání"
-#: Credit_Invoice.php:1464 Credit_Invoice.php:1467 Credit_Invoice.php:1471
+#: Credit_Invoice.php:1462 Credit_Invoice.php:1465 Credit_Invoice.php:1469
#: SelectCreditItems.php:825 SelectCreditItems.php:828
msgid "Goods written off"
msgstr "Zboží odepsány"
-#: Credit_Invoice.php:1465 Credit_Invoice.php:1469 Credit_Invoice.php:1473
+#: Credit_Invoice.php:1463 Credit_Invoice.php:1467 Credit_Invoice.php:1471
msgid "Reverse overcharge"
msgstr "Reverzní přebíjením"
-#: Credit_Invoice.php:1482
+#: Credit_Invoice.php:1480
msgid "Goods returned to location"
msgstr "Zboží se vrátil k umístění"
-#: Credit_Invoice.php:1503 SelectCreditItems.php:864
+#: Credit_Invoice.php:1501 SelectCreditItems.php:864
msgid "Write off the cost of the goods to"
msgstr "Odepsat náklady na zboží"
-#: Credit_Invoice.php:1527
+#: Credit_Invoice.php:1525
msgid "Credit note text"
msgstr "Dobropis text"
-#: Credit_Invoice.php:1530
+#: Credit_Invoice.php:1528
msgid "Process Credit"
msgstr "Proces Úvěrové"
@@ -6108,7 +6110,7 @@
msgid "Back to Credit Note Entry"
msgstr "Zpět na dobropis Vstup"
-#: CreditItemsControlled.php:58 StockAdjustmentsControlled.php:32
+#: CreditItemsControlled.php:58 StockAdjustmentsControlled.php:34
#: StockTransferControlled.php:49
msgid "Notice"
msgstr "Poznámka"
@@ -6389,13 +6391,13 @@
msgstr "Povolit zasílání EDI faktur"
#: CustEDISetup.php:103 CustEDISetup.php:106 CustEDISetup.php:117
-#: CustEDISetup.php:120 CustomerBranches.php:733 CustomerBranches.php:735
+#: CustEDISetup.php:120 CustomerBranches.php:743 CustomerBranches.php:745
#: SystemParameters.php:796
msgid "Disabled"
msgstr "Zakázáno"
#: CustEDISetup.php:104 CustEDISetup.php:107 CustEDISetup.php:118
-#: CustEDISetup.php:121 CustomerBranches.php:732 CustomerBranches.php:736
+#: CustEDISetup.php:121 CustomerBranches.php:742 CustomerBranches.php:746
msgid "Enabled"
msgstr "Povoleno"
@@ -6587,13 +6589,13 @@
#: Customers.php:715 Factors.php:222 Factors.php:261 OrderDetails.php:99
#: PrintCustTrans.php:662 PrintCustTrans.php:882 PrintCustTrans.php:929
#: PrintCustTransPortrait.php:713 PrintCustTransPortrait.php:933
-#: PrintCustTransPortrait.php:977 SalesPeople.php:186 Suppliers.php:670
+#: PrintCustTransPortrait.php:977 SalesPeople.php:192 Suppliers.php:670
#: Suppliers.php:849 SuppLoginSetup.php:236 WWW_Users.php:260
msgid "Telephone"
msgstr "Telefon"
-#: CustLoginSetup.php:271 CustomerBranches.php:374 CustomerBranches.php:706
-#: CustomerInquiry.php:249 EmailCustTrans.php:17 EmailCustTrans.php:65
+#: CustLoginSetup.php:271 CustomerBranches.php:374 CustomerBranches.php:716
+#: CustomerInquiry.php:249 EmailCustTrans.php:15 EmailCustTrans.php:63
#: Factors.php:226 Factors.php:263 Locations.php:533 OrderDetails.php:105
#: PDFRemittanceAdvice.php:251 PO_PDFPurchOr...
[truncated message content] |
|
From: <dai...@us...> - 2011-06-11 07:26:54
|
Revision: 4594
http://web-erp.svn.sourceforge.net/web-erp/?rev=4594&view=rev
Author: daintree
Date: 2011-06-11 07:26:47 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Customers.php
trunk/SalesTypes.php
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-06-11 02:30:27 UTC (rev 4593)
+++ trunk/Customers.php 2011-06-11 07:26:47 UTC (rev 4594)
@@ -351,7 +351,7 @@
} //end if Delete Customer
}
-if(isset($reset)){
+if(isset($_POST['Reset'])){
unset($_POST['CustName']);
unset($_POST['Address1']);
unset($_POST['Address2']);
@@ -482,45 +482,48 @@
echo '<tr><td>' . _('Address Line 6') . ':</td>
<td><input tabindex=8 type="Text" name="Address6" size=17 maxlength=15></td></tr>';
- echo '</table></td><td><table class="selection">';
+
// Show Sales Type drop down list
$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 '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '</td></tr>';
- } else {
- echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
- <td><select tabindex=9 name="SalesType">';
+ $DataError =1;
+ echo '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '<br /><a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a></td></tr>';
+ } else {
+ echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
+ <td><select tabindex=9 name="SalesType">';
- while ($myrow = DB_fetch_array($result)) {
- echo '<option value="'. $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
- } //end while loopre
- DB_data_seek($result,0);
- echo '</select></td></tr>';
- }
+ while ($myrow = DB_fetch_array($result)) {
+ echo '<option value="'. $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
+ } //end while loopre
+ DB_data_seek($result,0);
+ echo '</select></td></tr>';
+ }
// Show Customer Type drop down list
- $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 '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
- } else {
- echo '<tr><td>' . _('Customer Type') . ':</td>
- <td><select tabindex=9 name="typeid">';
+ $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 '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
+ } else {
+ echo '<tr><td>' . _('Customer Type') . ':</td>
+ <td><select tabindex=9 name="typeid">';
- while ($myrow = DB_fetch_array($result)) {
- echo '<option value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
- } //end while loop
- DB_data_seek($result,0);
- echo '</select></td></tr>';
- }
+ while ($myrow = DB_fetch_array($result)) {
+ echo '<option value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
+ } //end while loop
+ DB_data_seek($result,0);
+ 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 '</table></td>
+ <td><table class="selection">';
+
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>
@@ -604,7 +607,7 @@
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>';
@@ -627,9 +630,6 @@
address4,
address5,
address6,
- custbranch.phoneno as telephone,
- custbranch.faxno as fax,
- custbranch.email,
currcode,
salestype,
clientsince,
@@ -644,8 +644,6 @@
customerpoline,
typeid
FROM debtorsmaster
- LEFT JOIN custbranch
- ON debtorsmaster.debtorno=custbranch.debtorno
WHERE debtorsmaster.debtorno = '" . $DebtorNo . "'";
$ErrMsg = _('The customer details could not be retrieved because');
@@ -667,9 +665,6 @@
$_POST['Address4'] = $myrow['address4'];
$_POST['Address5'] = $myrow['address5'];
$_POST['Address6'] = $myrow['address6'];
- $_POST['Phone'] = $myrow['telephone'];
- $_POST['Fax'] = $myrow['fax'];
- $_POST['Email'] = $myrow['email'];
$_POST['SalesType'] = $myrow['salestype'];
$_POST['CurrCode'] = $myrow['currcode'];
$_POST['ClientSince'] = ConvertSQLDate($myrow['clientsince']);
@@ -699,9 +694,6 @@
}
if (isset($_GET['Modify'])) {
echo '<tr><td>' . _('Customer Name') . ':</td><td>' . $_POST['CustName'] . '</td></tr>';
- echo '<tr><td>' . _('Telephone') . ':</td><td>' . $_POST['Phone'] . '</td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td><td>' . $_POST['Fax'] . '</td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td><td>' . $_POST['Email'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td><td>' . $_POST['Address1'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 2 (Suburb/City)') . ':</td><td>' . $_POST['Address2'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 3 (State/Province)') . ':</td><td>' . $_POST['Address3'] . '</td></tr>';
@@ -712,12 +704,6 @@
} else {
echo '<tr><td>' . _('Customer Name') . ':</td>
<td><input ' . (in_array('CustName',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="CustName" value="' . $_POST['CustName'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Telephone') . ':</td>
- <td><input ' . (in_array('Phone',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Phone" value="' . $_POST['Phone'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td>
- <td><input ' . (in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Fax" value="' . $_POST['Fax'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input ' . (in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Email" value="' . $_POST['Email'] . '" size=42 maxlength=40></td></tr>';
echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
<td><input ' . (in_array('Address1',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address1" size=42 maxlength=40 value="' . $_POST['Address1'] . '"></td></tr>';
echo '<tr><td>' . _('Address Line 2 (Suburb/City)') . ':</td>
@@ -730,7 +716,7 @@
<td><input ' . (in_array('Address5',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address5" size=42 maxlength=40 value="' . $_POST['Address5'] . '"></td></tr>';
echo '<tr><td>' . _('Address Line 6') . ':</td>
<td><input ' . (in_array('Address6',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address6" size=42 maxlength=40 value="' . $_POST['Address6'] . '"></td></tr>';
- echo '</table></td><td><table class=selection>';
+
}
// Select sales types for drop down list
if (isset($_GET['Modify'])) {
@@ -738,7 +724,7 @@
$myrow=DB_fetch_array($result);
echo '<tr><td>' . _('Sales Type') . ':</td><td>' . $myrow['sales_type'] . '</td></tr>';
} else {
- $result=DB_query('SELECT typeabbrev, sales_type FROM salestypes',$db);
+ $result=DB_query("SELECT typeabbrev, sales_type FROM salestypes",$db);
echo '<tr><td>' . _('Sales Type') . '/' . _('Price List') . ':</td>
<td><select name="SalesType">';
while ($myrow = DB_fetch_array($result)) {
@@ -776,6 +762,9 @@
echo '</select></td></tr>
<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td>' . $_POST['ClientSince'] . '</td></tr>';
+
+ echo '</table></td><td><table class=selection>';
+
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td>' . $_POST['Discount'] . '</td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -790,6 +779,9 @@
echo '</select></td></tr>
<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('ClientSince',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" size=11 maxlength=10 value=' . $_POST['ClientSince'] . '></td></tr>';
+
+ echo '</table></td><td><table class="selection">';
+
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td><input type="Text" name="Discount" class=number size=5 maxlength=4 value=' . $_POST['Discount'] . '></td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -923,7 +915,7 @@
<th>' . _('Phone Number') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Edit') . '</th>
- <th colspan=2><input type="Submit" name="addcontact" VALUE="Add Contact"></th></tr>';
+ <th colspan=2><input type="Submit" name="AddContact" value="Add Contact"></th></tr>';
}
$k=0; //row colour counter
@@ -955,7 +947,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="AddCustomerContacts.php?Id=%s&DebtorNo=%s">'. _('Edit'). '</a></td>
- <td><a href="%sID=%s&DebtorNo=%s&delete=1">'. _('Delete'). '</a></td>
+ <td><a href="%sID=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this customer contact?') . '\');">'. _('Delete'). '</a></td>
</tr>',
$myrow[2],
$myrow[3],
@@ -1017,9 +1009,7 @@
$SQl="DELETE FROM custcontacts where debtorno='".$DebtorNo."'
and contid='".$ID."'";
$resultupcc = DB_query($SQl,$db);
-
- echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'">';
- echo '<br />'.$SQl;
+ echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">';
prnmsg('Contact Deleted','success');
}
@@ -1027,13 +1017,13 @@
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 ' <input type="Submit" name="delete" VALUE="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
+ 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'])!=''))
+ if(isset($_POST['AddContact']) AND (isset($_POST['AddContact'])!=''))
{
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?DebtorNo=' .$DebtorNo.'">';
}
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-11 02:30:27 UTC (rev 4593)
+++ trunk/SalesTypes.php 2011-06-11 07:26:47 UTC (rev 4594)
@@ -177,6 +177,13 @@
} //end if sales type used in debtor transactions or in customers set up
}
+
+if(isset($_POST['Cancel'])){
+ unset($SelectedType);
+ unset($_POST['TypeAbbrev']);
+ unset($_POST['Sales_Type']);
+}
+
if (!isset($SelectedType)){
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedType will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
@@ -184,7 +191,7 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT * FROM salestypes';
+ $sql = "SELECT * FROM salestypes";
$result = DB_query($sql,$db);
echo '<table class=selection>';
@@ -237,7 +244,7 @@
$sql = "SELECT typeabbrev,
sales_type
FROM salestypes
- WHERE typeabbrev='$SelectedType'";
+ WHERE typeabbrev='" . $SelectedType . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-11 07:26:53
|
Revision: 4594
http://web-erp.svn.sourceforge.net/web-erp/?rev=4594&view=rev
Author: daintree
Date: 2011-06-11 07:26:47 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Customers.php
trunk/SalesTypes.php
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2011-06-11 02:30:27 UTC (rev 4593)
+++ trunk/Customers.php 2011-06-11 07:26:47 UTC (rev 4594)
@@ -351,7 +351,7 @@
} //end if Delete Customer
}
-if(isset($reset)){
+if(isset($_POST['Reset'])){
unset($_POST['CustName']);
unset($_POST['Address1']);
unset($_POST['Address2']);
@@ -482,45 +482,48 @@
echo '<tr><td>' . _('Address Line 6') . ':</td>
<td><input tabindex=8 type="Text" name="Address6" size=17 maxlength=15></td></tr>';
- echo '</table></td><td><table class="selection">';
+
// Show Sales Type drop down list
$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 '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '</td></tr>';
- } else {
- echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
- <td><select tabindex=9 name="SalesType">';
+ $DataError =1;
+ echo '<tr><td colspan=2>' . prnMsg(_('No sales types/price lists defined'),'error') . '<br /><a href="SalesTypes.php?" target="_parent">' . _('Setup Types') . '</a></td></tr>';
+ } else {
+ echo '<tr><td>' . _('Sales Type/Price List') . ':</td>
+ <td><select tabindex=9 name="SalesType">';
- while ($myrow = DB_fetch_array($result)) {
- echo '<option value="'. $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
- } //end while loopre
- DB_data_seek($result,0);
- echo '</select></td></tr>';
- }
+ while ($myrow = DB_fetch_array($result)) {
+ echo '<option value="'. $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
+ } //end while loopre
+ DB_data_seek($result,0);
+ echo '</select></td></tr>';
+ }
// Show Customer Type drop down list
- $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 '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
- } else {
- echo '<tr><td>' . _('Customer Type') . ':</td>
- <td><select tabindex=9 name="typeid">';
+ $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 '<tr><td colspan=2>' . prnMsg(_('No Customer types/price lists defined'),'error') . '</td></tr>';
+ } else {
+ echo '<tr><td>' . _('Customer Type') . ':</td>
+ <td><select tabindex=9 name="typeid">';
- while ($myrow = DB_fetch_array($result)) {
- echo '<option value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
- } //end while loop
- DB_data_seek($result,0);
- echo '</select></td></tr>';
- }
+ while ($myrow = DB_fetch_array($result)) {
+ echo '<option value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
+ } //end while loop
+ DB_data_seek($result,0);
+ 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 '</table></td>
+ <td><table class="selection">';
+
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>
@@ -604,7 +607,7 @@
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>';
@@ -627,9 +630,6 @@
address4,
address5,
address6,
- custbranch.phoneno as telephone,
- custbranch.faxno as fax,
- custbranch.email,
currcode,
salestype,
clientsince,
@@ -644,8 +644,6 @@
customerpoline,
typeid
FROM debtorsmaster
- LEFT JOIN custbranch
- ON debtorsmaster.debtorno=custbranch.debtorno
WHERE debtorsmaster.debtorno = '" . $DebtorNo . "'";
$ErrMsg = _('The customer details could not be retrieved because');
@@ -667,9 +665,6 @@
$_POST['Address4'] = $myrow['address4'];
$_POST['Address5'] = $myrow['address5'];
$_POST['Address6'] = $myrow['address6'];
- $_POST['Phone'] = $myrow['telephone'];
- $_POST['Fax'] = $myrow['fax'];
- $_POST['Email'] = $myrow['email'];
$_POST['SalesType'] = $myrow['salestype'];
$_POST['CurrCode'] = $myrow['currcode'];
$_POST['ClientSince'] = ConvertSQLDate($myrow['clientsince']);
@@ -699,9 +694,6 @@
}
if (isset($_GET['Modify'])) {
echo '<tr><td>' . _('Customer Name') . ':</td><td>' . $_POST['CustName'] . '</td></tr>';
- echo '<tr><td>' . _('Telephone') . ':</td><td>' . $_POST['Phone'] . '</td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td><td>' . $_POST['Fax'] . '</td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td><td>' . $_POST['Email'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td><td>' . $_POST['Address1'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 2 (Suburb/City)') . ':</td><td>' . $_POST['Address2'] . '</td></tr>';
echo '<tr><td>' . _('Address Line 3 (State/Province)') . ':</td><td>' . $_POST['Address3'] . '</td></tr>';
@@ -712,12 +704,6 @@
} else {
echo '<tr><td>' . _('Customer Name') . ':</td>
<td><input ' . (in_array('CustName',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="CustName" value="' . $_POST['CustName'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Telephone') . ':</td>
- <td><input ' . (in_array('Phone',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Phone" value="' . $_POST['Phone'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td>
- <td><input ' . (in_array('Fax',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Fax" value="' . $_POST['Fax'] . '" size=42 maxlength=40></td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input ' . (in_array('Email',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Email" value="' . $_POST['Email'] . '" size=42 maxlength=40></td></tr>';
echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
<td><input ' . (in_array('Address1',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address1" size=42 maxlength=40 value="' . $_POST['Address1'] . '"></td></tr>';
echo '<tr><td>' . _('Address Line 2 (Suburb/City)') . ':</td>
@@ -730,7 +716,7 @@
<td><input ' . (in_array('Address5',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address5" size=42 maxlength=40 value="' . $_POST['Address5'] . '"></td></tr>';
echo '<tr><td>' . _('Address Line 6') . ':</td>
<td><input ' . (in_array('Address6',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Address6" size=42 maxlength=40 value="' . $_POST['Address6'] . '"></td></tr>';
- echo '</table></td><td><table class=selection>';
+
}
// Select sales types for drop down list
if (isset($_GET['Modify'])) {
@@ -738,7 +724,7 @@
$myrow=DB_fetch_array($result);
echo '<tr><td>' . _('Sales Type') . ':</td><td>' . $myrow['sales_type'] . '</td></tr>';
} else {
- $result=DB_query('SELECT typeabbrev, sales_type FROM salestypes',$db);
+ $result=DB_query("SELECT typeabbrev, sales_type FROM salestypes",$db);
echo '<tr><td>' . _('Sales Type') . '/' . _('Price List') . ':</td>
<td><select name="SalesType">';
while ($myrow = DB_fetch_array($result)) {
@@ -776,6 +762,9 @@
echo '</select></td></tr>
<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td>' . $_POST['ClientSince'] . '</td></tr>';
+
+ echo '</table></td><td><table class=selection>';
+
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td>' . $_POST['Discount'] . '</td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -790,6 +779,9 @@
echo '</select></td></tr>
<tr><td>' . _('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('ClientSince',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ClientSince" size=11 maxlength=10 value=' . $_POST['ClientSince'] . '></td></tr>';
+
+ echo '</table></td><td><table class="selection">';
+
echo '<tr><td>' . _('Discount Percent') . ':</td>
<td><input type="Text" name="Discount" class=number size=5 maxlength=4 value=' . $_POST['Discount'] . '></td></tr>';
echo '<tr><td>' . _('Discount Code') . ':</td>
@@ -923,7 +915,7 @@
<th>' . _('Phone Number') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Edit') . '</th>
- <th colspan=2><input type="Submit" name="addcontact" VALUE="Add Contact"></th></tr>';
+ <th colspan=2><input type="Submit" name="AddContact" value="Add Contact"></th></tr>';
}
$k=0; //row colour counter
@@ -955,7 +947,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="AddCustomerContacts.php?Id=%s&DebtorNo=%s">'. _('Edit'). '</a></td>
- <td><a href="%sID=%s&DebtorNo=%s&delete=1">'. _('Delete'). '</a></td>
+ <td><a href="%sID=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this customer contact?') . '\');">'. _('Delete'). '</a></td>
</tr>',
$myrow[2],
$myrow[3],
@@ -1017,9 +1009,7 @@
$SQl="DELETE FROM custcontacts where debtorno='".$DebtorNo."'
and contid='".$ID."'";
$resultupcc = DB_query($SQl,$db);
-
- echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?'.SID.'&DebtorNo='.$DebtorNo.'">';
- echo '<br />'.$SQl;
+ echo '<meta http-equiv="Refresh" content="0; url=' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">';
prnmsg('Contact Deleted','success');
}
@@ -1027,13 +1017,13 @@
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 ' <input type="Submit" name="delete" VALUE="' . _('Delete Customer') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">';
+ 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'])!=''))
+ if(isset($_POST['AddContact']) AND (isset($_POST['AddContact'])!=''))
{
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/AddCustomerContacts.php?DebtorNo=' .$DebtorNo.'">';
}
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-11 02:30:27 UTC (rev 4593)
+++ trunk/SalesTypes.php 2011-06-11 07:26:47 UTC (rev 4594)
@@ -177,6 +177,13 @@
} //end if sales type used in debtor transactions or in customers set up
}
+
+if(isset($_POST['Cancel'])){
+ unset($SelectedType);
+ unset($_POST['TypeAbbrev']);
+ unset($_POST['Sales_Type']);
+}
+
if (!isset($SelectedType)){
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedType will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
@@ -184,7 +191,7 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT * FROM salestypes';
+ $sql = "SELECT * FROM salestypes";
$result = DB_query($sql,$db);
echo '<table class=selection>';
@@ -237,7 +244,7 @@
$sql = "SELECT typeabbrev,
sales_type
FROM salestypes
- WHERE typeabbrev='$SelectedType'";
+ WHERE typeabbrev='" . $SelectedType . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-11 02:30:33
|
Revision: 4593
http://web-erp.svn.sourceforge.net/web-erp/?rev=4593&view=rev
Author: daintree
Date: 2011-06-11 02:30:27 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04.1-4.04.4.sql
Added: trunk/sql/mysql/upgrade4.04.1-4.04.4.sql
===================================================================
--- trunk/sql/mysql/upgrade4.04.1-4.04.4.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.04.1-4.04.4.sql 2011-06-11 02:30:27 UTC (rev 4593)
@@ -0,0 +1,3 @@
+ALTER TABLE `salesman` ADD `current` TINYINT( 4 ) NOT NULL COMMENT 'Salesman current (1) or not (0)';
+UPDATE`salesman` SET `current` = 1;
+UPDATE config SET confvalue='4.04.4' WHERE confname='VersionNumber';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-11 02:30:33
|
Revision: 4593
http://web-erp.svn.sourceforge.net/web-erp/?rev=4593&view=rev
Author: daintree
Date: 2011-06-11 02:30:27 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04.1-4.04.4.sql
Added: trunk/sql/mysql/upgrade4.04.1-4.04.4.sql
===================================================================
--- trunk/sql/mysql/upgrade4.04.1-4.04.4.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.04.1-4.04.4.sql 2011-06-11 02:30:27 UTC (rev 4593)
@@ -0,0 +1,3 @@
+ALTER TABLE `salesman` ADD `current` TINYINT( 4 ) NOT NULL COMMENT 'Salesman current (1) or not (0)';
+UPDATE`salesman` SET `current` = 1;
+UPDATE config SET confvalue='4.04.4' WHERE confname='VersionNumber';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-11 01:00:42
|
Revision: 4592
http://web-erp.svn.sourceforge.net/web-erp/?rev=4592&view=rev
Author: daintree
Date: 2011-06-11 01:00:36 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/SalesTypes.php
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-09 10:33:38 UTC (rev 4591)
+++ trunk/SalesTypes.php 2011-06-11 01:00:36 UTC (rev 4592)
@@ -221,7 +221,7 @@
//end of ifs and buts!
if (isset($SelectedType)) {
- echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Sales Types Defined') . '</a></div><p>';
+ echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Show All Sales Types Defined') . '</a></div></p>';
}
if (! isset($_GET['delete'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-11 01:00:42
|
Revision: 4592
http://web-erp.svn.sourceforge.net/web-erp/?rev=4592&view=rev
Author: daintree
Date: 2011-06-11 01:00:36 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/SalesTypes.php
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-09 10:33:38 UTC (rev 4591)
+++ trunk/SalesTypes.php 2011-06-11 01:00:36 UTC (rev 4592)
@@ -221,7 +221,7 @@
//end of ifs and buts!
if (isset($SelectedType)) {
- echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Show All Sales Types Defined') . '</a></div><p>';
+ echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] .'">' . _('Show All Sales Types Defined') . '</a></div></p>';
}
if (! isset($_GET['delete'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-09 10:33:47
|
Revision: 4591
http://web-erp.svn.sourceforge.net/web-erp/?rev=4591&view=rev
Author: daintree
Date: 2011-06-09 10:33:38 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/PcExpensesTypeTab.php
trunk/Prices.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/UpgradeDatabase.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/LanguageSetup.php
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/CustomerBranches.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -571,13 +571,19 @@
$_POST['BranchCode']='';
}
echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . _('Add a Branch').'</p>';
- echo '<table class=selection><tr><td>'._('Branch Code'). ':</td>
- <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="BranchCode" size=12 maxlength=10 value="' . $_POST['BranchCode'] . '"></td></tr>';
+ echo '<table class=selection>
+ <tr>
+ <td>'._('Branch Code'). ':</td>
+ <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="BranchCode" size=12 maxlength=10 value="' . $_POST['BranchCode'] . '"></td>
+ </tr>';
$_POST['DeliverBlind'] = $_SESSION['DefaultBlindPackNote'];
}
//SQL to poulate account selection boxes
- $sql = "SELECT salesmanname, salesmancode FROM salesman";
+ $sql = "SELECT salesmanname,
+ salesmancode
+ FROM salesman
+ WHERE current = 1";
$result = DB_query($sql,$db);
@@ -592,12 +598,16 @@
echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '" />';
- echo '<tr><td>'._('Branch Name').':</td>';
+ echo '<tr>
+ <td>'._('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
- echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
- echo '<tr><td>'._('Branch Contact').':</td>';
+ echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td>
+ </tr>';
+ echo '<tr>
+ <td>'._('Branch Contact').':</td>';
if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
- echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
+ echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td>
+ </tr>';
echo '<tr><td>'._('Street Address 1 (Street)').':</td>';
if (!isset($_POST['BrAddress1'])) {$_POST['BrAddress1']='';}
echo '<td><input tabindex=4 type="text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
@@ -635,7 +645,7 @@
} else {
echo '<option value=';
}
- echo $myrow['salesmancode'] . '>' . $myrow['salesmanname'];
+ echo $myrow['salesmancode'] . '>' . $myrow['salesmanname'] . '</option>';
} //end while loop
@@ -643,7 +653,7 @@
DB_data_seek($result,0);
- $sql = 'SELECT areacode, areadescription FROM areas';
+ $sql = "SELECT areacode, areadescription FROM areas";
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
echo '</table>';
@@ -661,7 +671,7 @@
} else {
echo '<option value="';
}
- echo $myrow['areacode'] . '">' . $myrow['areadescription'];
+ echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} //end while loop
@@ -705,7 +715,7 @@
if (!isset($_POST['Email'])) {$_POST['Email']='';}
echo '<tr><td>'.(($_POST['Email']) ? '<a href="Mailto:'.$_POST['Email'].'">'._('Email').':</a>' : _('Email').':').'</td>';
//only display email link if there is an email address
- echo '<td><input tabindex=18 type="Text" name="Email" size=56 maxlength=55 value="'. $_POST['Email'].'"></td></tr>';
+ echo '<td><input tabindex=18 type="text" name="Email" size=56 maxlength=55 value="'. $_POST['Email'].'"></td></tr>';
echo '<tr><td>'._('Tax Group').':</td>';
echo '<td><select tabindex=19 name="TaxGroup">';
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/PcExpensesTypeTab.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -182,7 +182,7 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $SelectedTab . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $SelectedTab . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this expense code?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['codeexpense'],
$myrow['description'],
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/Prices.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -108,7 +108,7 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_row($result);
- echo $myrow[0];
+
if ($myrow[0]!=0) {
prnMsg( _('This price has already been entered. To change it you should edit it') , 'warn');
$InputError =1;
@@ -353,6 +353,8 @@
/*This is quite complicated - the idea is that prices set up should be unique and there is no way two prices could be returned as valid - when getting a price in includes/GetPrice.inc the logic is to first look for a price of the salestype/currency within the effective start and end dates - then if not get the price with a start date prior but a blank end date (the default price). We would not want two prices where one price falls inside another effective date range except in the case of a blank end date - ie no end date - the default price for the currency/salestype.
I first thought that we would need to update the previous default price (blank end date), when a new default price is entered, to have an end date of the startdate of this new default price less 1 day - but this is converting a default price into a special price which could result in having two special prices over the same date range - best to leave it unchanged and use logic in the GetPrice.inc to ensure the correct default price is returned
+ *
+ * After further discussion (Ricard) if the new price has a blank end date - i.e. no end then the pre-existing price with no end date should be changed to have an end date just prior to the new default (no end date) price commencing
*/
//this is just the case where debtorno='' - see the Prices_Customer.php script for customer special prices
$SQL = "SELECT price,
@@ -394,6 +396,34 @@
$EndDate = $myrow['enddate'];
$Price = $myrow['price'];
} // end of loop around all prices
+
+ //Now look for duplicate prices with no end
+ $SQL = "SELECT price,
+ startdate,
+ enddate
+ FROM prices
+ WHERE debtorno=''
+ AND stockid='" . $Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND typeabbrev='" . $PriceList . "'
+ AND enddate ='0000-00-00'
+ ORDER BY startdate";
+ $result = DB_query($SQL,$db);
+ $NewEndDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1));
+
+ for ($i=1;$i< DB_num_rows($result);$i++) {
+ $myrow = DB_fetch_array($result);
+ /*Need to make the end date the new start date less 1 day */
+ $SQL = "UPDATE prices SET enddate = '" . $NewEndDate . "'
+ WHERE stockid ='" .$Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND typeabbrev='" . $PriceList . "'
+ AND startdate ='" . $myrow['startdate'] . "'
+ AND enddate = '0000-00-00'
+ AND debtorno =''";
+ $UpdateResult = DB_query($SQL,$db);
+ } // end of loop around duplicate no end date prices
+
} // end function ReSequenceEffectiveDates
?>
\ No newline at end of file
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/SalesPeople.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,8 +1,6 @@
<?php
/* $Id$*/
-//$PageSecurity = 3;
-
include('includes/session.inc');
$title = _('Sales People Maintenance');
include('includes/header.inc');
@@ -78,6 +76,9 @@
if (!isset($_POST['Breakpoint'])){
$_POST['Breakpoint']=0;
}
+ if (!isset($_POST['Current'])){
+ $_POST['Current']=0;
+ }
if (isset($SelectedSaleperson) AND $InputError !=1) {
@@ -88,7 +89,8 @@
smantel='" . $_POST['SManTel'] . "',
smanfax='" . $_POST['SManFax'] . "',
breakpoint='" . $_POST['Breakpoint'] . "',
- commissionrate2='" . $_POST['CommissionRate2'] . "'
+ commissionrate2='" . $_POST['CommissionRate2'] . "',
+ current='" . $_POST['Current'] . "'
WHERE salesmancode = '".$SelectedSaleperson."'";
$msg = _('Salesperson record for') . ' ' . $_POST['SalesmanName'] . ' ' . _('has been updated');
@@ -102,14 +104,16 @@
commissionrate2,
breakpoint,
smantel,
- smanfax)
+ smanfax,
+ current)
VALUES ('" . $_POST['SalesmanCode'] . "',
'" . $_POST['SalesmanName'] . "',
'" . $_POST['CommissionRate1'] . "',
'" . $_POST['CommissionRate2'] . "',
'" . $_POST['Breakpoint'] . "',
'" . $_POST['SManTel'] . "',
- '" . $_POST['SManFax'] . "'
+ '" . $_POST['SManFax'] . "',
+ '" . $_POST['Current'] . "'
)";
$msg = _('A new salesperson record has been added for') . ' ' . $_POST['SalesmanName'];
@@ -130,6 +134,7 @@
unset($_POST['Breakpoint']);
unset($_POST['SManFax']);
unset($_POST['SManTel']);
+ unset($_POST['Current']);
}
} elseif (isset($_GET['delete'])) {
@@ -176,7 +181,8 @@
smanfax,
commissionrate1,
breakpoint,
- commissionrate2
+ commissionrate2,
+ current
FROM salesman";
$result = DB_query($sql,$db);
@@ -187,7 +193,8 @@
<th>' . _('Facsimile') . '</th>
<th>' . _('Comm Rate 1') . '</th>
<th>' . _('Break') . '</th>
- <th>' . _('Comm Rate 2') . '</th></tr>';
+ <th>' . _('Comm Rate 2') . '</th>
+ <th>' . _('Current') . '</th></tr>';
$k=0;
while ($myrow=DB_fetch_row($result)) {
@@ -198,6 +205,7 @@
echo '<tr class="OddTableRows">';
$k++;
}
+ if ($myrow[7] == 1) $ActiveText = _("Yes"); else $ActiveText = _("No");
printf('
<td>%s</td>
@@ -207,6 +215,7 @@
<td class=number>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
+ <td>%s</td>
<td><a href="%sSelectedSaleperson=%s">'. _('Edit') . '</a></td>
<td><a href="%sSelectedSaleperson=%s&delete=1">' . _('Delete') . '</a></td>
</tr>',
@@ -217,6 +226,7 @@
$myrow[4],
$myrow[5],
$myrow[6],
+ $ActiveText,
$_SERVER['PHP_SELF'] . '?' . SID . '&',
$myrow[0],
$_SERVER['PHP_SELF'] . '?' . SID . '&',
@@ -244,7 +254,8 @@
smanfax,
commissionrate1,
breakpoint,
- commissionrate2
+ commissionrate2,
+ current
FROM salesman
WHERE salesmancode='".$SelectedSaleperson."'";
@@ -258,6 +269,7 @@
$_POST['CommissionRate1'] = $myrow['commissionrate1'];
$_POST['Breakpoint'] = $myrow['breakpoint'];
$_POST['CommissionRate2'] = $myrow['commissionrate2'];
+ $_POST['Current'] = $myrow['current'];
echo '<input type=hidden name="SelectedSaleperson" VALUE="' . $SelectedSaleperson . '">';
@@ -288,8 +300,10 @@
if (!isset($_POST['Breakpoint'])){
$_POST['Breakpoint']=0;
}
+ if (!isset($_POST['Current'])){
+ $_POST['Current']=0;
+ }
-
echo '<tr><td>' . _('Salesperson Name') . ':</td><td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 VALUE="' . $_POST['SalesmanName'] . '"></td></tr>';
echo '<tr><td>' . _('Telephone No') . ':</td><td><input type="text" name="SManTel" size=20 maxlength=20 VALUE="' . $_POST['SManTel'] . '"></td></tr>';
echo '<tr><td>' . _('Facsimile No') . ':</td><td><input type="text" name="SManFax" size=20 maxlength=20 VALUE="' . $_POST['SManFax'] . '"></td></tr>';
@@ -297,6 +311,19 @@
echo '<tr><td>' . _('Breakpoint') . ':</td><td><input type="text" class=number name="Breakpoint" size=6 maxlength=6 VALUE="' . $_POST['Breakpoint'] . '"></td></tr>';
echo '<tr><td>' . _('Commission Rate 2') . ':</td><td><input type="text" class=number name="CommissionRate2" size=5 maxlength=5 VALUE="' . $_POST['CommissionRate2']. '"></td></tr>';
+ echo '<tr><td>' . _('Current?') . ':</td><td><select name="Current">';
+ if ($_POST['Current']==1){
+ echo '<option selected value=1>' . _('Yes') . '</option>';
+ } else {
+ echo '<option value=1>' . _('Yes') . '</option>';
+ }
+ if ($_POST['Current']==0){
+ echo '<option selected value=0>' . _('No') . '</option>';
+ } else {
+ echo '<option value=0>' . _('No') . '</option>';
+ }
+ echo '</select></td></tr>';
+
echo '</table>';
echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Enter Information') . '"></div>';
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/SalesTypes.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -40,6 +40,11 @@
prnMsg( _('The sales type (price list) code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'SalesType';
$i++;
+ } elseif( trim($_POST['Sales_Type'])==''){
+ $InputError = 1;
+ prnMsg (_('The sales type (price list) description cannot be empty'),'error');
+ $Errors[$i] = 'SalesType';
+ $i++;
} elseif (strlen($_POST['Sales_Type']) >40) {
$InputError = 1;
echo prnMsg(_('The sales type (price list) description must be forty characters or less long'),'error');
@@ -155,12 +160,12 @@
prnMsg (_('Cannot delete this sale type because customers are currently set up to use this sales type') . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customers with this sales type code'));
} else {
- $sql="DELETE FROM salestypes WHERE typeabbrev='".$SelectedType."'";
+ $sql="DELETE FROM salestypes WHERE typeabbrev='" . $SelectedType . "'";
$ErrMsg = _('The Sales Type record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('Sales type') . ' / ' . _('price list') . ' ' . $SelectedType . ' ' . _('has been deleted') ,'success');
- $sql ="DELETE FROM prices WHERE prices.typeabbrev='SelectedType'";
+ $sql ="DELETE FROM prices WHERE prices.typeabbrev='" . $SelectedType . "'";
$ErrMsg = _('The Sales Type prices could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/UpgradeDatabase.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,207 +1,209 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts'),'info');
- echo '<p><form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table><tr><td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >';
- echo '<option selected value="Manual">' . _('Apply database changes manually') . '</option>';
- echo '<option value="3.00">' . _('Version 3.00') . '</option>';
- echo '<option value="3.01">' . _('Version 3.01') . '</option>';
- echo '<option value="3.02">' . _('Version 3.02') . '</option>';
- echo '<option value="3.03">' . _('Version 3.03') . '</option>';
- echo '<option value="3.04">' . _('Version 3.04') . '</option>';
- echo '<option value="3.05">' . _('Version 3.05') . '</option>';
- echo '<option value="3.06">' . _('Version 3.06') . '</option>';
- echo '<option value="3.07">' . _('Version 3.07') . '</option>';
- echo '<option value="3.08">' . _('Version 3.08') . '</option>';
- echo '<option value="3.09">' . _('Version 3.09') . '</option>';
- echo '<option value="3.10">' . _('Version 3.10') . '</option>';
- echo '<option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>';
- echo '</select></td></tr></table>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'],'info');
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- }
-
- echo '<div class="centre"><input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" /></div>';
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- /* First do a backup
- $BackupFile = $PathPrefix . './companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . $BackupFile;
- system($Command);
-
- //this could be a weighty file attachment!!
- include('includes/htmlMimeMail.php');
- $mail = new htmlMimeMail();
- $attachment = $mail->getFile( $BackupFile);
- $mail->setText(_('webERP backup file attached'));
- $mail->addAttachment($attachment, $BackupFile, 'application/gz');
- $mail->setSubject(_('Database Backup'));
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $result = $mail->send(array('"' . $_SESSION['UsersRealName'] . '" <' . $_SESSION['UserEmail'] . '>'));
-
- prnMsg(_('A backup of the database has been taken and emailed to you'), 'info');
- unlink($BackupFile); // would be a security issue to leave it there for all to download/see
-
- */
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br /><table>
- <tr><th colspan=2>' . _('Applying') . ' ' . $SQLScriptFile . '</th></tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (substr($SQLEntries[$i], 0, 2) != '--'
- AND substr($SQLEntries[$i], 0, 3) != 'USE'
- AND strstr($SQLEntries[$i],'/*')==FALSE
- AND strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = substr($sql,0,strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts'),'info');
+ echo '<p><form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table><tr><td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >';
+ echo '<option selected value="Manual">' . _('Apply database changes manually') . '</option>';
+ echo '<option value="3.00">' . _('Version 3.00') . '</option>';
+ echo '<option value="3.01">' . _('Version 3.01') . '</option>';
+ echo '<option value="3.02">' . _('Version 3.02') . '</option>';
+ echo '<option value="3.03">' . _('Version 3.03') . '</option>';
+ echo '<option value="3.04">' . _('Version 3.04') . '</option>';
+ echo '<option value="3.05">' . _('Version 3.05') . '</option>';
+ echo '<option value="3.06">' . _('Version 3.06') . '</option>';
+ echo '<option value="3.07">' . _('Version 3.07') . '</option>';
+ echo '<option value="3.08">' . _('Version 3.08') . '</option>';
+ echo '<option value="3.09">' . _('Version 3.09') . '</option>';
+ echo '<option value="3.10">' . _('Version 3.10') . '</option>';
+ echo '<option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>';
+ echo '</select></td></tr></table>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'],'info');
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ }
+
+ echo '<div class="centre"><input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" /></div>';
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ /* First do a backup
+ $BackupFile = $PathPrefix . './companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . $BackupFile;
+ system($Command);
+
+ //this could be a weighty file attachment!!
+ include('includes/htmlMimeMail.php');
+ $mail = new htmlMimeMail();
+ $attachment = $mail->getFile( $BackupFile);
+ $mail->setText(_('webERP backup file attached'));
+ $mail->addAttachment($attachment, $BackupFile, 'application/gz');
+ $mail->setSubject(_('Database Backup'));
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send(array('"' . $_SESSION['UsersRealName'] . '" <' . $_SESSION['UserEmail'] . '>'));
+
+ prnMsg(_('A backup of the database has been taken and emailed to you'), 'info');
+ unlink($BackupFile); // would be a security issue to leave it there for all to download/see
+
+ */
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br /><table>
+ <tr><th colspan=2>' . _('Applying') . ' ' . $SQLScriptFile . '</th></tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (substr($SQLEntries[$i], 0, 2) != '--'
+ AND substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND strstr($SQLEntries[$i],'/*')==FALSE
+ AND strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = substr($sql,0,strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/WWW_Users.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -475,7 +475,7 @@
echo '<tr><td>' . _('Restrict to Sales Person') . ':</td>
<td><select name="Salesman">';
-$sql = "SELECT salesmancode, salesmanname FROM salesman";
+$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1";
$result = DB_query($sql,$db);
if ((isset($_POST['Salesman']) and $_POST['Salesman']=='') OR !isset($_POST['Salesman'])){
echo '<option selected value="">' . _('Not a salesperson only login') . '</option>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/doc/Change.log 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,5 +1,9 @@
webERP Change Log
+9/6/11 Phil : Prices.php now updates the end date of a price when a new default (no end date) price is added
+9/6/11 Ricard: PcExpensesTypeTab.php deletion question message fixed as does not delete any expenses set up with this expense type
+9/6/11 Daniel Richert: includes/LanguageSetup.php changed to set $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']); as using LC_ALL over-rides numeric and we need decimal points as . - commas stuff things up
+9/6/11 Ricard: Added new field current to salesman table to flag if the salesman is currently still on the team or not - modified WWW_Users.php and CustomerBranches to only allow selection of current salesfolk
7/6/11 Phil: EmailCustTrans.php missing closing quote off input hidden InvOrCredit value
6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/includes/ConnectDB.inc 2011-06-09 10:33:38 UTC (rev 4591)
@@ -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.04.1'; //must update manually every time there is a DB change
+$Version='4.04.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/includes/LanguageSetup.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -24,8 +24,10 @@
if (function_exists('gettext')){
- $Locale = setlocale (LC_ALL, $_SESSION['Language']);
+ //$Locale = setlocale (LC_ALL, $_SESSION['Language']);
+ $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']);
+
//Turkish seems to be a special case
if ($_SESSION['Language']=='tr_TR.utf8') {
$Locale = setlocale(LC_CTYPE, 'C');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-09 10:33:45
|
Revision: 4591
http://web-erp.svn.sourceforge.net/web-erp/?rev=4591&view=rev
Author: daintree
Date: 2011-06-09 10:33:38 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/PcExpensesTypeTab.php
trunk/Prices.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/UpgradeDatabase.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/LanguageSetup.php
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/CustomerBranches.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -571,13 +571,19 @@
$_POST['BranchCode']='';
}
echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . _('Add a Branch').'</p>';
- echo '<table class=selection><tr><td>'._('Branch Code'). ':</td>
- <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="BranchCode" size=12 maxlength=10 value="' . $_POST['BranchCode'] . '"></td></tr>';
+ echo '<table class=selection>
+ <tr>
+ <td>'._('Branch Code'). ':</td>
+ <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="BranchCode" size=12 maxlength=10 value="' . $_POST['BranchCode'] . '"></td>
+ </tr>';
$_POST['DeliverBlind'] = $_SESSION['DefaultBlindPackNote'];
}
//SQL to poulate account selection boxes
- $sql = "SELECT salesmanname, salesmancode FROM salesman";
+ $sql = "SELECT salesmanname,
+ salesmancode
+ FROM salesman
+ WHERE current = 1";
$result = DB_query($sql,$db);
@@ -592,12 +598,16 @@
echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '" />';
- echo '<tr><td>'._('Branch Name').':</td>';
+ echo '<tr>
+ <td>'._('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
- echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
- echo '<tr><td>'._('Branch Contact').':</td>';
+ echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td>
+ </tr>';
+ echo '<tr>
+ <td>'._('Branch Contact').':</td>';
if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
- echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
+ echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td>
+ </tr>';
echo '<tr><td>'._('Street Address 1 (Street)').':</td>';
if (!isset($_POST['BrAddress1'])) {$_POST['BrAddress1']='';}
echo '<td><input tabindex=4 type="text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
@@ -635,7 +645,7 @@
} else {
echo '<option value=';
}
- echo $myrow['salesmancode'] . '>' . $myrow['salesmanname'];
+ echo $myrow['salesmancode'] . '>' . $myrow['salesmanname'] . '</option>';
} //end while loop
@@ -643,7 +653,7 @@
DB_data_seek($result,0);
- $sql = 'SELECT areacode, areadescription FROM areas';
+ $sql = "SELECT areacode, areadescription FROM areas";
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
echo '</table>';
@@ -661,7 +671,7 @@
} else {
echo '<option value="';
}
- echo $myrow['areacode'] . '">' . $myrow['areadescription'];
+ echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} //end while loop
@@ -705,7 +715,7 @@
if (!isset($_POST['Email'])) {$_POST['Email']='';}
echo '<tr><td>'.(($_POST['Email']) ? '<a href="Mailto:'.$_POST['Email'].'">'._('Email').':</a>' : _('Email').':').'</td>';
//only display email link if there is an email address
- echo '<td><input tabindex=18 type="Text" name="Email" size=56 maxlength=55 value="'. $_POST['Email'].'"></td></tr>';
+ echo '<td><input tabindex=18 type="text" name="Email" size=56 maxlength=55 value="'. $_POST['Email'].'"></td></tr>';
echo '<tr><td>'._('Tax Group').':</td>';
echo '<td><select tabindex=19 name="TaxGroup">';
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/PcExpensesTypeTab.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -182,7 +182,7 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $SelectedTab . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $SelectedTab . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this expense code?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['codeexpense'],
$myrow['description'],
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/Prices.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -108,7 +108,7 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_row($result);
- echo $myrow[0];
+
if ($myrow[0]!=0) {
prnMsg( _('This price has already been entered. To change it you should edit it') , 'warn');
$InputError =1;
@@ -353,6 +353,8 @@
/*This is quite complicated - the idea is that prices set up should be unique and there is no way two prices could be returned as valid - when getting a price in includes/GetPrice.inc the logic is to first look for a price of the salestype/currency within the effective start and end dates - then if not get the price with a start date prior but a blank end date (the default price). We would not want two prices where one price falls inside another effective date range except in the case of a blank end date - ie no end date - the default price for the currency/salestype.
I first thought that we would need to update the previous default price (blank end date), when a new default price is entered, to have an end date of the startdate of this new default price less 1 day - but this is converting a default price into a special price which could result in having two special prices over the same date range - best to leave it unchanged and use logic in the GetPrice.inc to ensure the correct default price is returned
+ *
+ * After further discussion (Ricard) if the new price has a blank end date - i.e. no end then the pre-existing price with no end date should be changed to have an end date just prior to the new default (no end date) price commencing
*/
//this is just the case where debtorno='' - see the Prices_Customer.php script for customer special prices
$SQL = "SELECT price,
@@ -394,6 +396,34 @@
$EndDate = $myrow['enddate'];
$Price = $myrow['price'];
} // end of loop around all prices
+
+ //Now look for duplicate prices with no end
+ $SQL = "SELECT price,
+ startdate,
+ enddate
+ FROM prices
+ WHERE debtorno=''
+ AND stockid='" . $Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND typeabbrev='" . $PriceList . "'
+ AND enddate ='0000-00-00'
+ ORDER BY startdate";
+ $result = DB_query($SQL,$db);
+ $NewEndDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1));
+
+ for ($i=1;$i< DB_num_rows($result);$i++) {
+ $myrow = DB_fetch_array($result);
+ /*Need to make the end date the new start date less 1 day */
+ $SQL = "UPDATE prices SET enddate = '" . $NewEndDate . "'
+ WHERE stockid ='" .$Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND typeabbrev='" . $PriceList . "'
+ AND startdate ='" . $myrow['startdate'] . "'
+ AND enddate = '0000-00-00'
+ AND debtorno =''";
+ $UpdateResult = DB_query($SQL,$db);
+ } // end of loop around duplicate no end date prices
+
} // end function ReSequenceEffectiveDates
?>
\ No newline at end of file
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/SalesPeople.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,8 +1,6 @@
<?php
/* $Id$*/
-//$PageSecurity = 3;
-
include('includes/session.inc');
$title = _('Sales People Maintenance');
include('includes/header.inc');
@@ -78,6 +76,9 @@
if (!isset($_POST['Breakpoint'])){
$_POST['Breakpoint']=0;
}
+ if (!isset($_POST['Current'])){
+ $_POST['Current']=0;
+ }
if (isset($SelectedSaleperson) AND $InputError !=1) {
@@ -88,7 +89,8 @@
smantel='" . $_POST['SManTel'] . "',
smanfax='" . $_POST['SManFax'] . "',
breakpoint='" . $_POST['Breakpoint'] . "',
- commissionrate2='" . $_POST['CommissionRate2'] . "'
+ commissionrate2='" . $_POST['CommissionRate2'] . "',
+ current='" . $_POST['Current'] . "'
WHERE salesmancode = '".$SelectedSaleperson."'";
$msg = _('Salesperson record for') . ' ' . $_POST['SalesmanName'] . ' ' . _('has been updated');
@@ -102,14 +104,16 @@
commissionrate2,
breakpoint,
smantel,
- smanfax)
+ smanfax,
+ current)
VALUES ('" . $_POST['SalesmanCode'] . "',
'" . $_POST['SalesmanName'] . "',
'" . $_POST['CommissionRate1'] . "',
'" . $_POST['CommissionRate2'] . "',
'" . $_POST['Breakpoint'] . "',
'" . $_POST['SManTel'] . "',
- '" . $_POST['SManFax'] . "'
+ '" . $_POST['SManFax'] . "',
+ '" . $_POST['Current'] . "'
)";
$msg = _('A new salesperson record has been added for') . ' ' . $_POST['SalesmanName'];
@@ -130,6 +134,7 @@
unset($_POST['Breakpoint']);
unset($_POST['SManFax']);
unset($_POST['SManTel']);
+ unset($_POST['Current']);
}
} elseif (isset($_GET['delete'])) {
@@ -176,7 +181,8 @@
smanfax,
commissionrate1,
breakpoint,
- commissionrate2
+ commissionrate2,
+ current
FROM salesman";
$result = DB_query($sql,$db);
@@ -187,7 +193,8 @@
<th>' . _('Facsimile') . '</th>
<th>' . _('Comm Rate 1') . '</th>
<th>' . _('Break') . '</th>
- <th>' . _('Comm Rate 2') . '</th></tr>';
+ <th>' . _('Comm Rate 2') . '</th>
+ <th>' . _('Current') . '</th></tr>';
$k=0;
while ($myrow=DB_fetch_row($result)) {
@@ -198,6 +205,7 @@
echo '<tr class="OddTableRows">';
$k++;
}
+ if ($myrow[7] == 1) $ActiveText = _("Yes"); else $ActiveText = _("No");
printf('
<td>%s</td>
@@ -207,6 +215,7 @@
<td class=number>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
+ <td>%s</td>
<td><a href="%sSelectedSaleperson=%s">'. _('Edit') . '</a></td>
<td><a href="%sSelectedSaleperson=%s&delete=1">' . _('Delete') . '</a></td>
</tr>',
@@ -217,6 +226,7 @@
$myrow[4],
$myrow[5],
$myrow[6],
+ $ActiveText,
$_SERVER['PHP_SELF'] . '?' . SID . '&',
$myrow[0],
$_SERVER['PHP_SELF'] . '?' . SID . '&',
@@ -244,7 +254,8 @@
smanfax,
commissionrate1,
breakpoint,
- commissionrate2
+ commissionrate2,
+ current
FROM salesman
WHERE salesmancode='".$SelectedSaleperson."'";
@@ -258,6 +269,7 @@
$_POST['CommissionRate1'] = $myrow['commissionrate1'];
$_POST['Breakpoint'] = $myrow['breakpoint'];
$_POST['CommissionRate2'] = $myrow['commissionrate2'];
+ $_POST['Current'] = $myrow['current'];
echo '<input type=hidden name="SelectedSaleperson" VALUE="' . $SelectedSaleperson . '">';
@@ -288,8 +300,10 @@
if (!isset($_POST['Breakpoint'])){
$_POST['Breakpoint']=0;
}
+ if (!isset($_POST['Current'])){
+ $_POST['Current']=0;
+ }
-
echo '<tr><td>' . _('Salesperson Name') . ':</td><td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 VALUE="' . $_POST['SalesmanName'] . '"></td></tr>';
echo '<tr><td>' . _('Telephone No') . ':</td><td><input type="text" name="SManTel" size=20 maxlength=20 VALUE="' . $_POST['SManTel'] . '"></td></tr>';
echo '<tr><td>' . _('Facsimile No') . ':</td><td><input type="text" name="SManFax" size=20 maxlength=20 VALUE="' . $_POST['SManFax'] . '"></td></tr>';
@@ -297,6 +311,19 @@
echo '<tr><td>' . _('Breakpoint') . ':</td><td><input type="text" class=number name="Breakpoint" size=6 maxlength=6 VALUE="' . $_POST['Breakpoint'] . '"></td></tr>';
echo '<tr><td>' . _('Commission Rate 2') . ':</td><td><input type="text" class=number name="CommissionRate2" size=5 maxlength=5 VALUE="' . $_POST['CommissionRate2']. '"></td></tr>';
+ echo '<tr><td>' . _('Current?') . ':</td><td><select name="Current">';
+ if ($_POST['Current']==1){
+ echo '<option selected value=1>' . _('Yes') . '</option>';
+ } else {
+ echo '<option value=1>' . _('Yes') . '</option>';
+ }
+ if ($_POST['Current']==0){
+ echo '<option selected value=0>' . _('No') . '</option>';
+ } else {
+ echo '<option value=0>' . _('No') . '</option>';
+ }
+ echo '</select></td></tr>';
+
echo '</table>';
echo '<br /><div class="centre"><input type="Submit" name="submit" value="' . _('Enter Information') . '"></div>';
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/SalesTypes.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -40,6 +40,11 @@
prnMsg( _('The sales type (price list) code cannot be an empty string or spaces'),'error');
$Errors[$i] = 'SalesType';
$i++;
+ } elseif( trim($_POST['Sales_Type'])==''){
+ $InputError = 1;
+ prnMsg (_('The sales type (price list) description cannot be empty'),'error');
+ $Errors[$i] = 'SalesType';
+ $i++;
} elseif (strlen($_POST['Sales_Type']) >40) {
$InputError = 1;
echo prnMsg(_('The sales type (price list) description must be forty characters or less long'),'error');
@@ -155,12 +160,12 @@
prnMsg (_('Cannot delete this sale type because customers are currently set up to use this sales type') . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customers with this sales type code'));
} else {
- $sql="DELETE FROM salestypes WHERE typeabbrev='".$SelectedType."'";
+ $sql="DELETE FROM salestypes WHERE typeabbrev='" . $SelectedType . "'";
$ErrMsg = _('The Sales Type record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('Sales type') . ' / ' . _('price list') . ' ' . $SelectedType . ' ' . _('has been deleted') ,'success');
- $sql ="DELETE FROM prices WHERE prices.typeabbrev='SelectedType'";
+ $sql ="DELETE FROM prices WHERE prices.typeabbrev='" . $SelectedType . "'";
$ErrMsg = _('The Sales Type prices could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/UpgradeDatabase.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,207 +1,209 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts'),'info');
- echo '<p><form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table><tr><td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >';
- echo '<option selected value="Manual">' . _('Apply database changes manually') . '</option>';
- echo '<option value="3.00">' . _('Version 3.00') . '</option>';
- echo '<option value="3.01">' . _('Version 3.01') . '</option>';
- echo '<option value="3.02">' . _('Version 3.02') . '</option>';
- echo '<option value="3.03">' . _('Version 3.03') . '</option>';
- echo '<option value="3.04">' . _('Version 3.04') . '</option>';
- echo '<option value="3.05">' . _('Version 3.05') . '</option>';
- echo '<option value="3.06">' . _('Version 3.06') . '</option>';
- echo '<option value="3.07">' . _('Version 3.07') . '</option>';
- echo '<option value="3.08">' . _('Version 3.08') . '</option>';
- echo '<option value="3.09">' . _('Version 3.09') . '</option>';
- echo '<option value="3.10">' . _('Version 3.10') . '</option>';
- echo '<option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>';
- echo '</select></td></tr></table>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'],'info');
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- }
-
- echo '<div class="centre"><input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" /></div>';
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- /* First do a backup
- $BackupFile = $PathPrefix . './companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . $BackupFile;
- system($Command);
-
- //this could be a weighty file attachment!!
- include('includes/htmlMimeMail.php');
- $mail = new htmlMimeMail();
- $attachment = $mail->getFile( $BackupFile);
- $mail->setText(_('webERP backup file attached'));
- $mail->addAttachment($attachment, $BackupFile, 'application/gz');
- $mail->setSubject(_('Database Backup'));
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $result = $mail->send(array('"' . $_SESSION['UsersRealName'] . '" <' . $_SESSION['UserEmail'] . '>'));
-
- prnMsg(_('A backup of the database has been taken and emailed to you'), 'info');
- unlink($BackupFile); // would be a security issue to leave it there for all to download/see
-
- */
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br /><table>
- <tr><th colspan=2>' . _('Applying') . ' ' . $SQLScriptFile . '</th></tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (substr($SQLEntries[$i], 0, 2) != '--'
- AND substr($SQLEntries[$i], 0, 3) != 'USE'
- AND strstr($SQLEntries[$i],'/*')==FALSE
- AND strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = substr($sql,0,strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts'),'info');
+ echo '<p><form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table><tr><td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >';
+ echo '<option selected value="Manual">' . _('Apply database changes manually') . '</option>';
+ echo '<option value="3.00">' . _('Version 3.00') . '</option>';
+ echo '<option value="3.01">' . _('Version 3.01') . '</option>';
+ echo '<option value="3.02">' . _('Version 3.02') . '</option>';
+ echo '<option value="3.03">' . _('Version 3.03') . '</option>';
+ echo '<option value="3.04">' . _('Version 3.04') . '</option>';
+ echo '<option value="3.05">' . _('Version 3.05') . '</option>';
+ echo '<option value="3.06">' . _('Version 3.06') . '</option>';
+ echo '<option value="3.07">' . _('Version 3.07') . '</option>';
+ echo '<option value="3.08">' . _('Version 3.08') . '</option>';
+ echo '<option value="3.09">' . _('Version 3.09') . '</option>';
+ echo '<option value="3.10">' . _('Version 3.10') . '</option>';
+ echo '<option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>';
+ echo '</select></td></tr></table>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'],'info');
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ }
+
+ echo '<div class="centre"><input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" /></div>';
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ /* First do a backup
+ $BackupFile = $PathPrefix . './companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' . $BackupFile;
+ system($Command);
+
+ //this could be a weighty file attachment!!
+ include('includes/htmlMimeMail.php');
+ $mail = new htmlMimeMail();
+ $attachment = $mail->getFile( $BackupFile);
+ $mail->setText(_('webERP backup file attached'));
+ $mail->addAttachment($attachment, $BackupFile, 'application/gz');
+ $mail->setSubject(_('Database Backup'));
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send(array('"' . $_SESSION['UsersRealName'] . '" <' . $_SESSION['UserEmail'] . '>'));
+
+ prnMsg(_('A backup of the database has been taken and emailed to you'), 'info');
+ unlink($BackupFile); // would be a security issue to leave it there for all to download/see
+
+ */
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br /><table>
+ <tr><th colspan=2>' . _('Applying') . ' ' . $SQLScriptFile . '</th></tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (substr($SQLEntries[$i], 0, 2) != '--'
+ AND substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND strstr($SQLEntries[$i],'/*')==FALSE
+ AND strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = substr($sql,0,strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/WWW_Users.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -475,7 +475,7 @@
echo '<tr><td>' . _('Restrict to Sales Person') . ':</td>
<td><select name="Salesman">';
-$sql = "SELECT salesmancode, salesmanname FROM salesman";
+$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1";
$result = DB_query($sql,$db);
if ((isset($_POST['Salesman']) and $_POST['Salesman']=='') OR !isset($_POST['Salesman'])){
echo '<option selected value="">' . _('Not a salesperson only login') . '</option>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/doc/Change.log 2011-06-09 10:33:38 UTC (rev 4591)
@@ -1,5 +1,9 @@
webERP Change Log
+9/6/11 Phil : Prices.php now updates the end date of a price when a new default (no end date) price is added
+9/6/11 Ricard: PcExpensesTypeTab.php deletion question message fixed as does not delete any expenses set up with this expense type
+9/6/11 Daniel Richert: includes/LanguageSetup.php changed to set $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']); as using LC_ALL over-rides numeric and we need decimal points as . - commas stuff things up
+9/6/11 Ricard: Added new field current to salesman table to flag if the salesman is currently still on the team or not - modified WWW_Users.php and CustomerBranches to only allow selection of current salesfolk
7/6/11 Phil: EmailCustTrans.php missing closing quote off input hidden InvOrCredit value
6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/includes/ConnectDB.inc 2011-06-09 10:33:38 UTC (rev 4591)
@@ -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.04.1'; //must update manually every time there is a DB change
+$Version='4.04.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php 2011-06-07 10:03:04 UTC (rev 4590)
+++ trunk/includes/LanguageSetup.php 2011-06-09 10:33:38 UTC (rev 4591)
@@ -24,8 +24,10 @@
if (function_exists('gettext')){
- $Locale = setlocale (LC_ALL, $_SESSION['Language']);
+ //$Locale = setlocale (LC_ALL, $_SESSION['Language']);
+ $Locale = setlocale (LC_MESSAGES, $_SESSION['Language']);
+
//Turkish seems to be a special case
if ($_SESSION['Language']=='tr_TR.utf8') {
$Locale = setlocale(LC_CTYPE, 'C');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-07 10:03:10
|
Revision: 4590
http://web-erp.svn.sourceforge.net/web-erp/?rev=4590&view=rev
Author: daintree
Date: 2011-06-07 10:03:04 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/EmailCustTrans.php
trunk/doc/Change.log
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2011-06-06 08:15:59 UTC (rev 4589)
+++ trunk/EmailCustTrans.php 2011-06-07 10:03:04 UTC (rev 4590)
@@ -1,9 +1,7 @@
<?php
-/* $Revision: 1.8 $ */
+
/* $Id$*/
-//$PageSecurity = 2;
-
include ('includes/session.inc');
include ('includes/SQL_CommonFunctions.inc');
@@ -19,13 +17,13 @@
if (isset($_POST['DoIt']) AND IsEmailAddress($_POST['EmailAddr'])){
if ($_SESSION['InvoicePortraitFormat']==0){
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>";
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . "<a href='" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>" . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
} else {
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>";
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
}
exit;
} elseif (isset($_POST['DoIt'])) {
@@ -40,8 +38,8 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type=hidden name="TransNo" VALUE="' . $_GET['FromTransNo'] . '">';
-echo '<input type=hidden name="InvOrCredit" VALUE="' . $_GET['InvOrCredit'] . '>';
+echo '<input type=hidden name="TransNo" value="' . $_GET['FromTransNo'] . '">';
+echo '<input type=hidden name="InvOrCredit" value="' . $_GET['InvOrCredit'] . '">';
echo '<br /><table>';
@@ -49,8 +47,8 @@
FROM custbranch INNER JOIN debtortrans
ON custbranch.debtorno= debtortrans.debtorno
AND custbranch.branchcode=debtortrans.branchcode
- WHERE debtortrans.type=$TypeCode
- AND debtortrans.transno=" .$_GET['FromTransNo'];
+ WHERE debtortrans.type='" . $TypeCode . "'
+ AND debtortrans.transno='" .$_GET['FromTransNo'] . "'";
$ErrMsg = _('There was a problem retrieving the contact details for the customer');
$ContactResult=DB_query($SQL,$db,$ErrMsg);
@@ -63,10 +61,10 @@
}
echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td>
- <td><input type=TEXT name="EmailAddr" maxlength=60 size=60 VALUE="' . $EmailAddress . '"></td>
+ <td><input type="text" name="EmailAddr" maxlength=60 size=60 value="' . $EmailAddress . '"></td>
</table>';
-echo '<br><div class="centre"><input type=submit name="DoIt" VALUE="' . _('OK') . '">';
+echo '<br><div class="centre"><input type=submit name="DoIt" value="' . _('OK') . '">';
echo '</div></form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-06 08:15:59 UTC (rev 4589)
+++ trunk/doc/Change.log 2011-06-07 10:03:04 UTC (rev 4590)
@@ -1,5 +1,6 @@
webERP Change Log
+7/6/11 Phil: EmailCustTrans.php missing closing quote off input hidden InvOrCredit value
6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
5/6/11 Phil: BankMatching typo pprintf fixed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-07 10:03:10
|
Revision: 4590
http://web-erp.svn.sourceforge.net/web-erp/?rev=4590&view=rev
Author: daintree
Date: 2011-06-07 10:03:04 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/EmailCustTrans.php
trunk/doc/Change.log
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2011-06-06 08:15:59 UTC (rev 4589)
+++ trunk/EmailCustTrans.php 2011-06-07 10:03:04 UTC (rev 4590)
@@ -1,9 +1,7 @@
<?php
-/* $Revision: 1.8 $ */
+
/* $Id$*/
-//$PageSecurity = 2;
-
include ('includes/session.inc');
include ('includes/SQL_CommonFunctions.inc');
@@ -19,13 +17,13 @@
if (isset($_POST['DoIt']) AND IsEmailAddress($_POST['EmailAddr'])){
if ($_SESSION['InvoicePortraitFormat']==0){
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>";
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . "<a href='" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>" . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
} else {
- echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>";
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
}
exit;
} elseif (isset($_POST['DoIt'])) {
@@ -40,8 +38,8 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type=hidden name="TransNo" VALUE="' . $_GET['FromTransNo'] . '">';
-echo '<input type=hidden name="InvOrCredit" VALUE="' . $_GET['InvOrCredit'] . '>';
+echo '<input type=hidden name="TransNo" value="' . $_GET['FromTransNo'] . '">';
+echo '<input type=hidden name="InvOrCredit" value="' . $_GET['InvOrCredit'] . '">';
echo '<br /><table>';
@@ -49,8 +47,8 @@
FROM custbranch INNER JOIN debtortrans
ON custbranch.debtorno= debtortrans.debtorno
AND custbranch.branchcode=debtortrans.branchcode
- WHERE debtortrans.type=$TypeCode
- AND debtortrans.transno=" .$_GET['FromTransNo'];
+ WHERE debtortrans.type='" . $TypeCode . "'
+ AND debtortrans.transno='" .$_GET['FromTransNo'] . "'";
$ErrMsg = _('There was a problem retrieving the contact details for the customer');
$ContactResult=DB_query($SQL,$db,$ErrMsg);
@@ -63,10 +61,10 @@
}
echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td>
- <td><input type=TEXT name="EmailAddr" maxlength=60 size=60 VALUE="' . $EmailAddress . '"></td>
+ <td><input type="text" name="EmailAddr" maxlength=60 size=60 value="' . $EmailAddress . '"></td>
</table>';
-echo '<br><div class="centre"><input type=submit name="DoIt" VALUE="' . _('OK') . '">';
+echo '<br><div class="centre"><input type=submit name="DoIt" value="' . _('OK') . '">';
echo '</div></form>';
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-06 08:15:59 UTC (rev 4589)
+++ trunk/doc/Change.log 2011-06-07 10:03:04 UTC (rev 4590)
@@ -1,5 +1,6 @@
webERP Change Log
+7/6/11 Phil: EmailCustTrans.php missing closing quote off input hidden InvOrCredit value
6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
5/6/11 Phil: BankMatching typo pprintf fixed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-06 08:16:05
|
Revision: 4589
http://web-erp.svn.sourceforge.net/web-erp/?rev=4589&view=rev
Author: daintree
Date: 2011-06-06 08:15:59 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Credit_Invoice.php currencies table duplicated in SQL
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
trunk/doc/README.txt
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/Credit_Invoice.php 2011-06-06 08:15:59 UTC (rev 4589)
@@ -60,8 +60,6 @@
stockmoves.transno=debtortrans.transno
INNER JOIN locations ON
stockmoves.loccode = locations.loccode
- INNER JOIN currencies ON
- debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.transno = '" . $_GET['InvoiceNumber'] . "'
AND debtortrans.type=10
AND stockmoves.type=10";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/doc/Change.log 2011-06-06 08:15:59 UTC (rev 4589)
@@ -1,5 +1,6 @@
webERP Change Log
+6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
5/6/11 Phil: BankMatching typo pprintf fixed
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/doc/README.txt 2011-06-06 08:15:59 UTC (rev 4589)
@@ -2,7 +2,7 @@
/* $Id$*/
-Version 4.03 of webERP
+Version 4.x 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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-06 08:16:05
|
Revision: 4589
http://web-erp.svn.sourceforge.net/web-erp/?rev=4589&view=rev
Author: daintree
Date: 2011-06-06 08:15:59 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Credit_Invoice.php currencies table duplicated in SQL
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
trunk/doc/README.txt
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/Credit_Invoice.php 2011-06-06 08:15:59 UTC (rev 4589)
@@ -60,8 +60,6 @@
stockmoves.transno=debtortrans.transno
INNER JOIN locations ON
stockmoves.loccode = locations.loccode
- INNER JOIN currencies ON
- debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.transno = '" . $_GET['InvoiceNumber'] . "'
AND debtortrans.type=10
AND stockmoves.type=10";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/doc/Change.log 2011-06-06 08:15:59 UTC (rev 4589)
@@ -1,5 +1,6 @@
webERP Change Log
+6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php
6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
5/6/11 Phil: BankMatching typo pprintf fixed
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2011-06-05 23:46:02 UTC (rev 4588)
+++ trunk/doc/README.txt 2011-06-06 08:15:59 UTC (rev 4589)
@@ -2,7 +2,7 @@
/* $Id$*/
-Version 4.03 of webERP
+Version 4.x 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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-05 23:46:09
|
Revision: 4588
http://web-erp.svn.sourceforge.net/web-erp/?rev=4588&view=rev
Author: daintree
Date: 2011-06-05 23:46:02 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
stock adjustment controlled items and completion of POrder items
Modified Paths:
--------------
trunk/BankMatching.php
trunk/GoodsReceived.php
trunk/PO_Items.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/doc/Change.log
trunk/includes/Add_SerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/BankMatching.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -243,7 +243,7 @@
$Outstanding = $myrow['amt']- $myrow['amountcleared'];
if (ABS($Outstanding)<0.009){ /*the payment is cleared dont show the check box*/
- pprintf('<tr bgcolor="#CCCEEE">
+ printf('<tr bgcolor="#CCCEEE">
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/GoodsReceived.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -140,16 +140,16 @@
//Now Display LineItem
- echo '<td>' . $LnItm->StockID . '</td>';
- echo '<td>' . $LnItm->ItemDescription . '</td>';
- echo '<td class=number>' . $DisplaySupplierQtyOrd . '</td>';
- echo '<td>' . $LnItm->SuppliersUnit . '</td>';
- echo '<td class=number>' . $DisplaySupplierQtyRec . '</td>';
- echo '<td class=number>' . $LnItm->ConversionFactor . '</td>';
- echo '<td class=number>' . $DisplayQtyOrd . '</td>';
- echo '<td>' . $LnItm->Units . '</td>';
- echo '<td class=number>' . $DisplayQtyRec . '</td>';
- echo '<td class=number>';
+ echo '<td>' . $LnItm->StockID . '</td>
+ <td>' . $LnItm->ItemDescription . '</td>
+ <td class=number>' . $DisplaySupplierQtyOrd . '</td>
+ <td>' . $LnItm->SuppliersUnit . '</td>
+ <td class=number>' . $DisplaySupplierQtyRec . '</td>
+ <td class=number>' . $LnItm->ConversionFactor . '</td>
+ <td class=number>' . $DisplayQtyOrd . '</td>
+ <td>' . $LnItm->Units . '</td>
+ <td class=number>' . $DisplayQtyRec . '</td>
+ <td class=number>';
if ($LnItm->Controlled == 1) {
@@ -346,8 +346,8 @@
if ($OrderLine->StockID!='') { //Its a stock item line
/*Need to get the current standard cost as it is now so we can process GL jorunals later*/
$SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
- FROM stockmaster
- WHERE stockid='" . $OrderLine->StockID . "'";
+ FROM stockmaster
+ WHERE stockid='" . $OrderLine->StockID . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The standard cost of the item being received cannot be retrieved because');
$DbgMsg = _('The following SQL to retrieve the standard cost was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
@@ -377,11 +377,10 @@
/*Now the SQL to do the update to the PurchOrderDetails */
if ($OrderLine->ReceiveQty >= ($OrderLine->Quantity - $OrderLine->QtyReceived)){
- $SQL = "UPDATE purchorderdetails SET
- quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
- stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- completed=1
- WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
+ $SQL = "UPDATE purchorderdetails SET quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
+ stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ completed=1
+ WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
} else {
$SQL = "UPDATE purchorderdetails SET
quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/PO_Items.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -42,7 +42,7 @@
if (!is_numeric(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))){
prnMsg(_('The quantity in the supplier units is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity=doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))*doubleval(str_replace($locale_info['thousands_sep'],'',$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor));
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity=round(doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))*doubleval(str_replace($locale_info['thousands_sep'],'',$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor)),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces);
}
if (!is_numeric(str_replace($locale_info['thousands_sep'],'',$_POST['SuppPrice'.$POLine->LineNo]))){
prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/StockAdjustments.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -24,7 +24,12 @@
if (isset($_GET['StockID'])){
$StockID = trim(strtoupper($_GET['StockID']));
$_SESSION['Adjustment']->StockID = trim(strtoupper($StockID));
- $result = DB_query("SELECT description, controlled, serialised, decimalplaces FROM stockmaster WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
+ $result = DB_query("SELECT description,
+ controlled,
+ serialised,
+ decimalplaces
+ FROM stockmaster
+ WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
$myrow = DB_fetch_array($result);
$_SESSION['Adjustment']->ItemDescription = $myrow['description'];
$_SESSION['Adjustment']->Controlled = $myrow['controlled'];
@@ -59,18 +64,24 @@
'" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
if (strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid, description from stockmaster where description like '%" . $_POST['StockText'] ."%'";
+ $sql="SELECT stockid, description FROM stockmaster WHERE description " . LIKE . " '%" . $_POST['StockText'] ."%'";
} else {
- $sql="SELECT stockid, description from stockmaster where stockid like '%" . $_POST['StockCode'] ."%'";
+ $sql="SELECT stockid, description FROM stockmaster WHERE stockid " . LIKE . " '%" . $_POST['StockCode'] ."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
$DbgMsg=_('The SQL to get the stock description was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<table class=selection><tr><th>'._('Stock Code').'</th><th>'._('Stock Description').'</th></tr>';
+ echo '<table class="selection">
+ <tr>
+ <th>'._('Stock Code').'</th>
+ <th>'._('Stock Description').'</th>
+ </tr>';
while ($myrow = DB_fetch_row($result)) {
- echo '<tr><td>'.$myrow[0].'</td>
+ echo '<tr>
+ <td>'.$myrow[0].'</td>
<td>'.$myrow[1].'</td>
- <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a></tr>';
+ <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
+ </tr>';
}
echo '</table>';
include('includes/footer.inc');
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/StockAdjustmentsControlled.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -1,5 +1,7 @@
<?php
/* $Id$*/
+
+
include('includes/DefineSerialItems.php');
include('includes/DefineStockAdjustment.php');
include('includes/session.inc');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/doc/Change.log 2011-06-05 23:46:02 UTC (rev 4588)
@@ -1,5 +1,8 @@
webERP Change Log
+6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
+5/6/11 Phil: BankMatching typo pprintf fixed
+
3/6/11 Version 4.04.3 Release
2/6/11 Phil: ConfirmDispatchControlled_Invoice.php type include/InputSerialItems.php
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/Add_SerialItems.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -6,29 +6,29 @@
/********************************************
Added KEYED Entry values
********************************************/
-if ( isset($_POST['AddBatches']) && $_POST['AddBatches']!='') {
-
+if ( (isset($_POST['AddBatches']) AND $_POST['AddBatches']!='')) {
+
for ($i=0;$i < 10;$i++){
- if(isset($_POST['SerialNo' . $i]) and strlen($_POST['SerialNo' . $i])>0){
+ if(isset($_POST['SerialNo' . $i]) AND strlen($_POST['SerialNo' . $i])>0){
if ($ItemMustExist){
$ExistingBundleQty = ValidBundleRef($StockID, $LocationOut, $_POST['SerialNo' . $i]);
- if ($ExistingBundleQty >0 or ($ExistingBundleQty==1 and $IsCredit=true)){
+ if ($ExistingBundleQty >0 OR ($ExistingBundleQty==1 and $IsCredit=true)){
$AddThisBundle = true;
/*If the user enters a duplicate serial number the later one over-writes
the first entered one - no warning given though ? */
if ($_POST['Qty' . $i] > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>';
+ echo '<br />';
prnMsg ( $_POST['SerialNo' . $i] . ' ' .
_('has already been sold'),'warning' );
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>';
+ echo '<br />';
prnMsg ( _('There is none of') . ' '. $_POST['SerialNo' . $i] .
' '. _('remaining').'.', 'warn');
$AddThisBundle = false;
} else {
- echo '<BR>';
+ echo '<br />';
prnMsg ( _('There is only'). ' ' . $ExistingBundleQty .
' '._('of') . ' ' . $_POST['SerialNo' . $i] . ' '. _('remaining') . '. ' .
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll'),
@@ -42,7 +42,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='.$_POST['SerialNo'. $i] . '" target=_blank>'.$_POST['SerialNo'. $i]. '</a> ' ._('not available') . '...' , '', 'Notice' );
unset($_POST['SerialNo' . $i]);
}
@@ -57,10 +57,10 @@
if ($LineItem->Serialised){
$ExistingQty = ValidBundleRef($StockID, $LocationOut, $NewSerialNo);
if ($NewQty == 1 && $ExistingQty != 0){
- prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _("The Serial Number being added exists with a Quantity that is not Zero (0)!"), 'error' );
+ prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _('The Serial Number being added exists with a Quantity that is not Zero (0)!'), 'error' );
$SerialError = true;
} elseif ($NewQty == -1 && $ExistingQty != 1){
- prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _("The Serial Number being removed exists with a Quantity that is not One (1)!"), 'error');
+ prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _('The Serial Number being removed exists with a Quantity that is not One (1)!'), 'error');
$SerialError = true;
}
}
@@ -75,16 +75,14 @@
if (!isset($_POST['Bundles'])) {
$_POST['Bundles']=0;
}
- echo count($_POST['Bundles']);
- for ($i=0;$i < count($_POST['Bundles'])-1;$i++){ /*there is an entry in the multi select list box */
+ //echo count($_POST['Bundles']);
+ for ($i=0;$i < count($_POST['Bundles']);$i++){ /*there is an entry in the multi select list box */
if ($LineItem->Serialised==1){ /*only if the item is serialised */
- $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], ($InOutModifier>0?1:-1) );
+ $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], ($InOutModifier>0 ? 1:-1) );
} else {
list($SerialNo, $Qty) = explode ('/|/', $_POST['Bundles'][$i]);
if ($Qty != 0) {
-
- $LineItem->SerialItems[$SerialNo] =
- new SerialItem ($SerialNo, $Qty*($InOutModifier>0?1:-1) );
+ $LineItem->SerialItems[$SerialNo] = new SerialItem ($SerialNo, $Qty*($InOutModifier>0?1:-1) );
}
}
}
@@ -171,13 +169,13 @@
/*If the user enters a duplicate serial number the later one over-writes the first entered one - no warning given though ? */
if ($NewQty > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
+ echo '<br />' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>' . _('There is none of'). ' <a href="/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
+ echo '<br />' . _('There is none of'). ' <a href="/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
$AddThisBundle = false;
} else {
- echo '<BR>'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
+ echo '<br />'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
'<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('remaining') . '. '.
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
$NewQty = $ExistingBundleQty;
@@ -189,7 +187,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('not available') ,'', 'Notice' );
}
if (!$valid) $invalid_imports++;
@@ -268,13 +266,13 @@
/*If the user enters a duplicate serial number the later one over-writes the first entered one - no warning given though ? */
if ($NewQty > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
+ echo '<br />' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>' . _('There is none of'). ' <a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
+ echo '<br />' . _('There is none of'). ' <a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
$AddThisBundle = false;
} else {
- echo '<BR>'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
+ echo '<br />'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
'<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('remaining') . '. '.
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
$NewQty = $ExistingBundleQty;
@@ -286,7 +284,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('not available') . '...' ,'', 'Notice' );
}
if (!$valid) $invalid_imports++;
Modified: trunk/includes/InputSerialItemsExisting.php
===================================================================
--- trunk/includes/InputSerialItemsExisting.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/InputSerialItemsExisting.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -9,59 +9,60 @@
**/
if ($_POST['EntryType'] == 'KEYED'){
/*Also a multi select box for adding bundles to the dispatch without keying */
- $sql = "SELECT serialno, quantity
+ $sql = "SELECT serialno, quantity
FROM stockserialitems
- WHERE stockid='" . $StockID . "' AND loccode ='" .
- $LocationOut."' AND quantity > 0";
- //echo $sql;
+ WHERE stockid='" . $StockID . "'
+ AND loccode ='" . $LocationOut."'
+ AND quantity > 0";
$ErrMsg = '<br />'. _('Could not retrieve the items for'). ' ' . $StockID;
- $Bundles = DB_query($sql,$db, $ErrMsg );
- echo '<table class=selection><tr>';
- if (DB_num_rows($Bundles)>0){
- $AllSerials=array();
+ $Bundles = DB_query($sql,$db, $ErrMsg );
+ echo '<table class="selection"><tr>';
+ if (DB_num_rows($Bundles)>0){
+ $AllSerials=array();
foreach ($LineItem->SerialItems as $Itm){
$AllSerials[$Itm->BundleRef] = $Itm->BundleQty;
}
-
+
echo '<td valign="top"><b>'. _('Select Existing Items'). '</b><br />';
-
- 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 '<input type=hidden name="LineNo" value="' . $LineNo . '">
- <input type="hidden" name="StockID" value="' . $StockID . '">
- <input type="hidden" name="EntryType" value="KEYED">
- <input type=hidden name="identifier" value="' . $identifier . '">
+ echo '<input type=hidden name="LineNo" value="' . $LineNo . '">
+ <input type="hidden" name="StockID" value="' . $StockID . '">
+ <input type="hidden" name="EntryType" value="KEYED">
+ <input type=hidden name="identifier" value="' . $identifier . '">
<input type="hidden" name="EditControlled" value="true">
- <select Name=Bundles[] multiple>';
-
- $id=0;
+ <select name=Bundles[] multiple>';
+
+ $id=0;
$ItemsAvailable=0;
- while ($myrow=DB_fetch_array($Bundles,$db)){
+ while ($myrow=DB_fetch_array($Bundles,$db)){
if ($LineItem->Serialised==1){
if ( !array_key_exists($myrow['serialno'], $AllSerials) ){
- echo '<option value="' . $myrow['serialno'] . '">' . $myrow['serialno'].'</option>';
+ echo '<option value="' . $myrow['serialno'] . '">' . $myrow['serialno'].'</option>';
$ItemsAvailable++;
}
- } else {
- if ( !array_key_exists($myrow['serialno'], $AllSerials) ||
+ } else {
+ if ( !array_key_exists($myrow['serialno'], $AllSerials) OR
($myrow['quantity'] - $AllSerials[$myrow['serialno']] >= 0) ) {
+
$RecvQty = $myrow['quantity'] - $AllSerials[$myrow['serialno']];
- echo '<OPTION VALUE="' . $myrow['serialno'] . '/|/'. $RecvQty .'">' .
- $myrow['serialno'].' - ' . _('Qty left'). ': ' . $RecvQty . '</OPTION>';
+ echo '<option value="' . $myrow['serialno'] . '/|/'. $RecvQty .'">' . $myrow['serialno'].' - ' . _('Qty left'). ': ' . $RecvQty . '</option>';
$ItemsAvailable += $RecvQty;
- }
+ }
}
- }
- echo '</select><br>';
- echo '<br><div class=centre><input type=submit name="AddBatches" value="'. _('Enter'). '"></div><br />';
+ }
+ echo '</select>
+ <br />';
+ echo '<br /><div class="centre"><input type="submit" name="AddBatches" value="'. _('Enter'). '"></div>
+ <br />';
echo '</form>';
echo $ItemsAvailable . ' ' . _('items available');
echo '</td>';
- } else {
+ } else {
echo '<td>'. prnMsg( _('There does not appear to be any of') . ' ' . $StockID . ' ' . _('left in'). ' '. $LocationOut , 'warn') . '</td>';
}
-
- echo '</tr></table>';
+ echo '</tr></table>';
}
\ No newline at end of file
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/InputSerialItemsKeyed.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -21,7 +21,9 @@
/*Display the batches already entered with quantities if not serialised */
-echo '<table class=selection><tr><td valign=top><table class=selection>';
+echo '<table class="selection">
+ <tr><td valign=top>
+ <table class="selection">';
echo $tableheader;
$TotalQuantity = 0; /*Variable to accumulate total quantity received */
@@ -80,10 +82,10 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" name="Ga6uF5Wa" method="post">
- <input type=hidden name=LineNo value="' . $LineNo . '">
- <input type=hidden name=StockID value="' . $StockID . '">
+ <input type=hidden name="LineNo" value="' . $LineNo . '">
+ <input type=hidden name="StockID" value="' . $StockID . '">
<input type=hidden name="identifier" value="' . $identifier . '">
- <input type=hidden name=EntryType value="KEYED">';
+ <input type=hidden name="EntryType" value="KEYED">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-05 23:46:09
|
Revision: 4588
http://web-erp.svn.sourceforge.net/web-erp/?rev=4588&view=rev
Author: daintree
Date: 2011-06-05 23:46:02 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
stock adjustment controlled items and completion of POrder items
Modified Paths:
--------------
trunk/BankMatching.php
trunk/GoodsReceived.php
trunk/PO_Items.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/doc/Change.log
trunk/includes/Add_SerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/BankMatching.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -243,7 +243,7 @@
$Outstanding = $myrow['amt']- $myrow['amountcleared'];
if (ABS($Outstanding)<0.009){ /*the payment is cleared dont show the check box*/
- pprintf('<tr bgcolor="#CCCEEE">
+ printf('<tr bgcolor="#CCCEEE">
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/GoodsReceived.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -140,16 +140,16 @@
//Now Display LineItem
- echo '<td>' . $LnItm->StockID . '</td>';
- echo '<td>' . $LnItm->ItemDescription . '</td>';
- echo '<td class=number>' . $DisplaySupplierQtyOrd . '</td>';
- echo '<td>' . $LnItm->SuppliersUnit . '</td>';
- echo '<td class=number>' . $DisplaySupplierQtyRec . '</td>';
- echo '<td class=number>' . $LnItm->ConversionFactor . '</td>';
- echo '<td class=number>' . $DisplayQtyOrd . '</td>';
- echo '<td>' . $LnItm->Units . '</td>';
- echo '<td class=number>' . $DisplayQtyRec . '</td>';
- echo '<td class=number>';
+ echo '<td>' . $LnItm->StockID . '</td>
+ <td>' . $LnItm->ItemDescription . '</td>
+ <td class=number>' . $DisplaySupplierQtyOrd . '</td>
+ <td>' . $LnItm->SuppliersUnit . '</td>
+ <td class=number>' . $DisplaySupplierQtyRec . '</td>
+ <td class=number>' . $LnItm->ConversionFactor . '</td>
+ <td class=number>' . $DisplayQtyOrd . '</td>
+ <td>' . $LnItm->Units . '</td>
+ <td class=number>' . $DisplayQtyRec . '</td>
+ <td class=number>';
if ($LnItm->Controlled == 1) {
@@ -346,8 +346,8 @@
if ($OrderLine->StockID!='') { //Its a stock item line
/*Need to get the current standard cost as it is now so we can process GL jorunals later*/
$SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
- FROM stockmaster
- WHERE stockid='" . $OrderLine->StockID . "'";
+ FROM stockmaster
+ WHERE stockid='" . $OrderLine->StockID . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The standard cost of the item being received cannot be retrieved because');
$DbgMsg = _('The following SQL to retrieve the standard cost was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
@@ -377,11 +377,10 @@
/*Now the SQL to do the update to the PurchOrderDetails */
if ($OrderLine->ReceiveQty >= ($OrderLine->Quantity - $OrderLine->QtyReceived)){
- $SQL = "UPDATE purchorderdetails SET
- quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
- stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- completed=1
- WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
+ $SQL = "UPDATE purchorderdetails SET quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
+ stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ completed=1
+ WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
} else {
$SQL = "UPDATE purchorderdetails SET
quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/PO_Items.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -42,7 +42,7 @@
if (!is_numeric(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))){
prnMsg(_('The quantity in the supplier units is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity=doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))*doubleval(str_replace($locale_info['thousands_sep'],'',$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor));
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity=round(doubleval(str_replace($locale_info['thousands_sep'],'',$_POST['SuppQty'.$POLine->LineNo]))*doubleval(str_replace($locale_info['thousands_sep'],'',$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor)),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces);
}
if (!is_numeric(str_replace($locale_info['thousands_sep'],'',$_POST['SuppPrice'.$POLine->LineNo]))){
prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/StockAdjustments.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -24,7 +24,12 @@
if (isset($_GET['StockID'])){
$StockID = trim(strtoupper($_GET['StockID']));
$_SESSION['Adjustment']->StockID = trim(strtoupper($StockID));
- $result = DB_query("SELECT description, controlled, serialised, decimalplaces FROM stockmaster WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
+ $result = DB_query("SELECT description,
+ controlled,
+ serialised,
+ decimalplaces
+ FROM stockmaster
+ WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
$myrow = DB_fetch_array($result);
$_SESSION['Adjustment']->ItemDescription = $myrow['description'];
$_SESSION['Adjustment']->Controlled = $myrow['controlled'];
@@ -59,18 +64,24 @@
'" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
if (strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid, description from stockmaster where description like '%" . $_POST['StockText'] ."%'";
+ $sql="SELECT stockid, description FROM stockmaster WHERE description " . LIKE . " '%" . $_POST['StockText'] ."%'";
} else {
- $sql="SELECT stockid, description from stockmaster where stockid like '%" . $_POST['StockCode'] ."%'";
+ $sql="SELECT stockid, description FROM stockmaster WHERE stockid " . LIKE . " '%" . $_POST['StockCode'] ."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
$DbgMsg=_('The SQL to get the stock description was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<table class=selection><tr><th>'._('Stock Code').'</th><th>'._('Stock Description').'</th></tr>';
+ echo '<table class="selection">
+ <tr>
+ <th>'._('Stock Code').'</th>
+ <th>'._('Stock Description').'</th>
+ </tr>';
while ($myrow = DB_fetch_row($result)) {
- echo '<tr><td>'.$myrow[0].'</td>
+ echo '<tr>
+ <td>'.$myrow[0].'</td>
<td>'.$myrow[1].'</td>
- <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a></tr>';
+ <td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
+ </tr>';
}
echo '</table>';
include('includes/footer.inc');
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/StockAdjustmentsControlled.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -1,5 +1,7 @@
<?php
/* $Id$*/
+
+
include('includes/DefineSerialItems.php');
include('includes/DefineStockAdjustment.php');
include('includes/session.inc');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/doc/Change.log 2011-06-05 23:46:02 UTC (rev 4588)
@@ -1,5 +1,8 @@
webERP Change Log
+6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed
+5/6/11 Phil: BankMatching typo pprintf fixed
+
3/6/11 Version 4.04.3 Release
2/6/11 Phil: ConfirmDispatchControlled_Invoice.php type include/InputSerialItems.php
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/Add_SerialItems.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -6,29 +6,29 @@
/********************************************
Added KEYED Entry values
********************************************/
-if ( isset($_POST['AddBatches']) && $_POST['AddBatches']!='') {
-
+if ( (isset($_POST['AddBatches']) AND $_POST['AddBatches']!='')) {
+
for ($i=0;$i < 10;$i++){
- if(isset($_POST['SerialNo' . $i]) and strlen($_POST['SerialNo' . $i])>0){
+ if(isset($_POST['SerialNo' . $i]) AND strlen($_POST['SerialNo' . $i])>0){
if ($ItemMustExist){
$ExistingBundleQty = ValidBundleRef($StockID, $LocationOut, $_POST['SerialNo' . $i]);
- if ($ExistingBundleQty >0 or ($ExistingBundleQty==1 and $IsCredit=true)){
+ if ($ExistingBundleQty >0 OR ($ExistingBundleQty==1 and $IsCredit=true)){
$AddThisBundle = true;
/*If the user enters a duplicate serial number the later one over-writes
the first entered one - no warning given though ? */
if ($_POST['Qty' . $i] > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>';
+ echo '<br />';
prnMsg ( $_POST['SerialNo' . $i] . ' ' .
_('has already been sold'),'warning' );
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>';
+ echo '<br />';
prnMsg ( _('There is none of') . ' '. $_POST['SerialNo' . $i] .
' '. _('remaining').'.', 'warn');
$AddThisBundle = false;
} else {
- echo '<BR>';
+ echo '<br />';
prnMsg ( _('There is only'). ' ' . $ExistingBundleQty .
' '._('of') . ' ' . $_POST['SerialNo' . $i] . ' '. _('remaining') . '. ' .
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll'),
@@ -42,7 +42,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='.$_POST['SerialNo'. $i] . '" target=_blank>'.$_POST['SerialNo'. $i]. '</a> ' ._('not available') . '...' , '', 'Notice' );
unset($_POST['SerialNo' . $i]);
}
@@ -57,10 +57,10 @@
if ($LineItem->Serialised){
$ExistingQty = ValidBundleRef($StockID, $LocationOut, $NewSerialNo);
if ($NewQty == 1 && $ExistingQty != 0){
- prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _("The Serial Number being added exists with a Quantity that is not Zero (0)!"), 'error' );
+ prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _('The Serial Number being added exists with a Quantity that is not Zero (0)!'), 'error' );
$SerialError = true;
} elseif ($NewQty == -1 && $ExistingQty != 1){
- prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _("The Serial Number being removed exists with a Quantity that is not One (1)!"), 'error');
+ prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> : '. _('The Serial Number being removed exists with a Quantity that is not One (1)!'), 'error');
$SerialError = true;
}
}
@@ -75,16 +75,14 @@
if (!isset($_POST['Bundles'])) {
$_POST['Bundles']=0;
}
- echo count($_POST['Bundles']);
- for ($i=0;$i < count($_POST['Bundles'])-1;$i++){ /*there is an entry in the multi select list box */
+ //echo count($_POST['Bundles']);
+ for ($i=0;$i < count($_POST['Bundles']);$i++){ /*there is an entry in the multi select list box */
if ($LineItem->Serialised==1){ /*only if the item is serialised */
- $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], ($InOutModifier>0?1:-1) );
+ $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], ($InOutModifier>0 ? 1:-1) );
} else {
list($SerialNo, $Qty) = explode ('/|/', $_POST['Bundles'][$i]);
if ($Qty != 0) {
-
- $LineItem->SerialItems[$SerialNo] =
- new SerialItem ($SerialNo, $Qty*($InOutModifier>0?1:-1) );
+ $LineItem->SerialItems[$SerialNo] = new SerialItem ($SerialNo, $Qty*($InOutModifier>0?1:-1) );
}
}
}
@@ -171,13 +169,13 @@
/*If the user enters a duplicate serial number the later one over-writes the first entered one - no warning given though ? */
if ($NewQty > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
+ echo '<br />' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>' . _('There is none of'). ' <a href="/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
+ echo '<br />' . _('There is none of'). ' <a href="/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
$AddThisBundle = false;
} else {
- echo '<BR>'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
+ echo '<br />'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
'<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('remaining') . '. '.
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
$NewQty = $ExistingBundleQty;
@@ -189,7 +187,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('not available') ,'', 'Notice' );
}
if (!$valid) $invalid_imports++;
@@ -268,13 +266,13 @@
/*If the user enters a duplicate serial number the later one over-writes the first entered one - no warning given though ? */
if ($NewQty > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo '<BR>' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
+ echo '<br />' . '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('has already been sold'). '.';
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo '<BR>' . _('There is none of'). ' <a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
+ echo '<br />' . _('There is none of'). ' <a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> '. _('remaining') .'.';
$AddThisBundle = false;
} else {
- echo '<BR>'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
+ echo '<br />'. _('There is only') . ' ' . $ExistingBundleQty . ' '. _('of') . ' ' .
'<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('remaining') . '. '.
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
$NewQty = $ExistingBundleQty;
@@ -286,7 +284,7 @@
}
} /*end if ExistingBundleQty >0 */
else {
- echo '<BR>';
+ echo '<br />';
prnMsg( '<a href="'.$rootpath.'/StockSerialItemResearch.php?serialno='. $NewSerialNo . '" target=_blank>'.$NewSerialNo. '</a> ' . _('not available') . '...' ,'', 'Notice' );
}
if (!$valid) $invalid_imports++;
Modified: trunk/includes/InputSerialItemsExisting.php
===================================================================
--- trunk/includes/InputSerialItemsExisting.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/InputSerialItemsExisting.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -9,59 +9,60 @@
**/
if ($_POST['EntryType'] == 'KEYED'){
/*Also a multi select box for adding bundles to the dispatch without keying */
- $sql = "SELECT serialno, quantity
+ $sql = "SELECT serialno, quantity
FROM stockserialitems
- WHERE stockid='" . $StockID . "' AND loccode ='" .
- $LocationOut."' AND quantity > 0";
- //echo $sql;
+ WHERE stockid='" . $StockID . "'
+ AND loccode ='" . $LocationOut."'
+ AND quantity > 0";
$ErrMsg = '<br />'. _('Could not retrieve the items for'). ' ' . $StockID;
- $Bundles = DB_query($sql,$db, $ErrMsg );
- echo '<table class=selection><tr>';
- if (DB_num_rows($Bundles)>0){
- $AllSerials=array();
+ $Bundles = DB_query($sql,$db, $ErrMsg );
+ echo '<table class="selection"><tr>';
+ if (DB_num_rows($Bundles)>0){
+ $AllSerials=array();
foreach ($LineItem->SerialItems as $Itm){
$AllSerials[$Itm->BundleRef] = $Itm->BundleQty;
}
-
+
echo '<td valign="top"><b>'. _('Select Existing Items'). '</b><br />';
-
- 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 '<input type=hidden name="LineNo" value="' . $LineNo . '">
- <input type="hidden" name="StockID" value="' . $StockID . '">
- <input type="hidden" name="EntryType" value="KEYED">
- <input type=hidden name="identifier" value="' . $identifier . '">
+ echo '<input type=hidden name="LineNo" value="' . $LineNo . '">
+ <input type="hidden" name="StockID" value="' . $StockID . '">
+ <input type="hidden" name="EntryType" value="KEYED">
+ <input type=hidden name="identifier" value="' . $identifier . '">
<input type="hidden" name="EditControlled" value="true">
- <select Name=Bundles[] multiple>';
-
- $id=0;
+ <select name=Bundles[] multiple>';
+
+ $id=0;
$ItemsAvailable=0;
- while ($myrow=DB_fetch_array($Bundles,$db)){
+ while ($myrow=DB_fetch_array($Bundles,$db)){
if ($LineItem->Serialised==1){
if ( !array_key_exists($myrow['serialno'], $AllSerials) ){
- echo '<option value="' . $myrow['serialno'] . '">' . $myrow['serialno'].'</option>';
+ echo '<option value="' . $myrow['serialno'] . '">' . $myrow['serialno'].'</option>';
$ItemsAvailable++;
}
- } else {
- if ( !array_key_exists($myrow['serialno'], $AllSerials) ||
+ } else {
+ if ( !array_key_exists($myrow['serialno'], $AllSerials) OR
($myrow['quantity'] - $AllSerials[$myrow['serialno']] >= 0) ) {
+
$RecvQty = $myrow['quantity'] - $AllSerials[$myrow['serialno']];
- echo '<OPTION VALUE="' . $myrow['serialno'] . '/|/'. $RecvQty .'">' .
- $myrow['serialno'].' - ' . _('Qty left'). ': ' . $RecvQty . '</OPTION>';
+ echo '<option value="' . $myrow['serialno'] . '/|/'. $RecvQty .'">' . $myrow['serialno'].' - ' . _('Qty left'). ': ' . $RecvQty . '</option>';
$ItemsAvailable += $RecvQty;
- }
+ }
}
- }
- echo '</select><br>';
- echo '<br><div class=centre><input type=submit name="AddBatches" value="'. _('Enter'). '"></div><br />';
+ }
+ echo '</select>
+ <br />';
+ echo '<br /><div class="centre"><input type="submit" name="AddBatches" value="'. _('Enter'). '"></div>
+ <br />';
echo '</form>';
echo $ItemsAvailable . ' ' . _('items available');
echo '</td>';
- } else {
+ } else {
echo '<td>'. prnMsg( _('There does not appear to be any of') . ' ' . $StockID . ' ' . _('left in'). ' '. $LocationOut , 'warn') . '</td>';
}
-
- echo '</tr></table>';
+ echo '</tr></table>';
}
\ No newline at end of file
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2011-06-03 09:53:57 UTC (rev 4587)
+++ trunk/includes/InputSerialItemsKeyed.php 2011-06-05 23:46:02 UTC (rev 4588)
@@ -21,7 +21,9 @@
/*Display the batches already entered with quantities if not serialised */
-echo '<table class=selection><tr><td valign=top><table class=selection>';
+echo '<table class="selection">
+ <tr><td valign=top>
+ <table class="selection">';
echo $tableheader;
$TotalQuantity = 0; /*Variable to accumulate total quantity received */
@@ -80,10 +82,10 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" name="Ga6uF5Wa" method="post">
- <input type=hidden name=LineNo value="' . $LineNo . '">
- <input type=hidden name=StockID value="' . $StockID . '">
+ <input type=hidden name="LineNo" value="' . $LineNo . '">
+ <input type=hidden name="StockID" value="' . $StockID . '">
<input type=hidden name="identifier" value="' . $identifier . '">
- <input type=hidden name=EntryType value="KEYED">';
+ <input type=hidden name="EntryType" value="KEYED">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-06-03 09:54:05
|
Revision: 4587
http://web-erp.svn.sourceforge.net/web-erp/?rev=4587&view=rev
Author: daintree
Date: 2011-06-03 09:53:57 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
bug fixes
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-02 10:12:41 UTC (rev 4586)
+++ trunk/doc/Change.log 2011-06-03 09:53:57 UTC (rev 4587)
@@ -1,5 +1,7 @@
webERP Change Log
+3/6/11 Version 4.04.3 Release
+
2/6/11 Phil: ConfirmDispatchControlled_Invoice.php type include/InputSerialItems.php
2/6/11 Phil: modified build script to include audittrail table in weberp-new.sql and weberpdemo.sql - excluded by mistake
2/6/11 Phil: UpgradeDatabase.php manual upgrades from 3.11.x 4.01 and 4.02 now fixed! Brian May's report
@@ -64,6 +66,7 @@
18/4/11 Phil: Update zh_HK.utf8, pt_BR.utf8, fa_IR.utf8 from launchpad translations
18/4/11 Phil: Changed PurchData.php back to now have free form text entry of unit of measure - as suggested by Brian May - think it works better this way
18/4/11 Phil: Removed redundant fields that are not used anywhere from DefinePOClass and the various function to add lines to purchase orders and to update purhcase order lines - netweight, cuft, kgs, itemno, total_quantity etc. all this data can be retrieved without duplication in purchorderdetails
+17/4/11 Phil: Reworked PrintCustTrans.php landscape invoice removing reliance on xml. No longer have the ability to use the form designer to manipulate the position of fields on the invoice. The form designer invoice could not print multiple page invoices
16/4/11 Phil: Tim's changes in launchpad fork to 4663 - xhtml syntax fixes
15/4/11 Phil: Copy Exson's traditional Chinese back to zh_HK.utf8
11/4/11 Ricard: new pcAuthorizeExpenses.php that shows the current balance of the tab to the authorizer. Before the authorizer did not see this information.
@@ -88,46 +91,46 @@
<p />
27/3/11 - Version 4.03.5 Release
-27/3/11: Phil fixed SQL upgrade script to add the Z_ChangeSupplierCode.php script is added to the scripts table
-27/3/11: Phil fixed some SQL for ansi compatibility I had changed in error - would affect users running strict mode ansi
-27/3/11: Phil at Brian May's suggestion added conversion factor to item look up in PO_Items.php - also ensured quantity entry no longer trapped for commas and commas removed from numbers before committing. Also trapped for committing purchase orders with no lines
+27/3/11: Phil: fixed SQL upgrade script to add the Z_ChangeSupplierCode.php script is added to the scripts table
+27/3/11: Phil: fixed some SQL for ansi compatibility I had changed in error - would affect users running strict mode ansi
+27/3/11: Phil: at Brian May's suggestion added conversion factor to item look up in PO_Items.php - also ensured quantity entry no longer trapped for commas and commas removed from numbers before committing. Also trapped for committing purchase orders with no lines
26/3/11 - Version 4.03 Release
-26/3/11: Phil added some error trapping to codes of pcTabTypes
-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
-24/3/11: James wer...@ya... Added snall image in middle of SelectProduct.php
-19/3/11: Phil added country to packing slips
-18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php
-18/3/11: Ricard add orderby transdate to DailyBankTransactions.php
-18/3/11: Phil check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters
-15/3/11: Phil PricesByCost.php - made it update prices where there is already a price starting on today's date
-15/3/11: Phil SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.
-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
-14/3/11: Phil SelectSalesOrder.php now lists with sales order value denominated in functional currency with total of listed outstadning sales orders (or quotations) shown at the bottom of the listing
-12/3/11: Tim Now allow space in codes
+26/3/11: Phil: added some error trapping to codes of pcTabTypes
+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
+24/3/11: James wer...@ya... Added small image in middle of SelectProduct.php
+19/3/11: Phil: added country to packing slips
+18/3/11: Marcos Garcia Trejo: Added Z_ChangeSupplierCode.php
+18/3/11: Ricard: add orderby transdate to DailyBankTransactions.php
+18/3/11: Phil: check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters
+15/3/11: Phil: PricesByCost.php - made it update prices where there is already a price starting on today's date
+15/3/11: Phil: SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.
+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
+14/3/11: Phil: SelectSalesOrder.php now lists with sales order value denominated in functional currency with total of listed outstadning sales orders (or quotations) shown at the bottom of the listing
+12/3/11: Tim: Now allow space in codes
12/3/11: SelectSalesOrder.php now allows any number of sales orders to be selected and purchase orders placed for the aggregate of items on the selected sales orders
12/3/11: SuppPriceList.php removed a round trip to DB to get currency - fixed function to get pdf to new TCPDF Output
-12/3/11: Exson fix all htmlentities to use ENTQUOTES, 'UTF-8' option so other character sets work with it
-10/3/11: Phil fix pagination of PrintCustOrder_generic.php - second copy was not restarting page numbers
-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
-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
-8/3/11: Phil fix SalesAnalysis reports for TCPDF as reported by Joe Zhou
-5/3/11: Kovács Attila fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL
-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
+12/3/11: Exson: fix all htmlentities to use ENTQUOTES, 'UTF-8' option so other character sets work with it
+10/3/11: Phil: fix pagination of PrintCustOrder_generic.php - second copy was not restarting page numbers
+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
+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
+8/3/11: Phil: fix SalesAnalysis reports for TCPDF as reported by Joe Zhou
+5/3/11: Kovács Attila: fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL
+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
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
3/3/11: Tim launchpad mods to revision 4441 including change to allow supplier currency to be changed if there are no transactions already against the supplier. Ensure credit note session variable is unset before attempting to create a new credit note from the supplier form. Tim's work to add perisable expiry dates to the serial items logic - affects quite a few scripts. Headings to stock check script even if no quantity is shown. Portrait quotations. Not included change to default delivery date to the date the customer requested - left to be the current day's date. Not included Tim's unit pricing work .. yet launchpad revisions 4442-4447 inclusive
27/2/11: Phil/Tim/Peter launchpad added category option for MRPShortages.php links with matching quotes in WorkOrderEntry
-27/2/11: Phil StockUsage.php now totals usage each month even in months where there was none - average now includes months with no usage
-27/2/11: Phil fix units deletion issue reported by Exson in UnitsOfMeasure.php script - checked for none existant units field in contracts table - removed the check
-22/2/11: Phil fix PDFTopItems.php for changed variable names - now using CamelCase tried to rework to conform
-22/2/11: Phil remove options for PDFLanguage that are not unique in WWW_Users.php - make it default to the users settings in the SESSION for UserSettings.php
+27/2/11: Phil: StockUsage.php now totals usage each month even in months where there was none - average now includes months with no usage
+27/2/11: Phil: fix units deletion issue reported by Exson in UnitsOfMeasure.php script - checked for none existant units field in contracts table - removed the check
+22/2/11: Phil: fix PDFTopItems.php for changed variable names - now using CamelCase tried to rework to conform
+22/2/11: Phil: remove options for PDFLanguage that are not unique in WWW_Users.php - make it default to the users settings in the SESSION for UserSettings.php
18/2/11: Phil/Don Change PageSecurity array variable name to PageSecurityArray - caused problems with conflict with PageSecurity variable where register_globals = on;
-18/2/11: PO_Items.php make number_format variables turn back into numbers for > 1000
-16/2/11: FixedAssetItems.php now checks for location before allowing additions
-16/2/11: Company preferences - changed wording of stock integration at cost removed the word standard as suggested by Exson
-16/2/11: SelectCreditItems.php formating/conventions lower case html and CreditInvoice.php
-15/2/11: Phil Make invoicing warn the user when no taxes are defined for a tax group - i.e. there is a configuration error with taxes
+18/2/11: Phil: PO_Items.php make number_format variables turn back into numbers for > 1000
+16/2/11: Phil: FixedAssetItems.php now checks for location before allowing additions
+16/2/11: Phil: Company preferences - changed wording of stock integration at cost removed the word standard as suggested by Exson
+16/2/11: Phil: SelectCreditItems.php formating/conventions lower case html and CreditInvoice.php
+15/2/11: Phil: Make invoicing warn the user when no taxes are defined for a tax group - i.e. there is a configuration error with taxes
<p />
15/2/11 Release 4.03RC2
<p />
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2011-06-02 10:12:41 UTC (rev 4586)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2011-06-03 09:53:57 UTC (rev 4587)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-02 21:38+1200\n"
+"POT-Creation-Date: 2011-06-03 21:59+1200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2011-06-02 10:12:41 UTC (rev 4586)
+++ trunk/sql/mysql/weberp-demo.sql 2011-06-03 09:53:57 UTC (rev 4587)
@@ -2797,7 +2797,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2011-06-02 21:38:27
+-- Dump completed on 2011-06-03 21:59:24
-- MySQL dump 10.13 Distrib 5.1.47-MariaDB, for pc-linux-gnu (i686)
--
-- Host: localhost Database: weberpdemo
@@ -10324,7 +10324,7 @@
INSERT INTO `config` VALUES ('FrequentlyOrderedItems','0');
INSERT INTO `config` VALUES ('geocode_integration','0');
INSERT INTO `config` VALUES ('HTTPS_Only','0');
-INSERT INTO `config` VALUES ('InvoicePortraitFormat','1');
+INSERT INTO `config` VALUES ('InvoicePortraitFormat','0');
INSERT INTO `config` VALUES ('LogPath','');
INSERT INTO `config` VALUES ('LogSeverity','0');
INSERT INTO `config` VALUES ('MaxImageSize','300');
@@ -13234,7 +13234,6 @@
INSERT INTO `stockcategory` VALUES ('BAKE','Baking Ingredients','F',1460,5700,5200,5000,1440);
INSERT INTO `stockcategory` VALUES ('DVD','DVDs','F',1460,5700,5000,5200,1440);
INSERT INTO `stockcategory` VALUES ('FOOD','Food','F',1460,5700,5200,5000,1440);
-INSERT INTO `stockcategory` VALUES ('PLANT','Plant and Equipment','A',1650,7750,80000,1,1670);
INSERT INTO `stockcategory` VALUES ('ZFR','Freight','D',1460,5600,5600,5600,1440);
--
@@ -13659,7 +13658,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','','MEL',8,'2011-05-31 21:35:16','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'gel','en_GB.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','','MEL',8,'2011-06-03 19:38:52','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'gel','en_GB.utf8',0);
INSERT INTO `www_users` VALUES ('test','7c4a8d09ca3762af61e59520943dc26494f8941b','test','','','','','','MEL',6,'2011-05-19 19:05:46','','A4','1,1,1,0,0,0,0,0,0,0,',0,50,'silverwolf','en_GB.utf8',0);
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -13668,5 +13667,5 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2011-06-02 21:38:27
+-- Dump completed on 2011-06-03 21:59:24
SET FOREIGN_KEY_CHECKS = 1;
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2011-06-02 10:12:41 UTC (rev 4586)
+++ trunk/sql/mysql/weberp-new.sql 2011-06-03 09:53:57 UTC (rev 4587)
@@ -2795,7 +2795,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2011-06-02 21:38:27
+-- Dump completed on 2011-06-03 21:59:24
-- MySQL dump 10.13 Distrib 5.1.47-MariaDB, for pc-linux-gnu (i686)
--
-- Host: localhost Database: weberpdemo
@@ -3134,7 +3134,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','','MEL',8,'2011-05-31 21:35:16','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'gel','en_GB.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','','MEL',8,'2011-06-03 19:38:52','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'gel','en_GB.utf8',0);
INSERT INTO `www_users` VALUES ('test','7c4a8d09ca3762af61e59520943dc26494f8941b','test','','','','','','MEL',6,'2011-05-19 19:05:46','','A4','1,1,1,0,0,0,0,0,0,0,',0,50,'silverwolf','en_GB.utf8',0);
--
@@ -3324,7 +3324,7 @@
INSERT INTO `config` VALUES ('FrequentlyOrderedItems','0');
INSERT INTO `config` VALUES ('geocode_integration','0');
INSERT INTO `config` VALUES ('HTTPS_Only','0');
-INSERT INTO `config` VALUES ('InvoicePortraitFormat','1');
+INSERT INTO `config` VALUES ('InvoicePortraitFormat','0');
INSERT INTO `config` VALUES ('LogPath','');
INSERT INTO `config` VALUES ('LogSeverity','0');
INSERT INTO `config` VALUES ('MaxImageSize','300');
@@ -3819,7 +3819,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2011-06-02 21:38:27
+-- Dump completed on 2011-06-03 21:59:24
SET FOREIGN_KEY_CHECKS = 1;
UPDATE systypes SET typeno=0;
INSERT INTO shippers VALUES (1,'Default Shipper',0);
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.
