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...> - 2015-02-06 07:07:25
|
Revision: 7129 http://sourceforge.net/p/web-erp/reponame/7129 Author: daintree Date: 2015-02-06 07:07:22 +0000 (Fri, 06 Feb 2015) Log Message: ----------- pre 4.12.2 Modified Paths: -------------- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/sql/mysql/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot =================================================================== --- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-02-06 07:01:03 UTC (rev 7128) +++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-02-06 07:07:22 UTC (rev 7129) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 19:17+1300\n" +"POT-Creation-Date: 2015-02-06 20:01+1300\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/country_sql/default.sql =================================================================== --- trunk/sql/mysql/country_sql/default.sql 2015-02-06 07:01:03 UTC (rev 7128) +++ trunk/sql/mysql/country_sql/default.sql 2015-02-06 07:07:22 UTC (rev 7129) @@ -3341,7 +3341,7 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2015-02-06 19:17:44 +-- Dump completed on 2015-02-06 20:01:47 -- MySQL dump 10.14 Distrib 5.5.40-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: weberpdemo @@ -6405,7 +6405,7 @@ -- Dumping data for table `www_users` -- -INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 19:03:06','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0); +INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 20:00:59','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0); -- -- Dumping data for table `edi_orders_segs` @@ -6679,7 +6679,7 @@ INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2'); INSERT INTO `config` VALUES ('TaxAuthorityReferenceName',''); INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2015-02-06'); -INSERT INTO `config` VALUES ('VersionNumber','4.12.1'); +INSERT INTO `config` VALUES ('VersionNumber','4.12.2'); INSERT INTO `config` VALUES ('WeightedAverageCosting','0'); INSERT INTO `config` VALUES ('WikiApp','0'); INSERT INTO `config` VALUES ('WikiPath','wiki'); @@ -7219,7 +7219,7 @@ /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2015-02-06 19:17:44 +-- Dump completed on 2015-02-06 20:01:47 SET FOREIGN_KEY_CHECKS = 1; UPDATE systypes SET typeno=0; INSERT INTO shippers VALUES (1,'Default Shipper',0); Modified: trunk/sql/mysql/country_sql/demo.sql =================================================================== --- trunk/sql/mysql/country_sql/demo.sql 2015-02-06 07:01:03 UTC (rev 7128) +++ trunk/sql/mysql/country_sql/demo.sql 2015-02-06 07:07:22 UTC (rev 7129) @@ -3343,7 +3343,7 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2015-02-06 19:17:44 +-- Dump completed on 2015-02-06 20:01:47 -- MySQL dump 10.14 Distrib 5.5.40-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: weberpdemo @@ -7163,7 +7163,7 @@ INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2'); INSERT INTO `config` VALUES ('TaxAuthorityReferenceName',''); INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2015-02-06'); -INSERT INTO `config` VALUES ('VersionNumber','4.12.1'); +INSERT INTO `config` VALUES ('VersionNumber','4.12.2'); INSERT INTO `config` VALUES ('WeightedAverageCosting','0'); INSERT INTO `config` VALUES ('WikiApp','0'); INSERT INTO `config` VALUES ('WikiPath','wiki'); @@ -11999,12 +11999,12 @@ -- Dumping data for table `www_users` -- -INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 19:03:06','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0); +INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 20:00:59','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0); /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2015-02-06 19:17:44 +-- Dump completed on 2015-02-06 20:01:47 SET FOREIGN_KEY_CHECKS = 1; |
From: <dai...@us...> - 2015-02-06 07:01:17
|
Revision: 7128 http://sourceforge.net/p/web-erp/reponame/7128 Author: daintree Date: 2015-02-06 07:01:03 +0000 (Fri, 06 Feb 2015) Log Message: ----------- Pre 4.12.2 Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/doc/Change.log trunk/includes/ConnectDB.inc trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.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/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql Added Paths: ----------- trunk/sql/mysql/upgrade4.12.1-4.12.2.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2015-02-06 04:24:13 UTC (rev 7127) +++ trunk/UpgradeDatabase.php 2015-02-06 07:01:03 UTC (rev 7128) @@ -188,6 +188,8 @@ $SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql'; case '4.12': $SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql'; + case '4.12.1': + $SQLScripts[] = './sql/mysql/upgrade4.12.1-4.12.2.sql'; break; } //end switch } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-06 04:24:13 UTC (rev 7127) +++ trunk/doc/Change.log 2015-02-06 07:01:03 UTC (rev 7128) @@ -1,5 +1,9 @@ webERP Change Log +6/2/15 Version 4.12.2 + +6/2/15 Vitaly:Added SQL to add the script LocationUsers.php and the necessary table locationusers + 6/2/15 Version 4.12.1 5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php @@ -11,7 +15,6 @@ 30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8 27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir". - 27/01/15 Version 4.12 release 25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual. Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2015-02-06 04:24:13 UTC (rev 7127) +++ trunk/includes/ConnectDB.inc 2015-02-06 07:01:03 UTC (rev 7128) @@ -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.12.1'; //must update manually every time there is a DB change +$Version='4.12.2'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); if (!isset($_SESSION['DatabaseName'])){ Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-06 04:24:13 UTC (rev 7127) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-06 07:01:03 UTC (rev 7128) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 4.11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 12:41+1300\n" +"POT-Creation-Date: 2015-02-06 19:17+1300\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -711,11 +711,12 @@ msgstr "" #: AddCustomerContacts.php:129 AddCustomerContacts.php:241 -#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:432 -#: CustomerInquiry.php:474 Customers.php:1121 Customers.php:1129 -#: EmailCustTrans.php:15 EmailCustTrans.php:64 Factors.php:246 Factors.php:297 -#: Locations.php:616 OrderDetails.php:115 PDFRemittanceAdvice.php:251 -#: PDFWOPrint.php:591 PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677 +#: CustomerAccount.php:429 CustomerAccount.php:471 CustomerBranches.php:414 +#: CustomerBranches.php:849 CustomerInquiry.php:432 CustomerInquiry.php:474 +#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:15 +#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:616 +#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:591 +#: PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677 #: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:748 #: PrintCustTrans.php:979 PrintCustTrans.php:1028 #: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039 @@ -804,7 +805,7 @@ #: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211 #: AgedControlledInventory.php:47 BankMatching.php:281 #: BankReconciliation.php:217 BankReconciliation.php:294 -#: ContractCosting.php:177 CustomerAllocations.php:348 +#: ContractCosting.php:177 CustomerAccount.php:248 CustomerAllocations.php:348 #: CustomerAllocations.php:378 CustomerInquiry.php:251 #: CustomerTransInquiry.php:100 GLAccountInquiry.php:173 #: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 @@ -828,10 +829,10 @@ #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180 #: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926 -#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243 -#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252 -#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261 -#: UpgradeDatabase.php:264 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1260 UpgradeDatabase.php:242 UpgradeDatabase.php:245 +#: UpgradeDatabase.php:248 UpgradeDatabase.php:251 UpgradeDatabase.php:254 +#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263 +#: UpgradeDatabase.php:266 Z_Upgrade_3.10-3.11.php:62 #: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70 #: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78 #: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66 @@ -1020,16 +1021,16 @@ #: ConfirmDispatch_Invoice.php:309 CounterReturns.php:676 #: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853 #: CounterSales.php:855 Credit_Invoice.php:299 Credit_Invoice.php:303 -#: CustomerAllocations.php:349 CustomerAllocations.php:379 -#: CustomerInquiry.php:256 DeliveryDetails.php:881 DeliveryDetails.php:950 -#: GLBalanceSheet.php:191 GLBalanceSheet.php:203 GLBalanceSheet.php:293 -#: GLBalanceSheet.php:302 GLBudgets.php:213 GLJournal.php:435 -#: GLTransInquiry.php:195 GLTrialBalance.php:225 GLTrialBalance.php:245 -#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:492 -#: GLTrialBalance.php:512 GLTrialBalance.php:536 GLTrialBalance.php:648 -#: GLTrialBalance.php:668 GLTrialBalance.php:692 InventoryValuation.php:197 -#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177 -#: OutstandingGRNs.php:243 PDFCustTransListing.php:137 +#: CustomerAccount.php:253 CustomerAllocations.php:349 +#: CustomerAllocations.php:379 CustomerInquiry.php:256 DeliveryDetails.php:881 +#: DeliveryDetails.php:950 GLBalanceSheet.php:191 GLBalanceSheet.php:203 +#: GLBalanceSheet.php:293 GLBalanceSheet.php:302 GLBudgets.php:213 +#: GLJournal.php:435 GLTransInquiry.php:195 GLTrialBalance.php:225 +#: GLTrialBalance.php:245 GLTrialBalance.php:266 GLTrialBalance.php:362 +#: GLTrialBalance.php:492 GLTrialBalance.php:512 GLTrialBalance.php:536 +#: GLTrialBalance.php:648 GLTrialBalance.php:668 GLTrialBalance.php:692 +#: InventoryValuation.php:197 MaterialsNotUsed.php:77 OffersReceived.php:111 +#: OrderDetails.php:177 OutstandingGRNs.php:243 PDFCustTransListing.php:137 #: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310 #: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335 #: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430 @@ -1092,8 +1093,9 @@ msgid "Problem Report" msgstr "" -#: AgedDebtors.php:269 CustomerInquiry.php:116 CustomerInquiry.php:141 -#: CustomerPurchases.php:29 Dashboard.php:145 DebtorsAtPeriodEnd.php:59 +#: AgedDebtors.php:269 CustomerAccount.php:138 CustomerInquiry.php:116 +#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145 +#: DebtorsAtPeriodEnd.php:59 msgid "The customer details could not be retrieved by the SQL because" msgstr "" @@ -1472,7 +1474,8 @@ #: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306 #: CounterReturns.php:1637 CounterReturns.php:1640 CounterSales.php:2201 -#: CounterSales.php:2204 CustomerBalancesMovement.php:32 +#: CounterSales.php:2204 CustomerAccount.php:190 CustomerAccount.php:195 +#: CustomerAccount.php:199 CustomerBalancesMovement.php:32 #: CustomerBalancesMovement.php:42 CustomerBalancesMovement.php:52 #: CustomerInquiry.php:193 CustomerInquiry.php:198 CustomerInquiry.php:202 #: CustomerTransInquiry.php:32 DailyBankTransactions.php:72 @@ -1530,7 +1533,7 @@ msgstr "" #: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295 -#: CustomerAllocations.php:376 CustomerInquiry.php:249 +#: CustomerAccount.php:246 CustomerAllocations.php:376 CustomerInquiry.php:249 #: CustomerPurchases.php:82 CustomerTransInquiry.php:21 #: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111 #: DailyBankTransactions.php:129 GLAccountInquiry.php:171 @@ -2306,8 +2309,9 @@ msgstr "" #: BankReconciliation.php:219 BankReconciliation.php:296 -#: CustomerAllocations.php:347 CustomerAllocations.php:377 -#: CustomerInquiry.php:250 CustomerTransInquiry.php:99 CustWhereAlloc.php:112 +#: CustomerAccount.php:247 CustomerAllocations.php:347 +#: CustomerAllocations.php:377 CustomerInquiry.php:250 +#: CustomerTransInquiry.php:99 CustWhereAlloc.php:112 #: DailyBankTransactions.php:128 EmailCustTrans.php:15 #: GLAccountInquiry.php:172 ImportBankTrans.php:490 PrintCustTrans.php:509 #: PrintCustTrans.php:733 PrintCustTrans.php:966 PrintCustTrans.php:1015 @@ -2326,8 +2330,9 @@ msgstr "" #: BankReconciliation.php:220 BankReconciliation.php:297 -#: ContractCosting.php:176 CustomerInquiry.php:253 CustomerPurchases.php:89 -#: CustomerReceipt.php:930 CustomerTransInquiry.php:103 CustWhereAlloc.php:113 +#: ContractCosting.php:176 CustomerAccount.php:250 CustomerInquiry.php:253 +#: CustomerPurchases.php:89 CustomerReceipt.php:930 +#: CustomerTransInquiry.php:103 CustWhereAlloc.php:113 #: DailyBankTransactions.php:130 Dashboard.php:54 GLAccountReport.php:342 #: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:920 #: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:144 @@ -3812,7 +3817,7 @@ msgstr "" #: ConfirmDispatch_Invoice.php:279 Contracts.php:778 CustItem.php:144 -#: CustLoginSetup.php:32 CustomerAllocations.php:345 +#: CustLoginSetup.php:32 CustomerAccount.php:159 CustomerAllocations.php:345 #: CustomerBalancesMovement.php:30 CustomerBalancesMovement.php:117 #: CustomerBalancesMovement.php:124 CustomerBranches.php:403 #: CustomerBranches.php:586 CustomerBranches.php:633 CustomerInquiry.php:162 @@ -4552,10 +4557,11 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1050 CounterSales.php:1474 -#: CustomerInquiry.php:255 CustomerTransInquiry.php:105 -#: DeliveryDetails.php:621 DeliveryDetails.php:627 DeliveryDetails.php:634 -#: DeliveryDetails.php:811 DeliveryDetails.php:817 DeliveryDetails.php:840 -#: MRPReport.php:412 PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292 +#: CustomerAccount.php:252 CustomerInquiry.php:255 +#: CustomerTransInquiry.php:105 DeliveryDetails.php:621 +#: DeliveryDetails.php:627 DeliveryDetails.php:634 DeliveryDetails.php:811 +#: DeliveryDetails.php:817 DeliveryDetails.php:840 MRPReport.php:412 +#: PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292 #: PDFSalesBySalesperson.php:82 PDFWeeklyOrders.php:78 #: SelectCompletedOrder.php:555 SelectContract.php:143 #: SelectOrderItems.php:686 SelectProduct.php:367 Shipments.php:399 @@ -5775,12 +5781,13 @@ msgid "Reset" msgstr "" -#: Contracts.php:779 CustomerInquiry.php:252 CustomerTransInquiry.php:102 -#: Dashboard.php:658 FTP_RadioBeacon.php:52 PDFOrdersInvoiced.php:293 -#: PDFOrderStatus.php:294 PDFPriceList.php:427 PricesByCost.php:155 -#: Prices_Customer.php:263 Prices_Customer.php:337 PrintCustTrans.php:844 -#: PrintCustTransPortrait.php:892 SelectCompletedOrder.php:557 -#: SelectCreditItems.php:243 SelectCustomer.php:422 SelectOrderItems.php:595 +#: Contracts.php:779 CustomerAccount.php:249 CustomerInquiry.php:252 +#: CustomerTransInquiry.php:102 Dashboard.php:658 FTP_RadioBeacon.php:52 +#: PDFOrdersInvoiced.php:293 PDFOrderStatus.php:294 PDFPriceList.php:427 +#: PricesByCost.php:155 Prices_Customer.php:263 Prices_Customer.php:337 +#: PrintCustTrans.php:844 PrintCustTransPortrait.php:892 +#: SelectCompletedOrder.php:557 SelectCreditItems.php:243 +#: SelectCustomer.php:422 SelectOrderItems.php:595 #: SelectRecurringSalesOrder.php:92 SelectSalesOrder.php:702 #: SelectSalesOrder.php:719 StockMovements.php:103 #: StockSerialItemResearch.php:84 @@ -5809,10 +5816,10 @@ msgid "Fax" msgstr "" -#: Contracts.php:829 CustomerInquiry.php:162 CustomerReceipt.php:1024 -#: PDFRemittanceAdvice.php:275 PO_Header.php:609 PrintCustTrans.php:881 -#: PrintCustTransPortrait.php:933 SupplierInquiry.php:120 -#: includes/PDFQuotationPageHeader.inc:88 +#: Contracts.php:829 CustomerAccount.php:159 CustomerInquiry.php:162 +#: CustomerReceipt.php:1024 PDFRemittanceAdvice.php:275 PO_Header.php:609 +#: PrintCustTrans.php:881 PrintCustTransPortrait.php:933 +#: SupplierInquiry.php:120 includes/PDFQuotationPageHeader.inc:88 #: includes/PDFQuotationPortraitPageHeader.inc:88 #: includes/PDFStatementPageHeader.inc:116 includes/PDFTransPageHeader.inc:162 #: includes/PDFTransPageHeaderPortrait.inc:214 @@ -6569,9 +6576,9 @@ msgid "Picked Up By" msgstr "" -#: CounterSales.php:909 CustomerInquiry.php:254 CustomerTransInquiry.php:104 -#: DeliveryDetails.php:1105 OrderDetails.php:125 PO_Header.php:1155 -#: PO_OrderDetails.php:156 RecurringSalesOrders.php:419 +#: CounterSales.php:909 CustomerAccount.php:251 CustomerInquiry.php:254 +#: CustomerTransInquiry.php:104 DeliveryDetails.php:1105 OrderDetails.php:125 +#: PO_Header.php:1155 PO_OrderDetails.php:156 RecurringSalesOrders.php:419 #: SelectQASamples.php:402 SelectQASamples.php:507 SelectQASamples.php:567 #: SpecialOrder.php:613 SupplierCredit.php:602 SupplierInquiry.php:213 #: SupplierInvoice.php:952 SupplierTransInquiry.php:107 @@ -7895,6 +7902,250 @@ msgid "Language" msgstr "" +#: CustomerAccount.php:5 +msgid "Customer Account" +msgstr "" + +#: CustomerAccount.php:14 +msgid "" +"To display the account a customer must first be selected from the customer " +"selection screen" +msgstr "" + +#: CustomerAccount.php:15 +msgid "Select a Customer Account to Display" +msgstr "" + +#: CustomerAccount.php:28 CustomerInquiry.php:28 +msgid "Failed to retrieve sales data" +msgstr "" + +#: CustomerAccount.php:37 +msgid "There is no salesman data set for this customer" +msgstr "" + +#: CustomerAccount.php:42 +msgid "You have no authority to review this customer account" +msgstr "" + +#: CustomerAccount.php:57 CustomerInquiry.php:57 +msgid "The balance status should be all or zero balance or not zero balance" +msgstr "" + +#: CustomerAccount.php:70 PrintCustStatements.php:116 +msgid "There was a problem retrieving the outstanding transactions for" +msgstr "" + +#: CustomerAccount.php:70 CustomerAccount.php:93 EmailConfirmation.php:43 +#: FTP_RadioBeacon.php:178 PDFCOA.php:81 PDFPickingList.php:224 +#: PDFProdSpec.php:65 PDFQuotation.php:37 PDFQuotation.php:123 +#: PDFQuotationPortrait.php:39 PDFQuotationPortrait.php:125 PDFWOPrint.php:144 +#: PDFWOPrint.php:264 PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209 +#: PrintCustOrder_generic.php:38 PrintCustOrder_generic.php:163 +#: PrintCustOrder.php:39 PrintCustOrder.php:136 PrintCustStatements.php:116 +#: PrintCustStatements.php:139 PrintCustTrans.php:225 PrintCustTrans.php:280 +#: PrintCustTrans.php:702 PrintCustTrans.php:885 +#: PrintCustTransPortrait.php:248 PrintCustTransPortrait.php:305 +#: PrintCustTransPortrait.php:746 PrintCustTransPortrait.php:937 +msgid "from the database" +msgstr "" + +#: CustomerAccount.php:93 PrintCustStatements.php:139 +msgid "" +"There was a problem retrieving the transactions that were settled over the " +"course of the last month for" +msgstr "" + +#: CustomerAccount.php:155 CustomerInquiry.php:158 +msgid "Back to Customer Screen" +msgstr "" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:122 +#: SupplierInvoice.php:608 +msgid "Terms" +msgstr "" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: Customers.php:566 Customers.php:907 Customers.php:937 +msgid "Credit Limit" +msgstr "" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: Customers.php:592 Customers.php:974 Customers.php:980 +#: includes/MainMenuLinksArray.php:495 +msgid "Credit Status" +msgstr "" + +#: CustomerAccount.php:163 CustomerInquiry.php:166 CustomerReceipt.php:1028 +msgid "ACCOUNT ON HOLD" +msgstr "" + +#: CustomerAccount.php:168 CustomerInquiry.php:171 CustomerReceipt.php:1034 +#: PrintCustStatements.php:398 SupplierInquiry.php:144 +msgid "Total Balance" +msgstr "" + +#: CustomerAccount.php:169 CustomerInquiry.php:172 CustomerReceipt.php:1035 +#: Dashboard.php:58 PrintCustStatements.php:394 SalesPeople.php:214 +#: Shipments.php:406 StockClone.php:886 StockClone.php:888 Stocks.php:1220 +#: Stocks.php:1222 SupplierInquiry.php:145 WhereUsedInquiry.php:92 +#: includes/PDFAgedDebtorsPageHeader.inc:50 +#: includes/PDFAgedSuppliersPageHeader.inc:36 +msgid "Current" +msgstr "" + +#: CustomerAccount.php:170 CustomerInquiry.php:173 CustomerReceipt.php:1036 +#: SupplierInquiry.php:146 +msgid "Now Due" +msgstr "" + +#: CustomerAccount.php:171 CustomerAccount.php:172 CustomerInquiry.php:174 +#: CustomerInquiry.php:175 CustomerReceipt.php:1037 CustomerReceipt.php:1038 +#: SupplierInquiry.php:147 SupplierInquiry.php:148 +msgid "Days Overdue" +msgstr "" + +#: CustomerAccount.php:172 CustomerInquiry.php:175 CustomerReceipt.php:1038 +#: PrintCustStatements.php:397 SupplierInquiry.php:148 +msgid "Over" +msgstr "" + +#: CustomerAccount.php:186 CustomerInquiry.php:189 SupplierInquiry.php:165 +msgid "Show all transactions after" +msgstr "" + +#: CustomerAccount.php:191 CustomerAccount.php:196 CustomerAccount.php:200 +#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203 +msgid "Invoices not fully allocated" +msgstr "" + +#: CustomerAccount.php:192 CustomerAccount.php:197 CustomerAccount.php:201 +#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204 +msgid "Invoices fully allocated" +msgstr "" + +#: CustomerAccount.php:206 CustomerInquiry.php:209 SupplierInquiry.php:166 +msgid "Refresh Inquiry" +msgstr "" + +#: CustomerAccount.php:233 CustomerInquiry.php:236 SupplierInquiry.php:193 +msgid "No transactions were returned by the SQL because" +msgstr "" + +#: CustomerAccount.php:237 CustomerInquiry.php:240 SupplierInquiry.php:199 +msgid "There are no transactions to display since" +msgstr "" + +#: CustomerAccount.php:254 CustomerInquiry.php:257 SupplierInquiry.php:215 +#: Z_CheckAllocationsFrom.php:35 Z_CheckAllocationsFrom.php:60 +#: includes/PDFStatementPageHeader.inc:172 +msgid "Allocated" +msgstr "" + +#: CustomerAccount.php:255 CustomerAllocations.php:382 +#: CustomerAllocations.php:570 CustomerAllocations.php:622 +#: CustomerBalancesMovement.php:121 CustomerBalancesMovement.php:124 +#: CustomerBalancesMovement.php:200 CustomerInquiry.php:258 Dashboard.php:57 +#: Dashboard.php:534 GLAccountInquiry.php:177 SupplierInquiry.php:216 +#: includes/PDFAgedDebtorsPageHeader.inc:49 +#: includes/PDFAgedSuppliersPageHeader.inc:35 +#: includes/PDFDebtorBalsPageHeader.inc:31 +#: includes/PDFOstdgGRNsPageHeader.inc:41 +#: includes/PDFSupplierBalsPageHeader.inc:34 +msgid "Balance" +msgstr "" + +#: CustomerAccount.php:256 CustomerAccount.php:257 CustomerAccount.php:258 +#: CustomerAccount.php:259 CustomerAccount.php:260 CustomerInquiry.php:259 +#: CustomerInquiry.php:260 CustomerInquiry.php:261 CustomerInquiry.php:262 +#: CustomerInquiry.php:263 SupplierAllocations.php:647 SupplierInquiry.php:217 +#: SupplierInquiry.php:218 +msgid "More Info" +msgstr "" + +#: CustomerAccount.php:301 CustomerAccount.php:343 CustomerInquiry.php:304 +#: CustomerInquiry.php:346 +msgid "Credit " +msgstr "" + +#: CustomerAccount.php:302 CustomerAccount.php:344 CustomerInquiry.php:305 +#: CustomerInquiry.php:347 +msgid "Click to credit the invoice" +msgstr "" + +#: CustomerAccount.php:306 CustomerAccount.php:348 CustomerAccount.php:385 +#: CustomerAccount.php:419 CustomerAccount.php:461 CustomerInquiry.php:309 +#: CustomerInquiry.php:351 CustomerInquiry.php:388 CustomerInquiry.php:422 +#: CustomerInquiry.php:464 +msgid "HTML " +msgstr "" + +#: CustomerAccount.php:307 CustomerAccount.php:349 CustomerAccount.php:386 +#: CustomerInquiry.php:310 CustomerInquiry.php:352 CustomerInquiry.php:389 +#: CustomerTransInquiry.php:140 +#, php-format +msgid "Click to preview the invoice" +msgstr "" + +#: CustomerAccount.php:311 CustomerAccount.php:353 CustomerAccount.php:390 +#: CustomerAccount.php:424 CustomerAccount.php:466 CustomerInquiry.php:314 +#: CustomerInquiry.php:356 CustomerInquiry.php:393 CustomerInquiry.php:427 +#: CustomerInquiry.php:469 +msgid "PDF " +msgstr "" + +#: CustomerAccount.php:312 CustomerAccount.php:354 CustomerAccount.php:391 +#: CustomerAccount.php:425 CustomerAccount.php:467 CustomerInquiry.php:315 +#: CustomerInquiry.php:357 CustomerInquiry.php:394 CustomerInquiry.php:428 +#: CustomerInquiry.php:470 SelectSalesOrder.php:772 SelectSalesOrder.php:799 +#, php-format +msgid "Click for PDF" +msgstr "" + +#: CustomerAccount.php:316 CustomerAccount.php:358 CustomerAccount.php:395 +#: CustomerInquiry.php:319 CustomerInquiry.php:361 CustomerInquiry.php:398 +msgid "Email " +msgstr "" + +#: CustomerAccount.php:317 CustomerAccount.php:359 CustomerAccount.php:396 +#: CustomerInquiry.php:320 CustomerInquiry.php:362 CustomerInquiry.php:399 +msgid "Click to email the invoice" +msgstr "" + +#: CustomerAccount.php:321 CustomerAccount.php:322 CustomerAccount.php:439 +#: CustomerAccount.php:440 CustomerAccount.php:509 CustomerAccount.php:510 +#: CustomerAccount.php:563 CustomerAccount.php:564 CustomerAccount.php:612 +#: CustomerAccount.php:613 CustomerInquiry.php:324 CustomerInquiry.php:325 +#: CustomerInquiry.php:442 CustomerInquiry.php:443 CustomerInquiry.php:512 +#: CustomerInquiry.php:513 CustomerInquiry.php:566 CustomerInquiry.php:567 +#: CustomerInquiry.php:615 CustomerInquiry.php:616 +msgid "View GL Entries" +msgstr "" + +#: CustomerAccount.php:420 CustomerAccount.php:462 CustomerInquiry.php:423 +#: CustomerInquiry.php:465 +msgid "Click to preview the credit note" +msgstr "" + +#: CustomerAccount.php:430 CustomerAccount.php:472 CustomerInquiry.php:433 +#: CustomerInquiry.php:475 +msgid "Click to email the credit note" +msgstr "" + +#: CustomerAccount.php:434 CustomerAccount.php:476 CustomerAccount.php:501 +#: CustomerAccount.php:531 CustomerAllocations.php:381 CustomerInquiry.php:437 +#: CustomerInquiry.php:479 CustomerInquiry.php:504 CustomerInquiry.php:534 +#: SupplierAllocations.php:460 SupplierInquiry.php:263 +msgid "Allocation" +msgstr "" + +#: CustomerAccount.php:435 CustomerAccount.php:477 CustomerAccount.php:502 +#: CustomerAccount.php:532 CustomerInquiry.php:438 CustomerInquiry.php:480 +#: CustomerInquiry.php:505 CustomerInquiry.php:535 SupplierInquiry.php:262 +msgid "Click to allocate funds" +msgstr "" + #: CustomerAllocations.php:13 msgid "Customer Receipt" msgstr "" @@ -8035,29 +8286,10 @@ msgid "This" msgstr "" -#: CustomerAllocations.php:381 CustomerInquiry.php:437 CustomerInquiry.php:479 -#: CustomerInquiry.php:504 CustomerInquiry.php:534 SupplierAllocations.php:460 -#: SupplierInquiry.php:263 -msgid "Allocation" -msgstr "" - #: CustomerAllocations.php:382 msgid "Running" msgstr "" -#: CustomerAllocations.php:382 CustomerAllocations.php:570 -#: CustomerAllocations.php:622 CustomerBalancesMovement.php:121 -#: CustomerBalancesMovement.php:124 CustomerBalancesMovement.php:200 -#: CustomerInquiry.php:258 Dashboard.php:57 Dashboard.php:534 -#: GLAccountInquiry.php:177 SupplierInquiry.php:216 -#: includes/PDFAgedDebtorsPageHeader.inc:49 -#: includes/PDFAgedSuppliersPageHeader.inc:35 -#: includes/PDFDebtorBalsPageHeader.inc:31 -#: includes/PDFOstdgGRNsPageHeader.inc:41 -#: includes/PDFSupplierBalsPageHeader.inc:34 -msgid "Balance" -msgstr "" - #: CustomerAllocations.php:394 msgid "Being allocated" msgstr "" @@ -8623,10 +8855,6 @@ msgid "Select a Customer to Inquire On" msgstr "" -#: CustomerInquiry.php:28 -msgid "Failed to retrieve sales data" -msgstr "" - #: CustomerInquiry.php:37 msgid "There is no salesman data set for this debtor" msgstr "" @@ -8635,156 +8863,6 @@ msgid "You have no authority to review this data" msgstr "" -#: CustomerInquiry.php:57 -msgid "The balance status should be all or zero balance or not zero balance" -msgstr "" - -#: CustomerInquiry.php:158 -msgid "Back to Customer Screen" -msgstr "" - -#: CustomerInquiry.php:162 CustomerReceipt.php:1024 SelectOrderItems.php:698 -#: SupplierCredit.php:264 SupplierInquiry.php:122 SupplierInvoice.php:608 -msgid "Terms" -msgstr "" - -#: CustomerInquiry.php:162 CustomerReceipt.php:1024 Customers.php:566 -#: Customers.php:907 Customers.php:937 -msgid "Credit Limit" -msgstr "" - -#: CustomerInquiry.php:162 CustomerReceipt.php:1024 Customers.php:592 -#: Customers.php:974 Customers.php:980 includes/MainMenuLinksArray.php:495 -msgid "Credit Status" -msgstr "" - -#: CustomerInquiry.php:166 CustomerReceipt.php:1028 -msgid "ACCOUNT ON HOLD" -msgstr "" - -#: CustomerInquiry.php:171 CustomerReceipt.php:1034 -#: PrintCustStatements.php:398 SupplierInquiry.php:144 -msgid "Total Balance" -msgstr "" - -#: CustomerInquiry.php:172 CustomerReceipt.php:1035 Dashboard.php:58 -#: PrintCustStatements.php:394 SalesPeople.php:214 Shipments.php:406 -#: StockClone.php:886 StockClone.php:888 Stocks.php:1220 Stocks.php:1222 -#: SupplierInquiry.php:145 WhereUsedInquiry.php:92 -#: includes/PDFAgedDebtorsPageHeader.inc:50 -#: includes/PDFAgedSuppliersPageHeader.inc:36 -msgid "Current" -msgstr "" - -#: CustomerInquiry.php:173 CustomerReceipt.php:1036 SupplierInquiry.php:146 -msgid "Now Due" -msgstr "" - -#: CustomerInquiry.php:174 CustomerInquiry.php:175 CustomerReceipt.php:1037 -#: CustomerReceipt.php:1038 SupplierInquiry.php:147 SupplierInquiry.php:148 -msgid "Days Overdue" -msgstr "" - -#: CustomerInquiry.php:175 CustomerReceipt.php:1038 -#: PrintCustStatements.php:397 SupplierInquiry.php:148 -msgid "Over" -msgstr "" - -#: CustomerInquiry.php:189 SupplierInquiry.php:165 -msgid "Show all transactions after" -msgstr "" - -#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203 -msgid "Invoices not fully allocated" -msgstr "" - -#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204 -msgid "Invoices fully allocated" -msgstr "" - -#: CustomerInquiry.php:209 SupplierInquiry.php:166 -msgid "Refresh Inquiry" -msgstr "" - -#: CustomerInquiry.php:236 SupplierInquiry.php:193 -msgid "No transactions were returned by the SQL because" -msgstr "" - -#: CustomerInquiry.php:240 SupplierInquiry.php:199 -msgid "There are no transactions to display since" -msgstr "" - -#: CustomerInquiry.php:257 SupplierInquiry.php:215 -#: Z_CheckAllocationsFrom.php:35 Z_CheckAllocationsFrom.php:60 -#: includes/PDFStatementPageHeader.inc:172 -msgid "Allocated" -msgstr "" - -#: CustomerInquiry.php:259 CustomerInquiry.php:260 CustomerInquiry.php:261 -#: CustomerInquiry.php:262 CustomerInquiry.php:263 SupplierAllocations.php:647 -#: SupplierInquiry.php:217 SupplierInquiry.php:218 -msgid "More Info" -msgstr "" - -#: CustomerInquiry.php:304 CustomerInquiry.php:346 -msgid "Credit " -msgstr "" - -#: CustomerInquiry.php:305 CustomerInquiry.php:347 -msgid "Click to credit the invoice" -msgstr "" - -#: CustomerInquiry.php:309 CustomerInquiry.php:351 CustomerInquiry.php:388 -#: CustomerInquiry.php:422 CustomerInquiry.php:464 -msgid "HTML " -msgstr "" - -#: CustomerInquiry.php:310 CustomerInquiry.php:352 CustomerInquiry.php:389 -#: CustomerTransInquiry.php:140 -#, php-format -msgid "Click to preview the invoice" -msgstr "" - -#: CustomerInquiry.php:314 CustomerInquiry.php:356 CustomerInquiry.php:393 -#: CustomerInquiry.php:427 CustomerInquiry.php:469 -msgid "PDF " -msgstr "" - -#: CustomerInquiry.php:315 CustomerInquiry.php:357 CustomerInquiry.php:394 -#: CustomerInquiry.php:428 CustomerInquiry.php:470 SelectSalesOrder.php:772 -#: SelectSalesOrder.php:799 -#, php-format -msgid "Click for PDF" -msgstr "" - -#: CustomerInquiry.php:319 CustomerInquiry.php:361 CustomerInquiry.php:398 -msgid "Email " -msgstr "" - -#: CustomerInquiry.php:320 CustomerInquiry.php:362 CustomerInquiry.php:399 -msgid "Click to email the invoice" -msgstr "" - -#: CustomerInquiry.php:324 CustomerInquiry.php:325 CustomerInquiry.php:442 -#: CustomerInquiry.php:443 CustomerInquiry.php:512 CustomerInquiry.php:513 -#: CustomerInquiry.php:566 CustomerInquiry.php:567 CustomerInquiry.php:615 -#: CustomerInquiry.php:616 -msgid "View GL Entries" -msgstr "" - -#: CustomerInquiry.php:423 CustomerInquiry.php:465 -msgid "Click to preview the credit note" -msgstr "" - -#: CustomerInquiry.php:433 CustomerInquiry.php:475 -msgid "Click to email the credit note" -msgstr "" - -#: CustomerInquiry.php:438 CustomerInquiry.php:480 CustomerInquiry.php:505 -#: CustomerInquiry.php:535 SupplierInquiry.php:262 -msgid "Click to allocate funds" -msgstr "" - #: CustomerPurchases.php:6 msgid "Customer Purchases" msgstr "" @@ -11353,20 +11431,6 @@ "There was a problem retrieving the order header details for Order Number" msgstr "" -#: EmailConfirmation.php:43 FTP_RadioBeacon.php:178 PDFCOA.php:81 -#: PDFPickingList.php:224 PDFProdSpec.php:65 PDFQuotation.php:37 -#: PDFQuotation.php:123 PDFQuotationPortrait.php:39 -#: PDFQuotationPortrait.php:125 PDFWOPrint.php:144 PDFWOPrint.php:264 -#: PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209 -#: PrintCustOrder_generic.php:38 PrintCustOrder_generic.php:163 -#: PrintCustOrder.php:39 PrintCustOrder.php:136 PrintCustStatements.php:116 -#: PrintCustStatements.php:139 PrintCustTrans.php:225 PrintCustTrans.php:280 -#: PrintCustTrans.php:702 PrintCustTrans.php:885 -#: PrintCustTransPortrait.php:248 PrintCustTransPortrait.php:305 -#: PrintCustTransPortrait.php:746 PrintCustTransPortrait.php:937 -msgid "from the database" -msgstr "" - #: EmailConfirmation.php:83 EmailConfirmation.php:117 #: PrintCustOrder_generic.php:81 PrintCustOrder_generic.php:110 #: PrintCustOrder_generic.php:251 PrintCustOrder.php:84 PrintCustOrder.php:100 @@ -22437,16 +22501,6 @@ msgid "There were no Customers matching your selection of " msgstr "" -#: PrintCustStatements.php:116 -msgid "There was a problem retrieving the outstanding transactions for" -msgstr "" - -#: PrintCustStatements.php:139 -msgid "" -"There was a problem retrieving the transactions that were settled over the " -"course of the last month for" -msgstr "" - #: PrintCustStatements.php:188 msgid "Settled Transactions" msgstr "" @@ -35268,70 +35322,70 @@ msgid "You should now make the config.php read only for the web server." msgstr "" -#: UpgradeDatabase.php:195 +#: UpgradeDatabase.php:197 msgid "" "Only mysql upgrades are performed seamlessly at this time. Your database " "will need to be manually updated" msgstr "" -#: UpgradeDatabase.php:209 +#: UpgradeDatabase.php:211 msgid "Applying" msgstr "" -#: UpgradeDatabase.php:237 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29 +#: UpgradeDatabase.php:239 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29 #: Z_Upgrade3.10.php:34 Z_Upgrade3.10.php:46 Z_Upgrade3.10.php:51 #: Z_Upgrade3.10.php:60 Z_Upgrade3.10.php:65 Z_Upgrade3.10.php:74 #: Z_Upgrade3.10.php:79 Z_Upgrade_3.11-4.00.php:59 msgid "Success" msgstr "" -#: UpgradeDatabase.php:240 +#: UpgradeDatabase.php:242 msgid "Foreign Key already removed" msgstr "" -#: UpgradeDatabase.php:243 Z_Upgrade_3.10-3.11.php:63 +#: UpgradeDatabase.php:245 Z_Upgrade_3.10-3.11.php:63 #: Z_Upgrade_3.11-4.00.php:63 msgid "Table has already been created" msgstr "" -#: UpgradeDatabase.php:246 +#: UpgradeDatabase.php:248 msgid "Column has already been changed" msgstr "" -#: UpgradeDatabase.php:249 Z_Upgrade_3.10-3.11.php:67 +#: UpgradeDatabase.php:251 Z_Upgrade_3.10-3.11.php:67 #: Z_Upgrade_3.11-4.00.php:67 msgid "Column has already been created" msgstr "" -#: UpgradeDatabase.php:252 Z_Upgrade_3.10-3.11.php:71 +#: UpgradeDatabase.php:254 Z_Upgrade_3.10-3.11.php:71 #: Z_Upgrade_3.11-4.00.php:71 msgid "Index already exists" msgstr "" -#: UpgradeDatabase.php:255 Z_Upgrade_3.10-3.11.php:75 +#: UpgradeDatabase.php:257 Z_Upgrade_3.10-3.11.php:75 #: Z_Upgrade_3.11-4.00.php:75 msgid "Entry has already been done" msgstr "" -#: UpgradeDatabase.php:258 +#: UpgradeDatabase.php:260 msgid "SQL syntax error. The SQL error message is" msgstr "" -#: UpgradeDatabase.php:261 Z_Upgrade_3.10-3.11.php:79 +#: UpgradeDatabase.php:263 Z_Upgrade_3.10-3.11.php:79 #: Z_Upgrade_3.11-4.00.php:79 msgid "Primary key already exists" msgstr "" -#: UpgradeDatabase.php:264 +#: UpgradeDatabase.php:266 msgid "Index already dropped previously" msgstr "" -#: UpgradeDatabase.php:267 Z_Upgrade_3.10-3.11.php:82 +#: UpgradeDatabase.php:269 Z_Upgrade_3.10-3.11.php:82 #: Z_Upgrade_3.11-4.00.php:82 msgid "Failure" msgstr "" -#: UpgradeDatabase.php:267 Z_Upgrade_3.10-3.11.php:83 +#: UpgradeDatabase.php:269 Z_Upgrade_3.10-3.11.php:83 #: Z_Upgrade_3.11-4.00.php:83 msgid "Error number" msgstr "" 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 2015-02-06 04:24:13 UTC (rev 7127) +++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2015-02-06 07:01:03 UTC (rev 7128) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 4.11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 12:41+1300\n" +"POT-Creation-Date: 2015-02-06 19:17+1300\n" "PO-Revision-Date: 2013-06-01 11:20-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Czech <cs...@li...>\n" @@ -726,11 +726,12 @@ msgstr "Telefonní číslo" #: AddCustomerContacts.php:129 AddCustomerContacts.php:241 -#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:432 -#: CustomerInquiry.php:474 Customers.php:1121 Customers.php:1129 -#: EmailCustTrans.php:15 EmailCustTrans.php:64 Factors.php:246 Factors.php:297 -#: Locations.php:616 OrderDetails.php:115 PDFRemittanceAdvice.php:251 -#: PDFWOPrint.php:591 PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677 +#: CustomerAccount.php:429 CustomerAccount.php:471 CustomerBranches.php:414 +#: CustomerBranches.php:849 CustomerInquiry.php:432 CustomerInquiry.php:474 +#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:15 +#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:616 +#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:591 +#: PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677 #: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:748 #: PrintCustTrans.php:979 PrintCustTrans.php:1028 #: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039 @@ -819,7 +820,7 @@ #: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211 #: AgedControlledInventory.php:47 BankMatching.php:281 #: BankReconciliation.php:217 BankReconciliation.php:294 -#: ContractCosting.php:177 CustomerAllocations.php:348 +#: ContractCosting.php:177 CustomerAccount.php:248 CustomerAllocations.php:348 #: CustomerAllocations.php:378 CustomerInquiry.php:251 #: CustomerTransInquiry.php:100 GLAccountInquiry.php:173 #: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 @@ -843,10 +844,10 @@ #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180 #: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926 -#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243 -#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252 -#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261 -#: UpgradeDatabase.php:264 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1260 UpgradeDatabase.php:242 UpgradeDatabase.php:245 +#: UpgradeDatabase.php:248 UpgradeDatabase.php:251 UpgradeDatabase.php:254 +#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263 +#: UpgradeDatabase.php:266 Z_Upgrade_3.10-3.11.php:62 #: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70 #: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78 #: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66 @@ -1035,16 +1036,16 @@ #: ConfirmDispatch_Invoice.php:309 CounterReturns.php:676 #: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853 #: CounterSales.php:855 Credit_Invoice.php:299 Credit_Invoice.php:303 -#: CustomerAllocations.php:349 CustomerAllocations.php:379 -#: CustomerInquiry.php:256 DeliveryDetails.php:881 DeliveryDetails.php:950 -#: GLBalanceSheet.php:191 GLBalanceSheet.php:203 GLBalanceSheet.php:293 -#: GLBalanceSheet.php:302 GLBudgets.php:213 GLJournal.php:435 -#: GLTransInquiry.php:195 GLTrialBalance.php:225 GLTrialBalance.php:245 -#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:492 -#: GLTrialBalance.php:512 GLTrialBalance.php:536 GLTrialBalance.php:648 -#: GLTrialBalance.php:668 GLTrialBalance.php:692 InventoryValuation.php:197 -#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177 -#: OutstandingGRNs.php:243 PDFCustTransListing.php:137 +#: CustomerAccount.php:253 CustomerAllocations.php:349 +#: CustomerAllocations.php:379 CustomerInquiry.php:256 DeliveryDetails.php:881 +#: DeliveryDetails.php:950 GLBalanceSheet.php:191 GLBalanceSheet.php:203 +#: GLBalanceSheet.php:293 GLBalanceSheet.php:302 GLBudgets.php:213 +#: GLJournal.php:435 GLTransInquiry.php:195 GLTrialBalance.php:225 +#: GLTrialBalance.php:245 GLTrialBalance.php:266 GLTrialBalance.php:362 +#: GLTrialBalance.php:492 GLTrialBalance.php:512 GLTrialBalance.php:536 +#: GLTrialBalance.php:648 GLTrialBalance.php:668 GLTrialBalance.php:692 +#: InventoryValuation.php:197 MaterialsNotUsed.php:77 OffersReceived.php:111 +#: OrderDetails.php:177 OutstandingGRNs.php:243 PDFCustTransListing.php:137 #: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310 #: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335 #: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430 @@ -1107,8 +1108,9 @@ msgid "Problem Report" msgstr "Problém" -#: AgedDebtors.php:269 CustomerInquiry.php:116 CustomerInquiry.php:141 -#: CustomerPurchases.php:29 Dashboard.php:145 DebtorsAtPeriodEnd.php:59 +#: AgedDebtors.php:269 CustomerAccount.php:138 CustomerInquiry.php:116 +#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145 +#: DebtorsAtPeriodEnd.php:59 msgid "The customer details could not be retrieved by the SQL because" msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože" @@ -1491,7 +1493,8 @@ #: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306 #: CounterReturns.php:1637 CounterReturns.php:1640 CounterSales.php:2201 -#: CounterSales.php:2204 CustomerBalancesMovement.php:32 +#: CounterSales.php:2204 CustomerAccount.php:190 CustomerAccount.php:195 +#: CustomerAccount.php:199 CustomerBalancesMovement.php:32 #: CustomerBalancesMovement.php:42 CustomerBalancesMovement.php:52 #: CustomerInquiry.php:193 CustomerInquiry.php:198 CustomerInquiry.php:202 #: CustomerTransInquiry.php:32 DailyBankTransactions.php:72 @@ -1549,7 +1552,7 @@ msgstr "Uživatel" #: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295 -#: CustomerAllocations.php:376 CustomerInquiry.php:249 +#: CustomerAccount.php:246 CustomerAllocations.php:376 CustomerInquiry.php:249 #: CustomerPurchases.php:82 CustomerTransInquiry.php:21 #: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111 #: DailyBankTransactions.php:129 GLAccountInquiry.php:171 @@ -2334,8 +2337,9 @@ msgstr "Přidat zpět unpresented kontroly" #: BankReconciliation.php:219 BankReconciliation.php:296 -#: CustomerAllocations.php:347 CustomerAllocations.php:377 -#: CustomerInquiry.php:250 CustomerTransInquiry.php:99 CustWhereAlloc.php:112 +#: CustomerAccount.php:247 CustomerAllocations.php:347 +#: CustomerAllocations.php:377 CustomerInquiry.php:250 +#: CustomerTransInquiry.php:99 CustWhereAlloc.php:112 #: DailyBankTransactions.php:128 EmailCustTrans.php:15 #: GLAccountInquiry.php:172 ImportBankTrans.php:490 PrintCustTrans.php:509 #: PrintCustTrans.php:733 PrintCustTrans.php:966 PrintCustTrans.php:1015 @@ -2354,8 +2358,9 @@ msgstr "Číslo" #: BankReconciliation.php:220 BankReconciliation.php:297 -#: ContractCosting.php:176 CustomerInquiry.php:253 CustomerPurchases.php:89 -#: CustomerReceipt.php:930 CustomerTransInquiry.php:103 CustWhereAlloc.php:113 +#: ContractCosting.php:176 CustomerAccount.php:250 CustomerInquiry.php:253 +#: CustomerPurchases.php:89 CustomerReceipt.php:930 +#: CustomerTransInquiry.php:103 CustWhereAlloc.php:113 #: DailyBankTransactions.php:130 Dashboard.php:54 GLAccountReport.php:342 #: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:920 #: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:144 @@ -3876,7 +3881,7 @@ msgstr "Potvrdit Expedice a faktury" #: ConfirmDispatch_Invoice.php:279 Contracts.php:778 CustItem.php:144 -#: CustLoginSetup.php:32 CustomerAllocations.php:345 +#: CustLoginSetup.php:32 CustomerAccount.php:159 CustomerAllocations.php:345 #: CustomerBalancesMovement.php:30 CustomerBalancesMovement.php:117 #: CustomerBalancesMovement.php:124 CustomerBranches.php:403 #: CustomerBranches.php:586 CustomerBranches.php:633 CustomerInquiry.php:162 @@ -4638,10 +4643,11 @@ msgstr "Nelze načíst součásti sestavy množství umístění skladu, protože " #: ConfirmDispatch_Invoice.php:1050 CounterSales.php:1474 -#: CustomerInquiry.php:255 CustomerTransInquiry.php:105 -#: DeliveryDetails.php:621 DeliveryDetails.php:627 DeliveryDetails.php:634 -#: DeliveryDetails.php:811 DeliveryDetails.php:817 DeliveryDetails.php:840 -#: MRPReport.php:412 PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292 +#: CustomerAccount.php:252 CustomerInquiry.php:255 +#: CustomerTransInquiry.php:105 DeliveryDetails.php:621 +#: DeliveryDetails.php:627 DeliveryDetails.php:634 DeliveryDetails.php:811 +#: DeliveryDetails.php:817 DeliveryDetails.php:840 MRPReport.php:412 +#: PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292 #: PDFSalesBySalesperson.php:82 PDFWeeklyOrders.php:78 #: SelectCompletedOrder.php:555 SelectContract.php:143 #: SelectOrderItems.php:686 SelectProduct.php:367 Shipments.php:399 @@ -5918,12 +5924,13 @@ msgid "Reset" msgstr "Vymazat formulář" -#: Contracts.php:779 CustomerInquiry.php:252 CustomerTransInquiry.php:102 -#: Dashboard.php:658 FTP_RadioBeacon.php:52 PDFOrdersInvoiced.php:293 -#: PDFOrderStatus.php:294 PDFPriceList.php:427 PricesByCost.php:155 -#: Prices_Customer.php:263 Prices_Customer.php:337 PrintCustTrans.php:844 -#: PrintCustTransPortrait.php:892 SelectCompletedOrder.php:557 -#: SelectCreditItems.php:243 SelectCustomer.php:422 SelectOrderItems.php:595 +#: Contracts.php:779 CustomerAccount.php:249 CustomerInquiry.php:252 +#: CustomerTransInquiry.php:102 Dashboard.php:658 FTP_RadioBeacon.php:52 +#: PDFOrdersInvoiced.php:293 PDFOrderStatus.php:294 PDFPriceList.php:427 +#: PricesByCost.php:155 Prices_Customer.php:263 Prices_Customer.php:337 +#: PrintCustTrans.php:844 PrintCustTransPortrait.php:892 +#: SelectCompletedOrder.php:557 SelectCreditItems.php:243 +#: SelectCustomer.php:422 SelectOrderItems.php:595 #: SelectRecurringSalesOrder.php:92 SelectSalesOrder.php:702 #: SelectSalesOrder.php:719 StockMovements.php:103 #: StockSerialItemResearch.php:84 @@ -5952,10 +5959,10 @@ msgid "Fax" msgstr "Fax" -#: Contracts.php:829 CustomerInquiry.php:162 CustomerReceipt.php:1024 -#: PDFRemittanceAdvice.php:275 PO_Header.php:609 PrintCustTrans.php:881 -#: PrintCustTransPortrait.php:933 SupplierInquiry.php:120 -#: includes/PDFQuotationPageHeader.inc:88 +#: Contracts.php:829 CustomerAccount.php:159 CustomerInquiry.php:162 +#: CustomerReceipt.php:1024 PDFRemittanceAdvice.php:275 PO_Header.php:609 +#: PrintCustTrans.php:881 PrintCustTransPortrait.php:933 +#: SupplierInquiry.php:120 includes/PDFQuotationPageHeader.inc:88 #: includes/PDFQuotationPortraitPageHeader.inc:88 #: includes/PDFStatementPageHeader.inc:116 includes/PDFTransPageHeader.inc:162 #: includes/PDFTransPageHeaderPortrait.inc:214 @@ -6735,9 +6742,9 @@ msgid "Picked Up By" msgstr "Sebrán" -#: CounterSales.php:909 CustomerInquiry.php:254 CustomerTransInquiry.php:104 -#: DeliveryDetails.php:1105 OrderDetails.php:125 PO_Header.php:1155 -#: PO_OrderDetails.php:156 RecurringSalesOrders.php:419 +#: CounterSales.php:909 CustomerAccount.php:251 CustomerInquiry.php:254 +#: CustomerTransInquiry.php:104 DeliveryDetails.php:1105 OrderDetails.php:125 +#: PO_Header.php:1155 PO_OrderDetails.php:156 RecurringSalesOrders.php:419 #: SelectQASamples.php:402 SelectQASamples.php:507 SelectQASamples.php:567 #: SpecialOrder.php:613 SupplierCredit.php:602 SupplierInquiry.php:213 #: SupplierInvoice.php:952 SupplierTransInquiry.php:107 @@ -8125,6 +8132,252 @@ msgid "Language" msgstr "Jazyk" +#: CustomerAccount.php:5 +msgid "Customer Account" +msgstr "" + +#: CustomerAccount.php:14 +msgid "" +"To display the account a customer must first be selected from the customer " +"selection screen" +msgstr "" + +#: CustomerAccount.php:15 +msgid "Select a Customer Account to Display" +msgstr "" + +#: CustomerAccount.php:28 CustomerInquiry.php:28 +msgid "Failed to retrieve sales data" +msgstr "" + +#: CustomerAccount.php:37 +msgid "There is no salesman data set for this customer" +msgstr "" + +#: CustomerAccount.php:42 +msgid "You have no authority to review this customer account" +msgstr "" + +#: CustomerAccount.php:57 CustomerInquiry.php:57 +msgid "The balance status should be all or zero balance or not zero balance" +msgstr "" + +#: CustomerAccount.php:70 PrintCustStatements.php:116 +msgid "There was a problem retrieving the outstanding transactions for" +msgstr "Tam byl problém načítání nesplacených transakcí pro" + +#: CustomerAccount.php:70 CustomerAccount.php:93 EmailConfirmation.php:43 +#: FTP_RadioBeacon.php:178 PDFCOA.php:81 PDFPickingList.php:224 +#: PDFProdSpec.php:65 PDFQuotation.php:37 PDFQuotation.php:123 +#: PDFQuotationPortrait.php:39 PDFQuotationPortrait.php:125 PDFWOPrint.php:144 +#: PDFWOPrint.php:264 PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209 +#: PrintCustOrder_generic.php:38 PrintCustOrder_generic.php:163 +#: PrintCustOrder.php:39 PrintCustOrder.php:136 PrintCustStatements.php:116 +#: PrintCustStatements.php:139 PrintCustTrans.php:225 PrintCustTrans.php:280 +#: PrintCustTrans.php:702 PrintCustTrans.php:885 +#: PrintCustTransPortrait.php:248 PrintCustTransPortrait.php:305 +#: PrintCustTransPortrait.php:746 PrintCustTransPortrait.php:937 +msgid "from the database" +msgstr "z databáze" + +#: CustomerAccount.php:93 PrintCustStatements.php:139 +msgid "" +"There was a problem retrieving the transactions that were settled over the " +"course of the last month for" +msgstr "" +"Tam byl problém načítání transakce, které byly vyřešeny v průběhu posledního " +"měsíce na" + +#: CustomerAccount.php:155 CustomerInquiry.php:158 +msgid "Back to Customer Screen" +msgstr "" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:122 +#: SupplierInvoice.php:608 +msgid "Terms" +msgstr "Podmínky" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: Customers.php:566 Customers.php:907 Customers.php:937 +msgid "Credit Limit" +msgstr "Úvěrový limit" + +#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024 +#: Customers.php:592 Customers.php:974 Customers.php:980 +#: includes/MainMenuLinksArray.php:495 +msgid "Credit Status" +msgstr "Stav úvěru" + +#: CustomerAccount.php:163 CustomerInquiry.php:166 CustomerReceipt.php:1028 +msgid "ACCOUNT ON HOLD" +msgstr "ÚČET NA HOLD" + +#: CustomerAccount.php:168 CustomerInquiry.php:171 CustomerReceipt.php:1034 +#: PrintCustStatements.php:398 SupplierInquiry.php:144 +msgid "Total Balance" +msgstr "Celkem Zůstatek" + +#: CustomerAccount.php:169 CustomerInquiry.php:172 CustomerReceipt.php:1035 +#: Dashboard.php:58 PrintCustStatements.php:394 SalesPeople.php:214 +#: Shipments.php:406 StockClone.php:886 StockClone.php:888 Stocks.php:1220 +#: Stocks.php:1222 SupplierInquiry.php:145 WhereUsedInquiry.php:92 +#: includes/PDFAgedDebtorsPageHeader.inc:50 +#: includes/PDFAgedSuppliersPageHeader.inc:36 +msgid "Current" +msgstr "Proud" + +#: CustomerAccount.php:170 CustomerInquiry.php:173 CustomerReceipt.php:1036 +#: SupplierInquiry.php:146 +msgid "Now Due" +msgstr "Nyní Díky" + +#: CustomerAccount.php:171 CustomerAccount.php:172 CustomerInquiry.php:174 +#: CustomerInquiry.php:175 CustomerReceipt.php:1037 CustomerReceipt.php:1038 +#: SupplierInquiry.php:147 SupplierInquiry.php:148 +msgid "Days Overdue" +msgstr "Dnů po splatnosti" + +#: CustomerAccount.php:172 CustomerInquiry.php:175 CustomerReceipt.php:1038 +#: PrintCustStatements.php:397 SupplierInquiry.php:148 +msgid "Over" +msgstr "Přes" + +#: CustomerAccount.php:186 CustomerInquiry.php:189 SupplierInquiry.php:165 +msgid "Show all transactions after" +msgstr "Zobrazit všechny transakce po" + +#: CustomerAccount.php:191 CustomerAccount.php:196 CustomerAccount.php:200 +#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203 +msgid "Invoices not fully allocated" +msgstr "" + +#: CustomerAccount.php:192 CustomerAccount.php:197 CustomerAccount.php:201 +#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204 +msgid "Invoices fully allocated" +msgstr "" + +#: CustomerAccount.php:206 CustomerInquiry.php:209 SupplierInquiry.php:166 +msgid "Refresh Inquiry" +msgstr "Obnovit Poptávka" + +#: CustomerAccount.php:233 CustomerInquiry.php:236 SupplierInquiry.php:193 +msgid "No transactions were returned by the SQL because" +msgstr "Žádné transakce byly vráceny, protože SQL" + +#: CustomerAccount.php:237 CustomerInquiry.php:240 SupplierInquiry.php:199 +msgid "There are no transactions to display since" +msgstr "Neexistují žádné transakce, k zobrazení, protože" + +#: CustomerAccount.php:254 CustomerInquiry.php:257 SupplierInquiry.php:215 +#: Z_CheckAllocationsFrom.php:35 Z_CheckAllocationsFrom.php:60 +#: includes/PDFStatementPageHeader.inc:172 +msgid "Allocated" +msgstr "Přidělených" + +#: CustomerAccount.php:255 CustomerAllocations.php:382 +#: CustomerAllocations.php:570 CustomerAllocations.php:622 +#: CustomerBalancesMovement.php:121 CustomerBalancesMovement.php:124 +#: CustomerBalancesMovement.php:200 CustomerInquiry.php:258 Dashboard.php:57 +#: Dashboard.php:534 GLAccountInquiry.php:177 SupplierInquiry.php:216 +#: includes/PDFAgedDebtorsPageHeader.inc:49 +#: includes/PDFAgedSuppliersPageHeader.inc:35 +#: includes/PDFDebtorBalsPageHeader.inc:31 +#: includes/PDFOstdgGRNsPageHeader.inc:41 +#: includes/PDFSupplierBalsPageHeader.inc:34 +msgid "Balance" +msgstr "Zůstatek" + +#: CustomerAccount.php:256 CustomerAccount.php:257 CustomerAccount.php:258 +#: CustomerAccount.php:259 CustomerAccount.php:260 CustomerInquiry.php:259 +#: CustomerInquiry.php:260 CustomerInquiry.php:261 CustomerInquiry.php:262 +#: CustomerInquiry.php:263 SupplierAllocations.php:647 SupplierInquiry.php:217 +#: SupplierInquiry.php:218 +msgid "More Info" +msgstr "Více informací" + +#: CustomerAccount.php:301 CustomerAccount.php:343 CustomerInquiry.php:304 +#: CustomerInquiry.php:346 +msgid "Credit " +msgstr "Úvěr " + +#: CustomerAccount.php:302 CustomerAccount.php:344 CustomerInquiry.php:305 +#: CustomerInquiry.php:347 +msgid "Click to credit the invoice" +msgstr "Klikněte pro úvěrové faktury" + +#: CustomerAccount.php:306 CustomerAccount.php:348 CustomerAccount.php:385 +#: CustomerAccount.php:419 CustomerAccount.php:461 CustomerInquiry.php:309 +#: CustomerInquiry.php:351 CustomerInquiry.php:388 CustomerInquiry.php:422 +#: CustomerInquiry.php:464 +msgid "HTML " +msgstr "HTML " + +#: CustomerAccount.php:307 CustomerAccount.php:349 CustomerAccount.php:386 +#: CustomerInquiry.php:310 CustomerInquiry.php:352 CustomerInquiry.php:389 +#: CustomerTransInquiry.php:140 +#, php-format +msgid "Click to preview the invoice" +msgstr "Klikněte pro náhled na faktuře" + +#: CustomerAccount.php:311 CustomerAccount.php:353 CustomerAccount.php:390 +#: CustomerAccount.php:424 CustomerAccount.php:466 CustomerInquiry.php:314 +#: CustomerInquiry.php:356 CustomerInquiry.php:393 CustomerInquiry.php:427 +#: CustomerInquiry.php:469 +msgid "PDF " +msgstr "PDF " + +#: CustomerAccount.php:312 CustomerAccount.php:354 CustomerAccount.php:391 +#: CustomerAccount.php:425 CustomerAccount.php:467 CustomerInquiry.php:315 +#: CustomerInquiry.php:357 CustomerInquiry.php:394 CustomerInquiry.php:428 +#: CustomerInquiry.php:470 SelectSalesOrder.php:772 SelectSalesOrder.php:799 +#, php-format +msgid "Click for PDF" +msgstr "Klikněte pro PDF" + +#: CustomerAccount.php:316 CustomerAccount.php:358 CustomerAccount.php:395 +#: CustomerInquiry.php:319 CustomerInquiry.php:361 CustomerInquiry.php:398 +msgid "Email " +msgstr "E-mail " + +#: CustomerAccount.php:317 CustomerAccount.php:359 CustomerAccount.php:396 +#: CustomerInquiry.php:320 CustomerInquiry.php:362 CustomerInquiry.php:399 +msgid "Click to email the invoice" +msgstr "Klikněte pro e-faktury" + +#: CustomerAccount.php:321 CustomerAccount.php:322 CustomerAccount.php:439 +#: CustomerAccount.php:440 CustomerAccount.php:509 CustomerAccount.php:510 +#: CustomerAccount.php:563 CustomerAccount.php:564 CustomerAccount.php:612 +#: CustomerAccount.php:613 CustomerInquiry.php:324 CustomerInquiry.php:325 +#: CustomerInquiry.php:442 CustomerInquiry.php:443 CustomerInquiry.php:512 +#: CustomerInquiry.php:513 CustomerInquiry.php:566 CustomerInquiry.php:567 +#: CustomerInquiry.php:615 CustomerInquiry.php:616 +msgid "View GL Entries" +msgstr "Zobrazit GL Příspěvky" + +#: CustomerAccount.php:420 CustomerAccount.php:462 CustomerInquiry.php:423 +#: CustomerInquiry.php:465 +msgid "Click to preview the credit note" +msgstr "Klikněte pro náhled dobropisu" + +#: CustomerAccount.php:430 CustomerAccount.php:472 CustomerInquiry.php:433 +#: CustomerInquiry.php:475 +msgid "Click to email the credit note" +msgstr "Klikněte pro e-mail dobropisu" + +#: CustomerAccount.php:434 CustomerAccount.php:476 CustomerAccount.php:501 +#: CustomerAccount.php:531 CustomerAllocations.php:381 CustomerInquiry.php:437 +#: CustomerInquiry.php:479 CustomerInquiry.php:504 CustomerInquiry.php:534 +#: SupplierAllocations.php:460 SupplierInquiry.php:263 +msgid "Allocation" +msgstr "Přidělení" + +#: CustomerAccount.php:435 CustomerAccount.php:477 CustomerAccount.php:502 +#: CustomerAccount.php:532 CustomerInquiry.php:438 CustomerInquiry.php:480 +#: CustomerInquiry.php:505 CustomerInquiry.php:535 SupplierInquiry.php:262 +msgid "Click to allocate funds" +msgstr "Klikněte na přidělování finančních prostředků" + #: CustomerAllocations.php:13 msgid "Customer Receipt" msgstr "Příjem zákazníka" @@ -8266,29 +8519,10 @@ msgid "This" msgstr "Tento" -#: CustomerAllocations.php:381 CustomerInquiry.php:437 CustomerInquiry.php:479 -#: CustomerInquiry.php:504 CustomerInquiry.php:534 SupplierAllocations.php:460 -#: SupplierInquiry.php:263 -msgid "Allocation" -msgstr "Přidělení" - #: CustomerAllocations.php:382 msgid "Running" msgstr "Běží" -#: CustomerAllocations.php:382 CustomerAllocations.php:570 -#: CustomerAllocations.php:622 CustomerBalancesMovement.php:121 -#: CustomerBalancesMovement.php:124 CustomerBalancesMovement.php:200 -#: CustomerInquiry.php:258 Dashboard.php:57 Dashboard.php:534 -#: GLAccountInquiry.php:177 SupplierInquiry.php:216 -#: includes/PDFAgedDebtorsPageHeader.inc:49 -#: includes/PDFAgedSuppliersPageHeader.inc:35 -#: includes/PDFDebtorBalsPageHeader.inc:31 -#: includes/PDFOstdgGRNsPageHeader.inc:41 -#: includes/PDFSupplierBalsPageHeader.inc:34 -msgid "Balance" -msgstr "Zůstatek" - #: CustomerAllocations.php:394 msgid "Being allocated" msgstr "Přidělovaných" @@ -8876,10 +9110,6 @@ msgid "Select a Customer to Inquire On" msgstr "Vyberte zákazník se může informovat o" -#: CustomerInquiry.php:28 -msgid "Failed to retrieve sales data" -msgstr "" - #: CustomerInquiry.php:37 msgid "There is no salesman data set for this debtor" msgstr "" @@ -8888,156 +9118,6 @@ msgid "You have no authority to review this data" msgstr "" -#: CustomerInquiry.php:57 -msgid "The balance status should be all or zero balance or not zero balance" -msgstr "" - -#: CustomerInquiry.php:158 -msgid "Back to Customer Screen" -msgstr "" - -#: CustomerInquiry.php:162 CustomerReceipt.php:1024 SelectOrderItems.php:698 -#: SupplierCredit.php:264 SupplierInquiry.php:122 SupplierInvoice.php:608 -msgid "Terms" -msgstr "Podmínky" - -#: CustomerInquiry.php:162 CustomerReceipt.php:1024 Customers.php:566 -#: Customers.php:907 Customers.php:937 -msgid "Credit Limit" -msgstr "Úvěrový limit" - -#: CustomerInquiry.php:162 CustomerReceipt... [truncated message content] |
From: <dai...@us...> - 2015-02-06 04:24:15
|
Revision: 7127 http://sourceforge.net/p/web-erp/reponame/7127 Author: daintree Date: 2015-02-06 04:24:13 +0000 (Fri, 06 Feb 2015) Log Message: ----------- add missing upgrade file Added Paths: ----------- trunk/sql/mysql/upgrade4.12-4.12.1.sql Added: trunk/sql/mysql/upgrade4.12-4.12.1.sql =================================================================== --- trunk/sql/mysql/upgrade4.12-4.12.1.sql (rev 0) +++ trunk/sql/mysql/upgrade4.12-4.12.1.sql 2015-02-06 04:24:13 UTC (rev 7127) @@ -0,0 +1,4 @@ +INSERT INTO `securitygroups` VALUES (8,16); +-- Add a description for the script: +UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php'; +UPDATE config SET confvalue='4.12.1' WHERE confname='VersionNumber'; \ No newline at end of file |
From: <dai...@us...> - 2015-02-05 23:43:49
|
Revision: 7126 http://sourceforge.net/p/web-erp/reponame/7126 Author: daintree Date: 2015-02-05 23:43:45 +0000 (Thu, 05 Feb 2015) Log Message: ----------- Pre Version 4.12.1 Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/build/make_release.sh trunk/doc/Change.log trunk/includes/ConnectDB.inc trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.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/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2015-02-05 23:00:41 UTC (rev 7125) +++ trunk/UpgradeDatabase.php 2015-02-05 23:43:45 UTC (rev 7126) @@ -186,6 +186,8 @@ $SQLScripts[] = './sql/mysql/upgrade4.11.3-4.11.4.sql'; case '4.11.5': $SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql'; + case '4.12': + $SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql'; break; } //end switch } Modified: trunk/build/make_release.sh =================================================================== --- trunk/build/make_release.sh 2015-02-05 23:00:41 UTC (rev 7125) +++ trunk/build/make_release.sh 2015-02-05 23:43:45 UTC (rev 7126) @@ -1,6 +1,6 @@ #! /bin/bash -BASE_DIR=/var/www/webERP; +BASE_DIR=/usr/share/nginx/html/webERP; OUTPUT_DIR=/home/phil/Documents/webERP; MYSQL_USER=root; MYSQL_PWD=a; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-05 23:00:41 UTC (rev 7125) +++ trunk/doc/Change.log 2015-02-05 23:43:45 UTC (rev 7126) @@ -1,5 +1,7 @@ webERP Change Log +6/2/15 Version 4.12.1 + 5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php 3/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php. 3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual. Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2015-02-05 23:00:41 UTC (rev 7125) +++ trunk/includes/ConnectDB.inc 2015-02-05 23:43:45 UTC (rev 7126) @@ -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.12'; //must update manually every time there is a DB change +$Version='4.12.1'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); if (!isset($_SESSION['DatabaseName'])){ Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-05 23:00:41 UTC (rev 7125) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-05 23:43:45 UTC (rev 7126) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 4.11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-27 21:55+1300\n" +"POT-Creation-Date: 2015-02-06 12:41+1300\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -239,7 +239,7 @@ #: FixedAssetLocations.php:13 FixedAssetRegister.php:16 #: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 #: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11 -#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311 +#: GLJournal.php:250 HistoricalTestResults.php:42 InternalStockRequest.php:311 #: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386 #: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516 #: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 @@ -248,7 +248,7 @@ #: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148 #: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 #: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 -#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20 +#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22 #: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24 #: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 #: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28 @@ -256,7 +256,7 @@ #: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291 #: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559 #: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510 -#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14 +#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14 #: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174 #: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 #: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 @@ -271,7 +271,7 @@ #: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22 #: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31 #: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57 -#: ../webSHOP/includes/header.php:216 +#: ../webSHOP/includes/header.php:217 msgid "Search" msgstr "إبحث" @@ -313,16 +313,16 @@ #: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600 #: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134 #: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 -#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407 -#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423 -#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606 -#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621 -#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645 -#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670 -#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306 -#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332 -#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417 -#: QATests.php:422 QATests.php:427 QATests.php:432 +#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409 +#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425 +#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608 +#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623 +#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647 +#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670 +#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308 +#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334 +#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419 +#: QATests.php:424 QATests.php:429 QATests.php:434 #: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 #: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 @@ -330,9 +330,9 @@ #: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351 #: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367 #: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362 -#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513 -#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582 -#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289 +#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520 +#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588 +#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289 #: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341 #: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413 #: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499 @@ -377,25 +377,25 @@ #: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601 #: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409 -#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425 -#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613 -#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637 -#: ProductSpecs.php:639 ProductSpecs.php:650 ProductSpecs.php:652 -#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:296 -#: QATests.php:298 QATests.php:309 QATests.php:311 QATests.php:322 -#: QATests.php:324 QATests.php:335 QATests.php:337 QATests.php:348 -#: QATests.php:350 QATests.php:414 QATests.php:419 QATests.php:424 -#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:492 +#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411 +#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427 +#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615 +#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639 +#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654 +#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298 +#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324 +#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350 +#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426 +#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492 #: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282 #: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419 #: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450 #: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266 #: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229 #: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:239 -#: SelectProduct.php:364 SelectQASamples.php:419 SelectQASamples.php:516 -#: SelectQASamples.php:518 SelectQASamples.php:573 SelectQASamples.php:575 -#: SelectQASamples.php:587 SelectQASamples.php:589 ShipmentCosting.php:668 +#: SelectProduct.php:364 SelectQASamples.php:426 SelectQASamples.php:523 +#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581 +#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668 #: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338 #: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394 #: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496 @@ -436,12 +436,12 @@ #: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 #: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 #: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253 -#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465 +#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467 #: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255 #: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130 #: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663 #: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722 -#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410 +#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417 #: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 #: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184 @@ -474,15 +474,15 @@ #: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227 #: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181 #: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286 -#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464 -#: PurchData.php:314 PurchData.php:721 QATests.php:466 +#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466 +#: PurchData.php:314 PurchData.php:721 QATests.php:468 #: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170 #: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273 #: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241 #: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778 #: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664 #: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723 -#: SelectOrderItems.php:1375 SelectQASamples.php:411 +#: SelectOrderItems.php:1375 SelectQASamples.php:418 #: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145 #: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626 #: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117 @@ -566,10 +566,10 @@ #: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424 #: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 #: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 -#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659 -#: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 -#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524 -#: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653 +#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661 +#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 +#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531 +#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653 #: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327 #: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967 #: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774 @@ -673,9 +673,9 @@ #: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105 #: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91 #: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104 -#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74 +#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76 #: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66 -#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531 +#: SelectQASamples.php:85 Stocks.php:589 Suppliers.php:531 #: SupplierTypes.php:68 msgid "has been updated" msgstr "" @@ -691,8 +691,8 @@ #: AddCustomerContacts.php:126 CompanyPreferences.php:173 #: CustomerBranches.php:408 Customers.php:1118 Customers.php:1126 #: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184 -#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162 -#: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208 +#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164 +#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208 #: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286 #: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108 #: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176 @@ -828,10 +828,10 @@ #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180 #: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926 -#: Stocks.php:1260 UpgradeDatabase.php:238 UpgradeDatabase.php:241 -#: UpgradeDatabase.php:244 UpgradeDatabase.php:247 UpgradeDatabase.php:250 -#: UpgradeDatabase.php:253 UpgradeDatabase.php:256 UpgradeDatabase.php:259 -#: UpgradeDatabase.php:262 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243 +#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252 +#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261 +#: UpgradeDatabase.php:264 Z_Upgrade_3.10-3.11.php:62 #: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70 #: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78 #: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66 @@ -967,15 +967,15 @@ #: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190 #: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178 #: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335 -#: PDFOrderStatus.php:337 PO_Items.php:716 PO_Items.php:1187 -#: PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214 -#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73 -#: ReorderLevel.php:298 ReverseGRN.php:397 SalesCategories.php:509 -#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120 -#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147 -#: SelectCreditItems.php:1021 SelectOrderItems.php:1473 +#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 +#: PO_Items.php:716 PO_Items.php:1187 PO_SelectOSPurchOrder.php:263 +#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154 +#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:397 +#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103 +#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505 +#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473 #: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756 -#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560 +#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560 #: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680 #: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173 #: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92 @@ -1080,8 +1080,9 @@ #: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167 #: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20 #: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20 -#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33 -#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267 +#: PDFSalesBySalesperson.php:15 PDFSellThroughSupportClaim.php:17 +#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59 +#: PDFStockCheckComparison.php:267 PDFWeeklyOrders.php:15 #: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447 #: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500 #: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39 @@ -1124,9 +1125,11 @@ #: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 #: PDFPrintLabel.php:45 PDFQALabel.php:116 PDFQuotation.php:276 #: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83 +#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168 #: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 #: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 -#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 +#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209 +#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 #: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256 #: PrintCustOrder.php:238 PrintWOItemSlip.php:122 #: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 @@ -1171,7 +1174,7 @@ #: ConfirmDispatch_Invoice.php:172 ConfirmDispatch_Invoice.php:1001 #: ConfirmDispatch_Invoice.php:1015 Contracts.php:592 CounterReturns.php:1024 #: CounterReturns.php:1038 CounterSales.php:1425 CounterSales.php:1439 -#: Credit_Invoice.php:755 Credit_Invoice.php:776 CustItem.php:73 +#: Credit_Invoice.php:754 Credit_Invoice.php:775 CustItem.php:73 #: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574 #: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91 #: Dashboard.php:259 Dashboard.php:439 DeliveryDetails.php:409 @@ -1532,7 +1535,7 @@ #: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111 #: DailyBankTransactions.php:129 GLAccountInquiry.php:171 #: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194 -#: ProductSpecs.php:386 QATests.php:255 QATests.php:393 +#: ProductSpecs.php:388 QATests.php:257 QATests.php:395 #: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424 #: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90 #: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:210 @@ -1553,7 +1556,7 @@ msgstr "" #: AuditTrail.php:180 MaterialsNotUsed.php:38 PDFCOA.php:169 PDFCOA.php:170 -#: PDFCOA.php:171 PDFProdSpec.php:129 PDFProdSpec.php:130 PDFProdSpec.php:131 +#: PDFCOA.php:171 PDFProdSpec.php:130 PDFProdSpec.php:131 PDFProdSpec.php:132 #: PurchData.php:700 SellThroughSupport.php:263 ShopParameters.php:197 #: SystemParameters.php:410 includes/PDFOstdgGRNsPageHeader.inc:43 msgid "Value" @@ -1585,7 +1588,7 @@ #: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207 #: SelectCompletedOrder.php:504 SelectCreditItems.php:1020 #: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472 -#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291 +#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:298 #: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218 #: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148 #: StockCategories.php:263 SupplierPriceList.php:270 SupplierPriceList.php:455 @@ -2055,7 +2058,8 @@ #: PDFDeliveryDifferences.php:320 PDFDIFOT.php:201 PDFDIFOT.php:214 #: PDFDIFOT.php:313 PDFFGLabel.php:208 PDFOrdersInvoiced.php:87 #: PDFOrdersInvoiced.php:261 PDFOrderStatus.php:92 PDFOrderStatus.php:274 -#: PDFRemittanceAdvice.php:48 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358 +#: PDFRemittanceAdvice.php:48 PDFSalesBySalesperson.php:65 +#: PDFWeeklyOrders.php:61 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358 #: PricesBasedOnMarkUp.php:219 PricesBasedOnMarkUp.php:358 #: PrintCustStatements.php:46 PrintCustTrans.php:63 PrintCustTrans.php:66 #: PrintCustTransPortrait.php:62 PrintCustTransPortrait.php:65 @@ -2458,7 +2462,8 @@ #: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413 #: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108 #: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:173 -#: PDFOrdersInvoiced.php:377 POReport.php:762 POReport.php:1449 +#: PDFOrdersInvoiced.php:377 PDFSalesBySalesperson.php:87 +#: PDFWeeklyOrders.php:83 POReport.php:762 POReport.php:1449 #: PrintCustTrans.php:896 PrintCustTrans.php:985 PrintCustTrans.php:1034 #: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047 #: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:155 @@ -2646,7 +2651,7 @@ #: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415 #: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76 #: SelectCompletedOrder.php:506 SelectOrderItems.php:1475 -#: SelectOrderItems.php:1638 SelectQASamples.php:293 SelectSalesOrder.php:561 +#: SelectOrderItems.php:1638 SelectQASamples.php:300 SelectSalesOrder.php:561 #: SelectWorkOrder.php:220 Shipt_Select.php:192 TestPlanResults.php:178 #: TopItems.php:174 includes/PDFTopItemsHeader.inc:54 msgid "On Hand" @@ -2781,14 +2786,14 @@ #: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190 -#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153 +#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153 #: WorkOrderEntry.php:701 WorkOrderIssue.php:732 msgid "Enter text extracts in the" msgstr "" #: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190 -#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153 +#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153 #: WorkOrderEntry.php:701 WorkOrderIssue.php:732 msgid "description" msgstr "" @@ -2806,7 +2811,7 @@ #: SelectCreditItems.php:1004 SelectCustomer.php:274 SelectCustomer.php:284 #: SelectCustomer.php:293 SelectCustomer.php:303 SelectCustomer.php:350 #: SelectGLAccount.php:79 SelectOrderItems.php:569 SelectOrderItems.php:572 -#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:273 +#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:280 #: SelectSalesOrder.php:544 SelectSupplier.php:231 SelectWorkOrder.php:206 #: SellThroughSupport.php:202 Shipt_Select.php:174 SuppFixedAssetChgs.php:126 #: SupplierPriceList.php:49 SupplierPriceList.php:406 @@ -2818,7 +2823,7 @@ #: BOMInquiry.php:29 BOMs.php:899 MRPDemands.php:339 #: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195 -#: SelectQASamples.php:273 Shipt_Select.php:174 TestPlanResults.php:158 +#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158 #: WorkOrderEntry.php:706 WorkOrderIssue.php:737 msgid "Enter extract of the" msgstr "" @@ -2830,7 +2835,7 @@ #: SalesInquiry.php:769 SalesInquiry.php:780 SalesInquiry.php:800 #: SalesInquiry.php:826 SalesInquiry.php:845 SalesInquiry.php:955 #: SalesInquiry.php:1113 SalesInquiry.php:1210 SalesInquiry.php:1228 -#: SelectProduct.php:537 SelectQASamples.php:273 Shipt_Select.php:174 +#: SelectProduct.php:537 SelectQASamples.php:280 Shipt_Select.php:174 #: StockAdjustments.php:141 StockAdjustments.php:430 StockCounts.php:141 #: StockCounts.php:167 StockCounts.php:213 StockMovements.php:36 #: StockReorderLevel.php:51 StockStatus.php:62 StockTransfers.php:48 @@ -2857,7 +2862,7 @@ #: BOMInquiry.php:47 BOMs.php:833 ContractBOM.php:52 MRPDemands.php:56 #: MRPReport.php:578 PO_Items.php:852 PO_SelectOSPurchOrder.php:65 #: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97 -#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:174 +#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:176 #: SelectSalesOrder.php:876 SelectWorkOrder.php:51 Shipt_Select.php:61 #: SupplierPriceList.php:76 SupplierTenderCreate.php:731 #: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:100 @@ -2886,10 +2891,10 @@ #: InternalStockRequest.php:630 InventoryValuation.php:197 MRPReport.php:752 #: NoSalesItems.php:197 OffersReceived.php:109 PO_Items.php:1190 #: PO_SelectOSPurchOrder.php:266 PO_SelectPurchOrder.php:217 -#: ProductSpecs.php:164 ProductSpecs.php:385 QATests.php:251 QATests.php:392 +#: ProductSpecs.php:166 ProductSpecs.php:387 QATests.php:253 QATests.php:394 #: SelectCompletedOrder.php:509 SelectCreditItems.php:1022 #: SelectOrderItems.php:1474 SelectOrderItems.php:1637 SelectProduct.php:131 -#: SelectProduct.php:758 SelectQASamples.php:294 SelectSalesOrder.php:562 +#: SelectProduct.php:758 SelectQASamples.php:301 SelectSalesOrder.php:562 #: SelectWorkOrder.php:221 Shipments.php:402 Shipments.php:489 #: Shipt_Select.php:194 StockLocTransferReceive.php:463 #: SupplierPriceList.php:272 SupplierTenderCreate.php:854 @@ -3165,7 +3170,7 @@ msgstr "" #: BOMs.php:436 ConfirmDispatch_Invoice.php:1050 CounterReturns.php:1074 -#: CounterSales.php:1474 Credit_Invoice.php:813 Credit_Invoice.php:843 +#: CounterSales.php:1474 Credit_Invoice.php:812 Credit_Invoice.php:842 #: SelectCreditItems.php:1494 StockClone.php:847 StockClone.php:849 #: Stocks.php:1181 Stocks.php:1183 api/api_debtortransactions.php:753 #: api/api_salesorders.php:920 @@ -3668,7 +3673,7 @@ msgstr "" #: CompanyPreferences.php:468 ConfirmDispatch_Invoice.php:654 -#: ConfirmDispatch_Invoice.php:1706 Credit_Invoice.php:1621 CustItem.php:452 +#: ConfirmDispatch_Invoice.php:1706 Credit_Invoice.php:1620 CustItem.php:452 #: FixedAssetItems.php:127 FixedAssetItems.php:653 GLBudgets.php:240 #: GLTags.php:68 GoodsReceived.php:257 GoodsReceived.php:263 #: GoodsReceived.php:270 GoodsReceived.php:771 ImportBankTransAnalysis.php:154 @@ -3815,13 +3820,13 @@ #: CustomerReceipt.php:1174 Customers.php:25 Customers.php:348 #: CustomerTransInquiry.php:101 Dashboard.php:53 Dashboard.php:657 #: DeliveryDetails.php:855 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:292 -#: PDFOrderStatus.php:293 PricesByCost.php:154 SalesGraph.php:188 -#: SalesTopCustomersInquiry.php:214 SelectCompletedOrder.php:556 -#: SelectContract.php:148 SelectCreditItems.php:242 SelectCustomer.php:24 -#: SelectCustomer.php:210 SelectOrderItems.php:594 -#: SelectRecurringSalesOrder.php:91 SelectSalesOrder.php:701 -#: SelectSalesOrder.php:718 SellThroughSupport.php:262 -#: StockLocMovements.php:93 StockMovements.php:102 +#: PDFOrderStatus.php:293 PDFSalesBySalesperson.php:83 PDFWeeklyOrders.php:79 +#: PricesByCost.php:154 SalesGraph.php:188 SalesTopCustomersInquiry.php:214 +#: SelectCompletedOrder.php:556 SelectContract.php:148 +#: SelectCreditItems.php:242 SelectCustomer.php:24 SelectCustomer.php:210 +#: SelectOrderItems.php:594 SelectRecurringSalesOrder.php:91 +#: SelectSalesOrder.php:701 SelectSalesOrder.php:718 +#: SellThroughSupport.php:262 StockLocMovements.php:93 StockMovements.php:102 #: includes/PDFAgedDebtorsPageHeader.inc:48 #: includes/PDFBankingSummaryPageHeader.inc:56 #: includes/PDFCustTransListingPageHeader.inc:48 @@ -3916,7 +3921,8 @@ msgstr "" #: ConfirmDispatch_Invoice.php:299 GoodsReceived.php:102 GoodsReceived.php:106 -#: PDFOrdersInvoiced.php:336 PDFOrderStatus.php:338 Shipments.php:401 +#: PDFOrdersInvoiced.php:336 PDFOrderStatus.php:338 +#: PDFSalesBySalesperson.php:104 PDFWeeklyOrders.php:101 Shipments.php:401 #: Shipments.php:488 msgid "Ordered" msgstr "" @@ -4116,12 +4122,12 @@ msgid "Please remedy this" msgstr "" -#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:536 +#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:535 #: GoodsReceived.php:282 msgid "The company information and preferences could not be retrieved" msgstr "" -#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:536 +#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:535 #: GoodsReceived.php:282 msgid "see your system administrator" msgstr "" @@ -4224,14 +4230,14 @@ #: CounterSales.php:1576 CounterSales.php:1597 CounterSales.php:1762 #: CounterSales.php:1784 CounterSales.php:1809 CounterSales.php:1830 #: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:208 -#: Credit_Invoice.php:595 Credit_Invoice.php:638 Credit_Invoice.php:655 -#: Credit_Invoice.php:671 Credit_Invoice.php:720 Credit_Invoice.php:733 -#: Credit_Invoice.php:849 Credit_Invoice.php:859 Credit_Invoice.php:938 -#: Credit_Invoice.php:953 Credit_Invoice.php:970 Credit_Invoice.php:980 -#: Credit_Invoice.php:995 Credit_Invoice.php:1040 Credit_Invoice.php:1082 -#: Credit_Invoice.php:1124 Credit_Invoice.php:1146 Credit_Invoice.php:1320 -#: Credit_Invoice.php:1360 Credit_Invoice.php:1387 Credit_Invoice.php:1408 -#: Credit_Invoice.php:1437 Credit_Invoice.php:1463 Credit_Invoice.php:1489 +#: Credit_Invoice.php:594 Credit_Invoice.php:637 Credit_Invoice.php:654 +#: Credit_Invoice.php:670 Credit_Invoice.php:719 Credit_Invoice.php:732 +#: Credit_Invoice.php:848 Credit_Invoice.php:858 Credit_Invoice.php:937 +#: Credit_Invoice.php:952 Credit_Invoice.php:969 Credit_Invoice.php:979 +#: Credit_Invoice.php:994 Credit_Invoice.php:1039 Credit_Invoice.php:1081 +#: Credit_Invoice.php:1123 Credit_Invoice.php:1145 Credit_Invoice.php:1319 +#: Credit_Invoice.php:1359 Credit_Invoice.php:1386 Credit_Invoice.php:1407 +#: Credit_Invoice.php:1436 Credit_Invoice.php:1462 Credit_Invoice.php:1488 #: GoodsReceived.php:301 GoodsReceived.php:409 GoodsReceived.php:450 #: GoodsReceived.php:480 GoodsReceived.php:508 GoodsReceived.php:541 #: GoodsReceived.php:559 GoodsReceived.php:588 GoodsReceived.php:605 @@ -4347,15 +4353,15 @@ #: CounterSales.php:1438 CounterSales.php:1480 CounterSales.php:1490 #: CounterSales.php:1576 CounterSales.php:1597 CounterSales.php:1762 #: CounterSales.php:1784 CounterSales.php:1809 CounterSales.php:1830 -#: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:595 -#: Credit_Invoice.php:638 Credit_Invoice.php:655 Credit_Invoice.php:671 -#: Credit_Invoice.php:720 Credit_Invoice.php:733 Credit_Invoice.php:849 -#: Credit_Invoice.php:859 Credit_Invoice.php:938 Credit_Invoice.php:953 -#: Credit_Invoice.php:970 Credit_Invoice.php:980 Credit_Invoice.php:995 -#: Credit_Invoice.php:1040 Credit_Invoice.php:1082 Credit_Invoice.php:1124 -#: Credit_Invoice.php:1146 Credit_Invoice.php:1320 Credit_Invoice.php:1360 -#: Credit_Invoice.php:1387 Credit_Invoice.php:1408 Credit_Invoice.php:1437 -#: Credit_Invoice.php:1463 Credit_Invoice.php:1489 GoodsReceived.php:301 +#: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:594 +#: Credit_Invoice.php:637 Credit_Invoice.php:654 Credit_Invoice.php:670 +#: Credit_Invoice.php:719 Credit_Invoice.php:732 Credit_Invoice.php:848 +#: Credit_Invoice.php:858 Credit_Invoice.php:937 Credit_Invoice.php:952 +#: Credit_Invoice.php:969 Credit_Invoice.php:979 Credit_Invoice.php:994 +#: Credit_Invoice.php:1039 Credit_Invoice.php:1081 Credit_Invoice.php:1123 +#: Credit_Invoice.php:1145 Credit_Invoice.php:1319 Credit_Invoice.php:1359 +#: Credit_Invoice.php:1386 Credit_Invoice.php:1407 Credit_Invoice.php:1436 +#: Credit_Invoice.php:1462 Credit_Invoice.php:1488 GoodsReceived.php:301 #: GoodsReceived.php:409 GoodsReceived.php:450 GoodsReceived.php:480 #: GoodsReceived.php:508 GoodsReceived.php:541 GoodsReceived.php:559 #: GoodsReceived.php:588 GoodsReceived.php:605 GoodsReceived.php:695 @@ -4461,13 +4467,13 @@ msgstr "" #: ConfirmDispatch_Invoice.php:834 CounterReturns.php:967 -#: CounterSales.php:1368 Credit_Invoice.php:655 +#: CounterSales.php:1368 Credit_Invoice.php:654 #: RecurringSalesOrdersProcess.php:696 SelectCreditItems.php:1179 msgid "The debtor transaction taxes records could not be inserted because" msgstr "" #: ConfirmDispatch_Invoice.php:835 CounterReturns.php:968 -#: CounterSales.php:1369 Credit_Invoice.php:656 +#: CounterSales.php:1369 Credit_Invoice.php:655 #: RecurringSalesOrdersProcess.php:697 SelectCreditItems.php:1180 msgid "" "The following SQL to insert the debtor transaction taxes record was used" @@ -4483,7 +4489,7 @@ msgstr "" #: ConfirmDispatch_Invoice.php:867 ConfirmDispatch_Invoice.php:944 -#: Credit_Invoice.php:721 RecurringSalesOrdersProcess.php:324 +#: Credit_Invoice.php:720 RecurringSalesOrdersProcess.php:324 msgid "The following SQL to update the sales order detail record was used" msgstr "" @@ -4512,12 +4518,12 @@ msgstr "" #: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1004 -#: CounterSales.php:1405 Credit_Invoice.php:733 SelectCreditItems.php:1425 +#: CounterSales.php:1405 Credit_Invoice.php:732 SelectCreditItems.php:1425 msgid "Location stock record could not be updated because" msgstr "" #: ConfirmDispatch_Invoice.php:983 ContractCosting.php:338 -#: CounterReturns.php:1005 CounterSales.php:1406 Credit_Invoice.php:734 +#: CounterReturns.php:1005 CounterSales.php:1406 Credit_Invoice.php:733 #: GoodsReceived.php:509 ReverseGRN.php:221 SelectCreditItems.php:1426 #: StockTransfers.php:438 StockTransfers.php:447 SupplierInvoice.php:276 #: WorkOrderIssue.php:181 WorkOrderReceive.php:344 WorkOrderReceive.php:453 @@ -4525,12 +4531,12 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1000 CounterReturns.php:1023 -#: CounterSales.php:1424 Credit_Invoice.php:754 SelectCreditItems.php:1446 +#: CounterSales.php:1424 Credit_Invoice.php:753 SelectCreditItems.php:1446 msgid "Could not retrieve assembly components from the database for" msgstr "" #: ConfirmDispatch_Invoice.php:1000 CounterReturns.php:1023 -#: CounterSales.php:1424 Credit_Invoice.php:754 EDIMessageFormat.php:43 +#: CounterSales.php:1424 Credit_Invoice.php:753 EDIMessageFormat.php:43 #: EDISendInvoices.php:105 EDISendInvoices_Reece.php:185 #: FixedAssetCategories.php:94 FixedAssetCategories.php:113 #: PricesBasedOnMarkUp.php:340 PricesBasedOnMarkUp.php:356 @@ -4550,6 +4556,7 @@ #: DeliveryDetails.php:621 DeliveryDetails.php:627 DeliveryDetails.php:634 #: DeliveryDetails.php:811 DeliveryDetails.php:817 DeliveryDetails.php:840 #: MRPReport.php:412 PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292 +#: PDFSalesBySalesperson.php:82 PDFWeeklyOrders.php:78 #: SelectCompletedOrder.php:555 SelectContract.php:143 #: SelectOrderItems.php:686 SelectProduct.php:367 Shipments.php:399 #: Shipments.php:486 SuppCreditGRNs.php:190 SuppInvGRNs.php:256 @@ -4560,12 +4567,12 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1056 CounterReturns.php:1080 -#: CounterSales.php:1480 Credit_Invoice.php:849 SelectCreditItems.php:1501 +#: CounterSales.php:1480 Credit_Invoice.php:848 SelectCreditItems.php:1501 msgid "Stock movement records for the assembly components of" msgstr "" #: ConfirmDispatch_Invoice.php:1056 CounterReturns.php:1080 -#: CounterSales.php:1480 Credit_Invoice.php:849 SelectCreditItems.php:1501 +#: CounterSales.php:1480 Credit_Invoice.php:848 SelectCreditItems.php:1501 #: ShipmentCosting.php:397 SupplierAllocations.php:139 #: includes/PDFPaymentRun_PymtFooter.php:57 #: includes/PDFPaymentRun_PymtFooter.php:88 @@ -4577,14 +4584,14 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1057 CounterReturns.php:1081 -#: CounterSales.php:1481 Credit_Invoice.php:850 SelectCreditItems.php:1502 +#: CounterSales.php:1481 Credit_Invoice.php:849 SelectCreditItems.php:1502 msgid "" "The following SQL to insert the assembly components stock movement records " "was used" msgstr "" #: ConfirmDispatch_Invoice.php:1066 CounterReturns.php:1090 -#: CounterSales.php:1490 Credit_Invoice.php:859 SelectCreditItems.php:1511 +#: CounterSales.php:1490 Credit_Invoice.php:858 SelectCreditItems.php:1511 msgid "" "Location stock record could not be updated for an assembly component because" msgstr "" @@ -4597,16 +4604,16 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1154 CounterReturns.php:1174 -#: CounterSales.php:1576 Credit_Invoice.php:938 Credit_Invoice.php:1040 -#: Credit_Invoice.php:1082 Credit_Invoice.php:1124 +#: CounterSales.php:1576 Credit_Invoice.php:937 Credit_Invoice.php:1039 +#: Credit_Invoice.php:1081 Credit_Invoice.php:1123 #: RecurringSalesOrdersProcess.php:365 ReverseGRN.php:251 #: SelectCreditItems.php:1248 SelectCreditItems.php:1323 msgid "Stock movement records could not be inserted because" msgstr "" #: ConfirmDispatch_Invoice.php:1155 ContractCosting.php:369 -#: CounterReturns.php:1175 CounterSales.php:1577 Credit_Invoice.php:939 -#: Credit_Invoice.php:1041 Credit_Invoice.php:1083 GoodsReceived.php:542 +#: CounterReturns.php:1175 CounterSales.php:1577 Credit_Invoice.php:938 +#: Credit_Invoice.php:1040 Credit_Invoice.php:1082 GoodsReceived.php:542 #: RecurringSalesOrdersProcess.php:366 ReverseGRN.php:252 #: SelectCreditItems.php:1324 SupplierInvoice.php:309 WorkOrderIssue.php:214 #: WorkOrderReceive.php:375 WorkOrderReceive.php:485 @@ -4621,21 +4628,21 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1176 CounterReturns.php:1196 -#: CounterSales.php:1598 Credit_Invoice.php:1147 +#: CounterSales.php:1598 Credit_Invoice.php:1146 #: RecurringSalesOrdersProcess.php:387 SelectCreditItems.php:1345 msgid "" "The following SQL to insert the stock movement tax detail records was used" msgstr "" -#: ConfirmDispatch_Invoice.php:1192 Credit_Invoice.php:970 -#: Credit_Invoice.php:980 SelectCreditItems.php:1389 StockAdjustments.php:267 +#: ConfirmDispatch_Invoice.php:1192 Credit_Invoice.php:969 +#: Credit_Invoice.php:979 SelectCreditItems.php:1389 StockAdjustments.php:267 #: StockAdjustments.php:285 StockLocTransferReceive.php:143 #: StockTransfers.php:276 StockTransfers.php:391 msgid "The serial stock item record could not be updated because" msgstr "" -#: ConfirmDispatch_Invoice.php:1193 Credit_Invoice.php:971 -#: Credit_Invoice.php:981 SelectCreditItems.php:1390 +#: ConfirmDispatch_Invoice.php:1193 Credit_Invoice.php:970 +#: Credit_Invoice.php:980 SelectCreditItems.php:1390 #: SelectCreditItems.php:1620 StockAdjustments.php:268 #: StockAdjustments.php:286 StockLocTransferReceive.php:144 #: StockLocTransferReceive.php:158 StockLocTransferReceive.php:260 @@ -4644,7 +4651,7 @@ msgid "The following SQL to update the serial stock item record was used" msgstr "" -#: ConfirmDispatch_Invoice.php:1207 Credit_Invoice.php:995 +#: ConfirmDispatch_Invoice.php:1207 Credit_Invoice.php:994 #: GoodsReceived.php:605 SelectCreditItems.php:1404 StockAdjustments.php:301 #: StockLocTransferReceive.php:176 StockLocTransferReceive.php:290 #: StockTransfers.php:312 StockTransfers.php:425 WorkOrderIssue.php:250 @@ -4652,7 +4659,7 @@ msgid "The serial stock movement record could not be inserted because" msgstr "" -#: ConfirmDispatch_Invoice.php:1208 Credit_Invoice.php:996 +#: ConfirmDispatch_Invoice.php:1208 Credit_Invoice.php:995 #: GoodsReceived.php:606 StockAdjustments.php:302 #: StockLocTransferReceive.php:177 StockLocTransferReceive.php:291 #: StockTransfers.php:313 StockTransfers.php:426 WorkOrderIssue.php:251 @@ -4667,7 +4674,7 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1253 CounterReturns.php:1241 -#: CounterSales.php:1680 Credit_Invoice.php:1178 +#: CounterSales.php:1680 Credit_Invoice.php:1177 #: RecurringSalesOrdersProcess.php:426 SelectCreditItems.php:1678 #: api/api_salesorders.php:1027 msgid "SQL to count the no of sales analysis records" @@ -4679,13 +4686,13 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1309 CounterReturns.php:1299 -#: CounterSales.php:1738 Credit_Invoice.php:1290 +#: CounterSales.php:1738 Credit_Invoice.php:1289 #: RecurringSalesOrdersProcess.php:485 SelectCreditItems.php:1788 msgid "The following SQL to insert the sales analysis record was used" msgstr "" #: ConfirmDispatch_Invoice.php:1334 CounterReturns.php:1323 -#: CounterSales.php:1762 Credit_Invoice.php:1320 +#: CounterSales.php:1762 Credit_Invoice.php:1319 msgid "The cost of sales GL posting could not be inserted because" msgstr "" @@ -4698,9 +4705,9 @@ #: CounterReturns.php:1346 CounterReturns.php:1371 CounterReturns.php:1392 #: CounterReturns.php:1441 CounterSales.php:1763 CounterSales.php:1785 #: CounterSales.php:1810 CounterSales.php:1831 CounterSales.php:1880 -#: Credit_Invoice.php:1321 Credit_Invoice.php:1361 Credit_Invoice.php:1388 -#: Credit_Invoice.php:1409 Credit_Invoice.php:1438 Credit_Invoice.php:1464 -#: Credit_Invoice.php:1490 RecurringSalesOrdersProcess.php:513 +#: Credit_Invoice.php:1320 Credit_Invoice.php:1360 Credit_Invoice.php:1387 +#: Credit_Invoice.php:1408 Credit_Invoice.php:1437 Credit_Invoice.php:1463 +#: Credit_Invoice.php:1489 RecurringSalesOrdersProcess.php:513 #: RecurringSalesOrdersProcess.php:540 RecurringSalesOrdersProcess.php:633 #: SelectCreditItems.php:1822 SelectCreditItems.php:1848 #: SelectCreditItems.php:1871 SelectCreditItems.php:1902 @@ -4808,7 +4815,7 @@ msgstr "" #: ConfirmDispatch_Invoice.php:1631 CounterReturns.php:1440 -#: CounterSales.php:1879 Credit_Invoice.php:1489 +#: CounterSales.php:1879 Credit_Invoice.php:1488 #: RecurringSalesOrdersProcess.php:579 SelectCreditItems.php:1993 msgid "The tax GL posting could not be inserted because" msgstr "" @@ -4830,7 +4837,7 @@ #: DeliveryDetails.php:602 DeliveryDetails.php:606 DeliveryDetails.php:828 #: DeliveryDetails.php:832 GLBalanceSheet.php:22 GLJournalInquiry.php:113 #: GLProfit_Loss.php:25 GLTagProfit_Loss.php:25 GLTagProfit_Loss.php:523 -#: GLTags.php:54 PDFCOA.php:29 PDFPrintLabel.php:67 PDFProdSpec.php:18 +#: GLTags.php:54 PDFCOA.php:29 PDFPrintLabel.php:67 PDFProdSpec.php:19 #: PDFStockLocTransfer.php:29 PDFWOPrint.php:586 PDFWOPrint.php:590 #: PDFWOPrint.php:593 PDFWOPrint.php:669 PDFWOPrint.php:673 PDFWOPrint.php:676 #: PO_OrderDetails.php:143 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:399 @@ -6197,8 +6204,8 @@ "Could not determine if the part being returned was a kitset or not because" msgstr "" -#: CounterReturns.php:673 CounterSales.php:755 PricesByCost.php:159 -#: SelectOrderItems.php:1311 +#: CounterReturns.php:673 CounterSales.php:755 PDFWeeklyOrders.php:86 +#: PricesByCost.php:159 SelectOrderItems.php:1311 msgid "GP %" msgstr "" @@ -6247,7 +6254,7 @@ msgid "Contact Email" msgstr "" -#: CounterReturns.php:787 CounterSales.php:884 Credit_Invoice.php:1594 +#: CounterReturns.php:787 CounterSales.php:884 Credit_Invoice.php:1593 #: DeliveryDetails.php:1117 SelectCreditItems.php:924 msgid "Sales person" msgstr "" @@ -6356,12 +6363,12 @@ "Cannot insert the customer allocation of the receipt to the invoice because" msgstr "" -#: CounterReturns.php:1602 Credit_Invoice.php:1505 SelectCreditItems.php:2008 +#: CounterReturns.php:1602 Credit_Invoice.php:1504 SelectCreditItems.php:2008 msgid "Credit Note number" msgstr "" -#: CounterReturns.php:1607 CounterReturns.php:1609 Credit_Invoice.php:1507 -#: Credit_Invoice.php:1509 +#: CounterReturns.php:1607 CounterReturns.php:1609 Credit_Invoice.php:1506 +#: Credit_Invoice.php:1508 msgid "Print this credit note" msgstr "" @@ -6565,13 +6572,12 @@ #: CounterSales.php:909 CustomerInquiry.php:254 CustomerTransInquiry.php:104 #: DeliveryDetails.php:1105 OrderDetails.php:125 PO_Header.php:1155 #: PO_OrderDetails.php:156 RecurringSalesOrders.php:419 -#: SelectQASamples.php:395 SelectQASamples.php:500 SelectQASamples.php:560 +#: SelectQASamples.php:402 SelectQASamples.php:507 SelectQASamples.php:567 #: SpecialOrder.php:613 SupplierCredit.php:602 SupplierInquiry.php:213 #: SupplierInvoice.php:952 SupplierTransInquiry.php:107 #: TestPlanResults.php:285 TestPlanResults.php:760 WorkOrderEntry.php:603 -#: Z_ImportChartOfAccounts.php:28 Z_ImportGLAccountGroups.php:26 -#: Z_ImportGLAccountSections.php:29 Z_ImportPartCodes.php:31 -#: includes/PDFOrderPageHeader_generic.inc:58 +#: Z_ImportGLAccountGroups.php:26 Z_ImportGLAccountSections.php:29 +#: Z_ImportPartCodes.php:31 includes/PDFOrderPageHeader_generic.inc:58 #: includes/PO_PDFOrderPageHeader.inc:65 ../webSHOP/Checkout.php:583 msgid "Comments" msgstr "" @@ -6912,171 +6918,171 @@ msgid "Credit Totals" msgstr "" -#: Credit_Invoice.php:499 +#: Credit_Invoice.php:498 msgid "" "Failed to retrieve salesoderdetails to compare if the order has been " "invoiced and that it is possible that the credit note may not already have " "been done" msgstr "" -#: Credit_Invoice.php:503 +#: Credit_Invoice.php:502 msgid "The credit quantity for the line for" msgstr "" -#: Credit_Invoice.php:514 SelectCreditItems.php:952 +#: Credit_Invoice.php:513 SelectCreditItems.php:952 msgid "" "The GL code to write off the credit value to must be specified. Please " "select the appropriate GL code for the selection box" msgstr "" -#: Credit_Invoice.php:595 +#: Credit_Invoice.php:594 msgid "" "The alteration to the invoice record to reflect the allocation of the credit " "note to the invoice could not be done because" msgstr "" -#: Credit_Invoice.php:596 +#: Credit_Invoice.php:595 msgid "The following SQL to update the invoice allocation was used" msgstr "" -#: Credit_Invoice.php:638 SelectCreditItems.php:1162 +#: Credit_Invoice.php:637 SelectCreditItems.php:1162 msgid "" "The customer credit note transaction could not be added to the database " "because" msgstr "" -#: Credit_Invoice.php:639 SelectCreditItems.php:1101 +#: Credit_Invoice.php:638 SelectCreditItems.php:1101 #: SelectCreditItems.php:1163 msgid "The following SQL to insert the customer credit note was used" msgstr "" -#: Credit_Invoice.php:671 +#: Credit_Invoice.php:670 msgid "" "The allocation record for the credit note could not be added to the database " "because" msgstr "" -#: Credit_Invoice.php:672 +#: Credit_Invoice.php:671 msgid "" "The following SQL to insert the allocation record for the credit note was " "used" msgstr "" -#: Credit_Invoice.php:720 +#: Credit_Invoice.php:719 msgid "" "The sales order detail record could not be updated for the reduced quantity " "invoiced because" msgstr "" -#: Credit_Invoice.php:776 +#: Credit_Invoice.php:775 msgid "Could not get the current location stock of the assembly component" msgstr "" -#: Credit_Invoice.php:813 Credit_Invoice.php:843 Credit_Invoice.php:898 -#: Credit_Invoice.php:931 Credit_Invoice.php:1033 Credit_Invoice.php:1115 +#: Credit_Invoice.php:812 Credit_Invoice.php:842 Credit_Invoice.php:897 +#: Credit_Invoice.php:930 Credit_Invoice.php:1032 Credit_Invoice.php:1114 msgid "Ex Inv" msgstr "" -#: Credit_Invoice.php:860 +#: Credit_Invoice.php:859 msgid "" "The following SQL to update the components location stock record was used" msgstr "" -#: Credit_Invoice.php:953 +#: Credit_Invoice.php:952 msgid "The serial stock item record could not be selected because" msgstr "" -#: Credit_Invoice.php:954 +#: Credit_Invoice.php:953 msgid "The following SQL to select the serial stock item record was used" msgstr "" -#: Credit_Invoice.php:1074 +#: Credit_Invoice.php:1073 msgid "Written off ex Inv" msgstr "" -#: Credit_Invoice.php:1125 SelectCreditItems.php:1249 +#: Credit_Invoice.php:1124 SelectCreditItems.php:1249 msgid "" "The following SQL to insert the stock movement records for the purpose of " "display on the credit note was used" msgstr "" -#: Credit_Invoice.php:1146 SelectCreditItems.php:1344 +#: Credit_Invoice.php:1145 SelectCreditItems.php:1344 msgid "" "Taxes and rates applicable to this credit note line item could not be " "inserted because" msgstr "" -#: Credit_Invoice.php:1177 SelectCreditItems.php:1677 +#: Credit_Invoice.php:1176 SelectCreditItems.php:1677 msgid "" "The count to check for existing Sales analysis records could not run because" msgstr "" -#: Credit_Invoice.php:1289 SelectCreditItems.php:1787 +#: Credit_Invoice.php:1288 SelectCreditItems.php:1787 msgid "" "The sales analysis record for this credit note could not be added because" msgstr "" -#: Credit_Invoice.php:1360 +#: Credit_Invoice.php:1359 msgid "" "The stock side or write off of the cost of sales GL posting could not be " "inserted because" msgstr "" -#: Credit_Invoice.php:1387 SelectCreditItems.php:1901 +#: Credit_Invoice.php:1386 SelectCreditItems.php:1901 msgid "The credit note GL posting could not be inserted because" msgstr "" -#: Credit_Invoice.php:1408 SelectCreditItems.php:1924 +#: Credit_Invoice.php:1407 SelectCreditItems.php:1924 msgid "The credit note discount GL posting could not be inserted because" msgstr "" -#: Credit_Invoice.php:1437 SelectCreditItems.php:1952 +#: Credit_Invoice.php:1436 SelectCreditItems.php:1952 msgid "" "The total debtor GL posting for the credit note could not be inserted because" msgstr "" -#: Credit_Invoice.php:1463 SelectCreditItems.php:1972 +#: Credit_Invoice.php:1462 SelectCreditItems.php:1972 msgid "" "The freight GL posting for this credit note could not be inserted because" msgstr "" -#: Credit_Invoice.php:1505 GoodsReceived.php:746 SupplierCredit.php:1329 +#: Credit_Invoice.php:1504 GoodsReceived.php:746 SupplierCredit.php:1329 #: SupplierInvoice.php:1883 WorkOrderIssue.php:376 WorkOrderReceive.php:746 #: Z_BottomUpCosts.php:33 msgid "has been processed" msgstr "" -#: Credit_Invoice.php:1520 SelectCreditItems.php:856 +#: Credit_Invoice.php:1519 SelectCreditItems.php:856 msgid "Credit Note Type" msgstr "" -#: Credit_Invoice.php:1524 Credit_Invoice.php:1529 Credit_Invoice.php:1533 +#: Credit_Invoice.php:1523 Credit_Invoice.php:1528 Credit_Invoice.php:1532 #: SelectCreditItems.php:860 SelectCreditItems.php:865 msgid "Goods returned to store" msgstr "" -#: Credit_Invoice.php:1525 Credit_Invoice.php:1528 Credit_Invoice.php:1532 +#: Credit_Invoice.php:1524 Credit_Invoice.php:1527 Credit_Invoice.php:1531 #: SelectCreditItems.php:861 SelectCreditItems.php:864 msgid "Goods written off" msgstr "" -#: Credit_Invoice.php:1526 Credit_Invoice.php:1530 Credit_Invoice.php:1534 +#: Credit_Invoice.php:1525 Credit_Invoice.php:1529 Credit_Invoice.php:1533 msgid "Reverse overcharge" msgstr "" -#: Credit_Invoice.php:1545 +#: Credit_Invoice.php:1544 msgid "Goods returned to location" msgstr "" -#: Credit_Invoice.php:1568 SelectCreditItems.php:902 +#: Credit_Invoice.php:1567 SelectCreditItems.php:902 msgid "Write off the cost of the goods to" msgstr "" -#: Credit_Invoice.php:1615 +#: Credit_Invoice.php:1614 msgid "Credit note text" msgstr "" -#: Credit_Invoice.php:1627 +#: Credit_Invoice.php:1626 msgid "Process Credit" msgstr "" @@ -7692,8 +7698,8 @@ msgid "Customer Stock Description" msgstr "" -#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:161 -#: ProductSpecs.php:236 PurchData.php:763 SellThroughSupport.php:481 +#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:163 +#: ProductSpecs.php:238 PurchData.php:763 SellThroughSupport.php:481 #: Shipments.php:523 StockAdjustments.php:487 TaxGroups.php:393 #: TestPlanResults.php:507 TestPlanResults.php:582 WOSerialNos.php:283 #: WWW_Access.php:244 @@ -7804,7 +7810,7 @@ #: CustLoginSetup.php:150 SMTPServer.php:114 SuppLoginSetup.php:133 #: WWW_Users.php:479 includes/Login.php:99 includes/Login.php:100 #: install/index.php:932 ../webSHOP/Checkout.php:447 -#: ../webSHOP/Register.php:612 ../webSHOP/includes/header.php:204 +#: ../webSHOP/Register.php:612 ../webSHOP/includes/header.php:205 msgid "Password" msgstr "" @@ -8468,7 +8474,7 @@ msgstr "" #: CustomerBranches.php:733 CustomerBranches.php:756 DailySalesInquiry.php:40 -#: SalesPeople.php:179 WWW_Users.php:308 +#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:308 msgid "Salesperson" msgstr "" @@ -9813,7 +9819,7 @@ #: PO_SelectPurchOrder.php:116 PrintCheque.php:50 PrintCheque.php:175 #: SelectCompletedOrder.php:77 SelectCompletedOrder.php:82 #: SelectCompletedOrder.php:88 SelectCompletedOrder.php:236 -#: SelectContract.php:34 SelectQASamples.php:240 SelectSalesOrder.php:442 +#: SelectContract.php:34 SelectQASamples.php:248 SelectSalesOrder.php:442 #: SelectSalesOrder.php:446 SelectWorkOrder.php:131 Shipt_Select.php:48 #: StockClone.php:1064 StockMovements.php:62 Stocks.php:392 Stocks.php:1398 #: TestPlanResults.php:125 includes/PDFBOMListingPageHeader.inc:21 @@ -9872,9 +9878,9 @@ msgid "Show Daily Sales For The Selected Month" msgstr "" -#: DailySalesInquiry.php:110 SalesByTypePeriodInquiry.php:348 -#: SalesCategoryPeriodInquiry.php:158 SalesTopCustomersInquiry.php:207 -#: SalesTopItemsInquiry.php:212 +#: DailySalesInquiry.php:110 PDFWeeklyOrders.php:172 +#: SalesByTypePeriodInquiry.php:348 SalesCategoryPeriodInquiry.php:158 +#: SalesTopCustomersInquiry.php:207 SalesTopItemsInquiry.php:212 msgid "The sales data could not be retrieved because" msgstr "" @@ -9934,9 +9940,9 @@ msgstr "" #: Dashboard.php:16 Dashboard.php:25 Dashboard.php:34 Dashboard.php:43 -#: ProductSpecs.php:77 ProductSpecs.php:280 ProductSpecs.php:315 -#: QATests.php:108 SalesPeople.php:133 SelectQASamples.php:85 -#: SelectQASamples.php:99 TestPlanResults.php:356 TestPlanResults.php:435 +#: ProductSpecs.php:78 ProductSpecs.php:282 ProductSpecs.php:317 +#: QATests.php:110 SalesPeople.php:133 SelectQASamples.php:87 +#: SelectQASamples.php:101 TestPlanResults.php:356 TestPlanResults.php:435 #: TestPlanResults.php:476 TestPlanResults.php:622 TestPlanResults.php:675 #: TestPlanResults.php:692 msgid "The SQL that was used and failed was" @@ -10034,7 +10040,7 @@ msgstr "" #: Dashboard.php:656 ../webSHOP/includes/Functions.php:63 -#: ../webSHOP/includes/header.php:191 +#: ../webSHOP/includes/header.php:192 msgid "View Order" msgstr "" @@ -10044,8 +10050,9 @@ msgstr "" #: Dashboard.php:660 FTP_RadioBeacon.php:54 MRPReschedules.php:196 -#: POReport.php:540 POReport.php:626 POReport.php:1306 POReport.php:1357 -#: POReport.php:1514 PO_SelectOSPurchOrder.php:510 PO_SelectPurchOrder.php:436 +#: PDFSalesBySalesperson.php:84 PDFWeeklyOrders.php:80 POReport.php:540 +#: POReport.php:626 POReport.php:1306 POReport.php:1357 POReport.php:1514 +#: PO_SelectOSPurchOrder.php:510 PO_SelectPurchOrder.php:436 #: PrintCustTrans.php:808 PrintCustTransPortrait.php:856 SalesInquiry.php:827 #: SalesInquiry.php:846 SalesInquiry.php:1086 SelectCompletedOrder.php:559 #: SelectSalesOrder.php:704 includes/PDFOrderPageHeader_generic.inc:77 @@ -10674,7 +10681,8 @@ msgstr "" #: DiscountCategories.php:222 InventoryPlanningPrefSupplier.php:72 -#: PDFCOA.php:64 SalesCategories.php:157 SalesCategories.php:508 +#: PDFCOA.php:64 PDFSalesBySalesperson.php:85 PDFWeeklyOrders.php:81 +#: SalesCategories.php:157 SalesCategories.php:508 #: SalesTopItemsInquiry.php:220 SelectWorkOrder.php:333 #: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:400 #: Shipments.php:487 StockUsage.php:60 SuppCreditGRNs.php:290 @@ -11346,7 +11354,7 @@ msgstr "" #: EmailConfirmation.php:43 FTP_RadioBeacon.php:178 PDFCOA.php:81 -#: PDFPickingList.php:224 PDFProdSpec.php:64 PDFQuotation.php:37 +#: PDFPickingList.php:224 PDFProdSpec.php:65 PDFQuotation.php:37 #: PDFQuotation.php:123 PDFQuotationPortrait.php:39 #: PDFQuotationPortrait.php:125 PDFWOPrint.php:144 PDFWOPrint.php:264 #: PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209 @@ -11824,10 +11832,10 @@ msgid "Date Purchased" msgstr "" -#: FixedAssetDepreciation.php:93 PricesByCost.php:158 SalesAnalReptCols.php:36 -#: SalesAnalReptCols.php:38 SelectProduct.php:195 SelectProduct.php:331 -#: ShipmentCosting.php:153 ShipmentCosting.php:154 StockCostUpdate.ph... [truncated message content] |
From: <dai...@us...> - 2015-02-05 23:00:43
|
Revision: 7125 http://sourceforge.net/p/web-erp/reponame/7125 Author: daintree Date: 2015-02-05 23:00:41 +0000 (Thu, 05 Feb 2015) Log Message: ----------- rewrite of Z_ImportChartOfAccounts.php using webERP KISS principles Modified Paths: -------------- trunk/Z_ImportChartOfAccounts.php trunk/doc/Change.log Modified: trunk/Z_ImportChartOfAccounts.php =================================================================== --- trunk/Z_ImportChartOfAccounts.php 2015-02-05 02:12:56 UTC (rev 7124) +++ trunk/Z_ImportChartOfAccounts.php 2015-02-05 23:00:41 UTC (rev 7125) @@ -1,86 +1,137 @@ <?php /* $Id$*/ -//$PageSecurity = 11; - include('includes/session.inc'); -$Title = _('Import Chart of Accounts'); +$Title = _('Import Chart Of Accounts'); include('includes/header.inc'); -include('xmlrpc/lib/xmlrpc.inc'); -include('api/api_errorcodes.php'); +echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . + '/images/maintenance.png" title="' . + _('Import Chart of Accounts from CSV file') . '" />' . ' ' . + _('Import Chart of Accounts from CSV file') . '</p>'; -$weberpuser = $_SESSION['UserID']; -$sql='SELECT password FROM www_users WHERE userid="'.$weberpuser.'"'; -$result=DB_query($sql); -$myrow=DB_fetch_array($result); -$weberppassword = $myrow[0]; +$FieldHeadings = array( + 'Account Code', // 0 'Account Code + 'Description', // 1 'Account Description', + 'Account Group' // 2 'Account Group', +); -$ServerURL = "http://". $_SERVER['HTTP_HOST'].$RootPath."/api/api_xml-rpc.php"; -$DebugLevel = 0; //Set to 0,1, or 2 with 2 being the highest level of debug info +if (isset($_FILES['ChartFile']) and $_FILES['ChartFile']['name']) { //start file processing + //check file info + $FileName = $_FILES['ChartFile']['name']; + $TempName = $_FILES['ChartFile']['tmp_name']; + $FileSize = $_FILES['ChartFile']['size']; + $InputError = 0; -if (isset($_POST['update'])) { - $fp = fopen($_FILES['ImportFile']['tmp_name'], "r"); - $buffer = fgets($fp, 4096); - $FieldNames = explode(',', $buffer); - $SuccessStyle='style="color:green; font-weight:bold"'; - $FailureStyle='style="color:red; font-weight:bold"'; - echo '<table><tr><th>' . _('Account Code') . '</th><th>' . _('Result') . '</th><th>' . _('Comments') . '</th></tr>'; - $successes=0; - $failures=0; - while (!feof ($fp)) { - $buffer = fgets($fp, 4096); - $FieldValues = explode(',', $buffer); - if ($FieldValues[0]!='') { - for ($i=0; $i<sizeof($FieldValues); $i++) { - if (mb_substr($FieldNames[$i],0,6)=='group_' or $FieldNames[$i]=='group_') { - $FieldNames[$i] = mb_substr($FieldNames[$i],0,6); - $FieldValues[$i] = mb_substr($FieldValues[$i], 0, mb_strlen($FieldValues[$i])-1); - $FieldValues[$i] = mb_substr($FieldValues[$i], 0, 30); - } - $AccountDetails[$FieldNames[$i]]=$FieldValues[$i]; - } - $account = php_xmlrpc_encode($AccountDetails); - $user = new xmlrpcval($weberpuser); - $password = new xmlrpcval($weberppassword); + //get file handle + $FileHandle = fopen($TempName, 'r'); - $msg = new xmlrpcmsg("weberp.xmlrpc_InsertGLAccount", array($account, $user, $password)); + //get the header row + $HeadRow = fgetcsv($FileHandle, 10000, ','); - $client = new xmlrpc_client($ServerURL); - $client->setDebug($DebugLevel); + //check for correct number of fields + if ( count($HeadRow) != count($FieldHeadings) ) { + prnMsg (_('File contains') . ' '. count($HeadRow). ' ' . _('columns, expected') . ' '. count($FieldHeadings) . '<br/>' . _('There should be three column headings:') . ' Account Code, Description, Account Group','error'); + fclose($FileHandle); + include('includes/footer.inc'); + exit; + } - $response = $client->send($msg); - $answer = php_xmlrpc_decode($response->value()); - if ($answer[0]==0) { - echo '<tr '.$SuccessStyle.'><td>' . $AccountDetails['accountcode'] . '</td><td>' . 'Success' . '</td></tr>'; - $successes++; - } else { - echo '<tr '.$FailureStyle.'><td>' . $AccountDetails['accountcode'] . '</td><td>' . 'Failure' . '</td><td>'; - for ($i=0; $i<sizeof($answer); $i++) { - echo 'Error no '.$answer[$i].' - '.$ErrorDescription[$answer[$i]] . '<br />'; - } - echo '</td></tr>'; - $failures++; - } - } - unset($AccountDetails); + //test header row field name and sequence + $HeadingColumnNumber = 0; + foreach ($HeadRow as $HeadField) { + if ( trim(mb_strtoupper($HeadField)) != trim(mb_strtoupper($FieldHeadings[$HeadingColumnNumber]))) { + prnMsg (_('The file to import the chart of accounts from contains incorrect column headings') . ' '. mb_strtoupper($HeadField). ' != '. mb_strtoupper($FieldHeadings[$HeadingColumnNumber]). '<br />' . _('There should be three column headings:') . ' Account Code, Description, Account Group','error'); + fclose($FileHandle); + include('includes/footer.inc'); + exit; + } + $HeadingColumnNumber++; } - echo '<tr><td>' . $successes._(' records successfully imported') . '</td></tr>'; - echo '<tr><td>' . $failures._(' records failed to import') . '</td></tr>'; - echo '</table>'; - fclose ($fp); -} else { - prnMsg( _('Select a csv file containing the details of the account codes that you wish to import into webERP. '). '<br />' . - _('The first line must contain the field names that you wish to import. '). - '<a href ="Z_DescribeTable.php?table=chartmaster">' . _('The field names can be found here'). '</a>', 'info'); - echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">'; - echo '<div>'; + + //start database transaction + DB_Txn_Begin(); + + //loop through file rows + $LineNumber = 1; + while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) { + + //check for correct number of fields + $FieldCount = count($myrow); + if ($FieldCount != count($FieldHeadings)){ + prnMsg (count($FieldHeadings) . ' ' . _('fields required') . ', '. $FieldCount. ' ' . _('fields received'),'error'); + fclose($FileHandle); + include('includes/footer.inc'); + exit; + } + + // cleanup the data (csv files often import with empty strings and such) + $AccountCode = mb_strtoupper($myrow[0]); + foreach ($myrow as &$value) { + $value = trim($value); + $value = str_replace('"', '', $value); + } + + //Then check that the account group actually exists + $sql = "SELECT COUNT(group_) FROM chartmaster WHERE group_='" . $myrow[2] . "'"; + $result = DB_query($sql); + $testrow = DB_fetch_row($result); + if ($testrow[0] == 0) { + $InputError = 1; + prnMsg (_('Account Group') . ' "' . $myrow[2]. '" ' . _('does not exist. First enter the account groups you require in webERP before attempting to import the accounts.'),'error'); + } + + if ($InputError !=1){ + + //Insert the chart record + $sql = "INSERT INTO chartmaster (accountcode, + accountname, + group_ + ) VALUES ( + '" . $myrow[0] . "', + '" . $myrow[1] . "', + '" . $myrow[2] . "')"; + + $ErrMsg = _('The general ledger account could not be added because'); + $DbgMsg = _('The SQL that was used to add the general ledger account that failed was'); + $result = DB_query($sql, $ErrMsg, $DbgMsg); + } + + if ($InputError == 1) { //this row failed so exit loop + break; + } + $LineNumber++; + } + + if ($InputError == 1) { //exited loop with errors so rollback + prnMsg(_('Failed on row') . ' '. $LineNumber. '. ' . _('Batch import of the chart of accounts has been rolled back.'),'error'); + DB_Txn_Rollback(); + } else { //all good so commit data transaction + DB_Txn_Commit(); + prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed') . '. ' . _('All general ledger accounts have been added to the chart of accounts'),'success'); + } + + fclose($FileHandle); + //Now create the chartdetails records as necessary for the new chartsmaster records + include('includes/GLPostings.inc'); + +} else { //show file upload form + + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint" enctype="multipart/form-data">'; + echo '<div class="centre">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo '<table><tr><td>' . _('File to import') . '</td>' . - '<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>'; - echo '<div class="centre"><input type="submit" name="update" value="Process" /></div>'; - echo '</div> - </form>'; + echo '<div class="page_help_text">' . + _('This function loads a chart of accounts from a comma separated variable (csv) file.') . '<br />' . + _('The file must contain three columns, and the first row should be the following headers:') . '<br />Account Code, Description, Account Group<br />' . + _('followed by rows containing these three fields for each general ledger account to be uploaded.') . '<br />' . + _('The Account Group field must have a corresponding entry in the account groups table. So these need to be set up first.') . '</div>'; + + echo '<br /><input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' . + _('Upload file') . ': <input name="ChartFile" type="file" /> + <input type="submit" name="submit" value="' . _('Send File') . '" /> + </div> + </form>'; + } include('includes/footer.inc'); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-05 02:12:56 UTC (rev 7124) +++ trunk/doc/Change.log 2015-02-05 23:00:41 UTC (rev 7125) @@ -1,5 +1,7 @@ webERP Change Log -03/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php. + +5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php +3/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php. 3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual. 3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order. 2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed. |
From: <vv...@us...> - 2015-02-05 02:13:03
|
Revision: 7124 http://sourceforge.net/p/web-erp/reponame/7124 Author: vvs2012 Date: 2015-02-05 02:12:56 +0000 (Thu, 05 Feb 2015) Log Message: ----------- explode("\r\n", ...) must use double quotes Modified Paths: -------------- trunk/PrintCustTrans.php trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTrans.php =================================================================== --- trunk/PrintCustTrans.php 2015-02-04 09:15:50 UTC (rev 7123) +++ trunk/PrintCustTrans.php 2015-02-05 02:12:56 UTC (rev 7124) @@ -323,7 +323,7 @@ $YPos -= ($line_height); - $lines=explode('\r\n',htmlspecialchars_decode($myrow2['narrative'])); + $lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative'])); for ($i=0;$i<sizeOf($lines);$i++) { while (mb_strlen($lines[$i])>1) { if ($YPos-$line_height <= $Bottom_Margin) { Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2015-02-04 09:15:50 UTC (rev 7123) +++ trunk/PrintCustTransPortrait.php 2015-02-05 02:12:56 UTC (rev 7124) @@ -388,7 +388,7 @@ } $YPos -= ($FontSize*$lines); - $lines=explode('\r\n',htmlspecialchars_decode($myrow2['narrative'])); + $lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative'])); for ($i=0;$i<sizeOf($lines);$i++) { while (mb_strlen($lines[$i])>1){ if ($YPos-$line_height <= $Bottom_Margin){ @@ -465,7 +465,7 @@ $pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']); $FontSize =8; - $LeftOvers=explode('\r\n',DB_escape_string($myrow['invtext'])); + $LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext'])); for ($i=0;$i<sizeOf($LeftOvers);$i++) { $pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]); } |
From: <dai...@us...> - 2015-02-04 09:15:52
|
Revision: 7123 http://sourceforge.net/p/web-erp/reponame/7123 Author: daintree Date: 2015-02-04 09:15:50 +0000 (Wed, 04 Feb 2015) Log Message: ----------- fix up DB_query calls in QA stuff Modified Paths: -------------- trunk/HistoricalTestResults.php trunk/PDFCOA.php trunk/PDFProdSpec.php trunk/ProductSpecs.php trunk/QATests.php trunk/SelectQASamples.php trunk/doc/Manual/ManualQualityAssurance.html Modified: trunk/HistoricalTestResults.php =================================================================== --- trunk/HistoricalTestResults.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/HistoricalTestResults.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -3,16 +3,20 @@ include('includes/session.inc'); $Title = _('Historical Test Results'); +$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC. +$BookMark = 'QA_HistoricalResults';// Anchor's id in the manual's html document. include('includes/header.inc'); if (isset($_GET['KeyValue'])){ $KeyValue =mb_strtoupper($_GET['KeyValue']); -} elseif(isset($_POST['KeyValue'])){ +} elseif (isset($_POST['KeyValue'])){ $KeyValue =mb_strtoupper($_POST['KeyValue']); +} else { + $KeyValue=''; } if (!isset($_POST['FromDate'])){ - $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 180 days')); + $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-180, Date('Y'))); } if (!isset($_POST['ToDate'])){ $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); @@ -20,13 +24,13 @@ if (!Is_Date($_POST['FromDate'])) { $InputError = 1; prnMsg(_('Invalid From Date'),'error'); - $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 180 days')); -} + $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-180, Date('Y'))); +} if (!Is_Date($_POST['ToDate'])) { $InputError = 1; prnMsg(_('Invalid To Date'),'error'); $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); -} +} $FromDate = FormatDateForSQL($_POST['FromDate']); $ToDate = FormatDateForSQL($_POST['ToDate']); if (isset($Errors)) { @@ -35,12 +39,11 @@ $Errors = array(); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>'; +echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>'; //prompt user for Key Value echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <table class="selection"> @@ -50,30 +53,33 @@ description FROM qasamples LEFT OUTER JOIN stockmaster ON stockmaster.stockid=qasamples.prodspeckey"; - -$ResultSelection=DB_query($SQLSpecSelect, $db); + +$ResultSelection=DB_query($SQLSpecSelect); echo '<td><select name="KeyValue">'; while ($MyRowSelection=DB_fetch_array($ResultSelection)){ if ($MyRowSelection['prodspeckey']==$KeyValue) { - $Selected=' selected="selected" '; + $Selected='selected="selected" '; } else { $Selected=''; } - echo '<option' . $Selected . ' value="' . $MyRowSelection['prodspeckey'] . '">' . $MyRowSelection['prodspeckey'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>'; + echo '<option ' . $Selected . ' value="' . $MyRowSelection['prodspeckey'] . '">' . $MyRowSelection['prodspeckey'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>'; } -echo '</select></td>'; +echo '</select></td>'; echo '</tr> <tr> - <td>'; -echo _('From Sample Date') . ': </td><td><input name="FromDate" size="10" class="date" value="' . $_POST['FromDate'] . '"/></td></tr><tr><td> ' . _('To Sample Date') . ':</td><td> <input name="ToDate" size="10" class="date" value="' . $_POST['ToDate'] . '"/> '; -echo '</td> + <td>' . _('From Sample Date') . ': </td> + <td><input name="FromDate" size="10" class="date" value="' . $_POST['FromDate'] . '"/></td> </tr> + <tr> + <td> ' . _('To Sample Date') . ':</td> + <td> <input name="ToDate" size="10" class="date" value="' . $_POST['ToDate'] . '"/></td> + </tr> </table> </div> <div> - <input type="submit" name="pickspec" value="' . _('Submit') . '" /> + <input type="submit" name="PickSpec" value="' . _('Submit') . '" /> </div> </form>'; @@ -81,9 +87,9 @@ //show header $SQLSpecSelect="SELECT description FROM stockmaster - WHERE stockmaster.stockid='" .$KeyValue. "'"; + WHERE stockmaster.stockid='" . $KeyValue . "'"; -$ResultSelection=DB_query($SQLSpecSelect, $db); +$ResultSelection=DB_query($SQLSpecSelect); $MyRowSelection=DB_fetch_array($ResultSelection); $SQLTests="SELECT sampleresults.testid, sampledate, @@ -92,30 +98,30 @@ identifier, cert, isinspec, - testvalue, + testvalue, name FROM qasamples INNER JOIN sampleresults on sampleresults.sampleid=qasamples.sampleid INNER JOIN qatests ON qatests.testid=sampleresults.testid - WHERE qasamples.prodspeckey='".$KeyValue."' + WHERE qasamples.prodspeckey='" . $KeyValue . "' AND sampleresults.showontestplan='1' - AND sampledate>='".$FromDate."' - AND sampledate <='".$ToDate."'"; - + AND sampledate>='" . $FromDate . "' + AND sampledate <='" . $ToDate . "'"; -$TestResult=DB_query($SQLTests, $db); + +$TestResult=DB_query($SQLTests); $TestsArray=array(); $SamplesArray=array(); $AllResultsArray=array(); $TotResults=0; while ($MyTestRow=DB_fetch_array($TestResult)) { $FormattedSampleID=str_pad($MyTestRow['sampleid'],10,'0',STR_PAD_LEFT); - $testkey=array_search ($MyTestRow['name'] , $TestsArray); + $testkey=array_search ($MyTestRow['name'] , $TestsArray); if ($testkey===false) { $TestsArray[$MyTestRow['name']]=$MyTestRow['name']; } - + $testkey=array_search ($MyTestRow['sampleid'] , $SamplesArray); if ($testkey===false) { $SamplesArray[$FormattedSampleID]=$MyTestRow; Modified: trunk/PDFCOA.php =================================================================== --- trunk/PDFCOA.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/PDFCOA.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -40,7 +40,7 @@ </table> </div> <div> - <input type="submit" name="pickspec" value="' . _('Submit') . '" /> + <input type="submit" name="PickSpec" value="' . _('Submit') . '" /> </div> </form> <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> @@ -57,20 +57,20 @@ ON stockmaster.stockid=qasamples.prodspeckey WHERE cert='1' ORDER BY lotkey"; - - $ResultSelection=DB_query($SQLSpecSelect, $db); + + $ResultSelection=DB_query($SQLSpecSelect); echo '<td><select name="QASampleID" style="font-family: monospace; white-space:pre;">'; echo '<option value="">' . str_pad(_('Lot/Serial'),15,'_'). str_pad(_('Item'),20, '_', STR_PAD_RIGHT). str_pad(_('Description'),20,'_') . '</option>'; while ($MyRowSelection=DB_fetch_array($ResultSelection)){ echo '<option value="' . $MyRowSelection['sampleid'] . '">' . str_pad($MyRowSelection['lotkey'],15, '_', STR_PAD_RIGHT). str_pad($MyRowSelection['prodspeckey'],20,'_') .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>'; } - echo '</select></td>'; + echo '</select></td>'; echo '</tr> </table> </div> <div> - <input type="submit" name="pickspec" value="' . _('Submit') . '" /> + <input type="submit" name="PickSpec" value="' . _('Submit') . '" /> </div> </form>'; include('includes/footer.inc'); @@ -89,7 +89,7 @@ testvalue, sampledate, groupby - FROM qasamples INNER JOIN sampleresults + FROM qasamples INNER JOIN sampleresults ON sampleresults.sampleid=qasamples.sampleid INNER JOIN qatests ON qatests.testid=sampleresults.testid @@ -109,7 +109,7 @@ testvalue, sampledate, groupby - FROM qasamples INNER JOIN sampleresults + FROM qasamples INNER JOIN sampleresults ON sampleresults.sampleid=qasamples.sampleid INNER JOIN qatests ON qatests.testid=sampleresults.testid @@ -119,7 +119,7 @@ AND sampleresults.showoncert='1' ORDER by groupby, sampleresults.testid"; } -$result=DB_query($sql,$db, $ErrMsg); +$result=DB_query($sql,$ErrMsg); //If there are no rows, there's a problem. if (DB_num_rows($result)==0){ @@ -146,7 +146,7 @@ <br />'; include('includes/footer.inc'); exit; -} +} $PaperSize = 'Letter'; if ($QASampleID>'') { $myrow=DB_fetch_array($result); @@ -176,7 +176,7 @@ } $Spec=$myrow['description']; $SampleDate=ConvertSQLDate($myrow['sampledate']); - + foreach($SectionsArray as $row) { if ($myrow['groupby']==$row[0]) { $SectionColSizes=$row[4]; @@ -189,7 +189,7 @@ include('includes/PDFCOAHeader.inc'); $HeaderPrinted=1; } - + if ($CurSection!=$myrow['groupby']) { $SectionHeading=0; if ($CurSection!='' AND $PrintTrailer==1) { @@ -204,7 +204,7 @@ } } } - + if ($SectionHeading==0) { $XPos=65; if ($PrevTrailer>'' AND $PrintTrailer==1) { @@ -254,16 +254,16 @@ $ColWidth=$SectionColSizes[$x]; $ColAlign=$SectionAlign[$x]; switch ($x) { - case 0; + case 0; $DispValue=$myrow['name']; break; - case 1; + case 1; $DispValue=$Value; break; case 2; $DispValue=$myrow['method']; break; - } + } $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,$ColWidth,$FontSize,$DispValue,$ColAlign,1); $XPos+=$ColWidth; $x++; @@ -305,7 +305,7 @@ FROM config WHERE confname='QualityCOAText'"; -$result=DB_query($sql,$db, $ErrMsg); +$result=DB_query($sql, $ErrMsg); $myrow=DB_fetch_array($result); $Disclaimer=$myrow[0]; $LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,500,$FontSize,$Disclaimer); Modified: trunk/PDFProdSpec.php =================================================================== --- trunk/PDFProdSpec.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/PDFProdSpec.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -9,10 +9,11 @@ $SelectedProdSpec=$_GET['KeyValue']; } elseif (isset($_POST['KeyValue'])) { $SelectedProdSpec=$_POST['KeyValue']; +} else { + $SelectedProdSpec=''; } - //Get Out if we have no product specification -If (!isset($SelectedProdSpec) || $SelectedProdSpec==""){ +If (!isset($SelectedProdSpec) OR $SelectedProdSpec==''){ $Title = _('Select Product Specification To Print'); include('includes/header.inc'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . $Title . '</p>'; @@ -27,7 +28,7 @@ </table> </div> <div> - <input type="submit" name="pickspec" value="' . _('Submit') . '" /> + <input type="submit" name="PickSpec" value="' . _('Submit') . '" /> </div> </form> <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> @@ -40,20 +41,20 @@ description FROM prodspecs LEFT OUTER JOIN stockmaster ON stockmaster.stockid=prodspecs.keyval"; - - $ResultSelection=DB_query($SQLSpecSelect, $db); + + $ResultSelection=DB_query($SQLSpecSelect); echo '<td><select name="KeyValue">'; while ($MyRowSelection=DB_fetch_array($ResultSelection)){ echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>'; } - echo '</select></td>'; + echo '</select></td>'; echo '</tr> </table> </div> <div> - <input type="submit" name="pickspec" value="' . _('Submit') . '" /> + <input type="submit" name="PickSpec" value="' . _('Submit') . '" /> </div> </form>'; include('includes/footer.inc'); @@ -83,7 +84,7 @@ AND prodspecs.showonspec='1' ORDER by groupby, prodspecs.testid"; -$result=DB_query($sql,$db, $ErrMsg); +$result=DB_query($sql,$ErrMsg); //If there are no rows, there's a problem. if (DB_num_rows($result)==0){ @@ -110,7 +111,7 @@ <br />'; include('includes/footer.inc'); exit; -} +} $PaperSize = 'Letter'; include('includes/PDFStarter.php'); @@ -148,7 +149,7 @@ include('includes/PDFProdSpecHeader.inc'); $HeaderPrinted=1; } - + if ($CurSection!=$myrow['groupby']) { $SectionHeading=0; if ($CurSection!='' AND $PrintTrailer==1) { @@ -163,7 +164,7 @@ } } } - + if ($SectionHeading==0) { $XPos=65; if ($PrevTrailer>'' AND $PrintTrailer==1) { @@ -220,16 +221,16 @@ $ColWidth=$SectionColSizes[$x]; $ColAlign=$SectionAlign[$x]; switch ($x) { - case 0; + case 0; $DispValue=$myrow['name']; break; - case 1; + case 1; $DispValue=$Value; break; case 2; $DispValue=$myrow['method']; break; - } + } $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,$ColWidth,$FontSize,$DispValue,$ColAlign,1); $XPos+=$ColWidth; $x++; @@ -272,7 +273,7 @@ FROM config WHERE confname='QualityProdSpecText'"; -$result=DB_query($sql,$db, $ErrMsg); +$result=DB_query($sql,$ErrMsg); $myrow=DB_fetch_array($result); $Disclaimer=$myrow[0]; $LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,500,$FontSize,$Disclaimer); @@ -281,7 +282,7 @@ $LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,445,$FontSize, $LeftOvers, 'left'); } -$pdf->OutputI($_SESSION['DatabaseName'] . 'ProductSpecification' . date('Y-m-d') . '.pdf'); +$pdf->OutputI($_SESSION['DatabaseName'] . '_ProductSpecification_' . date('Y-m-d') . '.pdf'); $pdf->__destruct(); ?> \ No newline at end of file Modified: trunk/ProductSpecs.php =================================================================== --- trunk/ProductSpecs.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/ProductSpecs.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -40,13 +40,14 @@ if (isset($_GET['CopySpec']) OR isset($_POST['CopySpec'])) { if (!isset($_POST['CopyTo']) OR $_POST['CopyTo']=='' ) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; - echo '<div>'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo _('Enter The Item, Fixed Asset or Template to Copy this Specification to') . ':<input type="text" name="CopyTo" size="25" maxlength="25" />'; - echo '<div class="centre"> - <input type="hidden" name="KeyValue" value="' . $KeyValue . '" /> - <input type="submit" name="CopySpec" value="' . _('Copy') . '" /> - </div></form>'; + echo '<div> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo _('Enter The Item, Fixed Asset or Template to Copy this Specification to') . ':<input type="text" name="CopyTo" size="25" maxlength="25" /> + <div class="centre"> + <input type="hidden" name="KeyValue" value="' . $KeyValue . '" /> + <input type="submit" name="CopySpec" value="' . _('Copy') . '" /> + </div> + </form>'; include('includes/footer.inc'); exit; } else { @@ -105,6 +106,7 @@ <table class="selection"> <tr> <td>' . _('Or Select Existing Specification') .':</td>'; + $SQLSpecSelect="SELECT DISTINCT(keyval), description FROM prodspecs LEFT OUTER JOIN stockmaster @@ -274,7 +276,7 @@ showontestplan, active FROM qatests WHERE testid='" .$_POST['AddTestID' .$i]. "'"; - echo $sql; + //echo $sql; $msg = _('A Product Specification record has been added for Test ID') . ' ' . $_POST['AddTestID' .$i] . ' for ' . ' ' . $KeyValue ; $ErrMsg = _('The insert of the Product Specification failed because'); $DbgMsg = _('The SQL that was used and failed was'); Modified: trunk/QATests.php =================================================================== --- trunk/QATests.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/QATests.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -47,7 +47,7 @@ } $sql= "SELECT COUNT(*) FROM qatests WHERE qatests.name='".$_POST['QATestName']."' AND qatests.testid <> '" .$SelectedQATest. "'"; - $result = DB_query($sql,$db); + $result = DB_query($sql); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { $InputError = 1; @@ -108,7 +108,7 @@ //run the SQL from either of the above possibilites $ErrMsg = _('The insert or update of the QA Test failed because'); $DbgMsg = _('The SQL that was used and failed was'); - $result = DB_query($sql,$db,$ErrMsg, $DbgMsg); + $result = DB_query($sql,$ErrMsg, $DbgMsg); prnMsg($msg , 'success'); @@ -139,7 +139,7 @@ } else { $sql="DELETE FROM qatests WHERE testid='". $SelectedQATest."'"; $ErrMsg = _('The QA Test could not be deleted because'); - $result = DB_query($sql,$db,$ErrMsg); + $result = DB_query($sql,$ErrMsg); prnMsg(_('QA Test') . ' ' . $SelectedQATest . ' ' . _('has been deleted from the database'),'success'); unset ($SelectedQATest); @@ -176,7 +176,7 @@ FROM qatests WHERE testid='".$SelectedQATest."'"; - $result = DB_query($sql, $db); + $result = DB_query($sql); $myrow = DB_fetch_array($result); $_POST['SelectedQATest'] = $myrow['testid']; @@ -383,7 +383,7 @@ active FROM qatests ORDER BY name"; - $result = DB_query($sql,$db); + $result = DB_query($sql); echo '<table class="selection">'; echo '<tr> Modified: trunk/SelectQASamples.php =================================================================== --- trunk/SelectQASamples.php 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/SelectQASamples.php 2015-02-04 09:15:50 UTC (rev 7123) @@ -3,6 +3,8 @@ include('includes/session.inc'); $Title = _('Select QA Samples'); +$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC. +$BookMark = 'QA_Samples';// Anchor's id in the manual's html document. include('includes/header.inc'); include('includes/SQL_CommonFunctions.inc'); @@ -28,7 +30,7 @@ $SampleID = $_POST['SampleID']; } if (!isset($_POST['FromDate'])){ - $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 15 days')); + $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-15, Date('Y'))); } if (!isset($_POST['ToDate'])){ $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); @@ -56,9 +58,9 @@ if (isset($SelectedSampleID) AND $InputError !=1) { //check to see all values are in spec or at least entered $result = DB_query("SELECT count(sampleid) FROM sampleresults - WHERE sampleid = '".$SelectedSampleID."' + WHERE sampleid = '" . $SelectedSampleID . "' AND showoncert='1' - AND testvalue=''", $db); + AND testvalue=''"); $myrow = DB_fetch_row($result);; if($myrow[0]>0 AND $_POST['Cert']=='1') { $_POST['Cert']='0'; @@ -68,7 +70,7 @@ $result = DB_query("SELECT count(sampleid) FROM sampleresults WHERE sampleid = '".$SelectedSampleID."' AND showoncert='1' - AND isinspec='0'", $db); + AND isinspec='0'"); $myrow = DB_fetch_row($result);; if($myrow[0]>0 AND $_POST['Cert']=='1') { $msg = _('Some Results are out of Spec'); @@ -78,26 +80,26 @@ comments='" . $_POST['Comments'] . "', sampledate='" . FormatDateForSQL($_POST['SampleDate']) . "', cert='" . $_POST['Cert'] . "' - WHERE sampleid = '".$SelectedSampleID."'"; + WHERE sampleid = '" . $SelectedSampleID . "'"; $msg = _('QA Sample record for') . ' ' . $SelectedSampleID . ' ' . _('has been updated'); $ErrMsg = _('The update of the QA Sample failed because'); $DbgMsg = _('The SQL that was used and failed was'); - $result = DB_query($sql,$db,$ErrMsg, $DbgMsg); + $result = DB_query($sql,$ErrMsg, $DbgMsg); prnMsg($msg , 'success'); if ( $_POST['Cert']==1) { $result = DB_query("SELECT prodspeckey, lotkey FROM qasamples - WHERE sampleid = '".$SelectedSampleID."'", $db); + WHERE sampleid = '".$SelectedSampleID."'"); $myrow = DB_fetch_row($result);; if($myrow[0]>'') { $sql = "UPDATE qasamples SET cert='0' - WHERE sampleid <> '".$SelectedSampleID."' - AND prodspeckey='".$myrow[0]."' - AND lotkey='".$myrow[1]."'"; + WHERE sampleid <> '".$SelectedSampleID . "' + AND prodspeckey='" . $myrow[0] . "' + AND lotkey='" . $myrow[1] . "'"; $msg = _('All other samples for this Specification and Lot was marked as Cert=No'); $ErrMsg = _('The update of the QA Sample failed because'); $DbgMsg = _('The SQL that was used and failed was'); - $result = DB_query($sql,$db,$ErrMsg, $DbgMsg); + $result = DB_query($sql,$ErrMsg, $DbgMsg); prnMsg($msg , 'success'); } } @@ -107,7 +109,7 @@ $SelectedSampleID=DB_Last_Insert_ID($db,'qasamples','sampleid'); if ($SelectedSampleID > '') { $msg = _('Created New Sample'); - prnMsg($msg , 'success'); + prnMsg($msg , 'success'); } } unset($SelectedSampleID); @@ -115,25 +117,25 @@ unset($_POST['LotKey']); unset($_POST['Identifier']); unset($_POST['Comments']); - unset($_POST['Cert']); + unset($_POST['Cert']); } elseif (isset($_GET['delete'])) { //the link to delete a selected record was clicked instead of the submit button // PREVENT DELETES IF DEPENDENT RECORDS $sql= "SELECT COUNT(*) FROM sampleresults WHERE sampleresults.sampleid='".$SelectedSampleID."' - AND sampleresults.testvalue>''"; - $result = DB_query($sql,$db); + AND sampleresults.testvalue > ''"; + $result = DB_query($sql); $myrow = DB_fetch_row($result); if ($myrow[0]>0) { prnMsg(_('Cannot delete this Sample ID because there are test results tied to it'),'error'); } else { - $sql="DELETE FROM sampleresults WHERE sampleid='". $SelectedSampleID."'"; + $sql="DELETE FROM sampleresults WHERE sampleid='" . $SelectedSampleID . "'"; $ErrMsg = _('The sample results could not be deleted because'); - $result = DB_query($sql,$db,$ErrMsg); - $sql="DELETE FROM qasamples WHERE sampleid='". $SelectedSampleID."'"; + $result = DB_query($sql,$ErrMsg); + $sql="DELETE FROM qasamples WHERE sampleid='" . $SelectedSampleID ."'"; $ErrMsg = _('The QA Sample could not be deleted because'); - $result = DB_query($sql,$db,$ErrMsg); + $result = DB_query($sql,$ErrMsg); echo $sql; prnMsg(_('QA Sample') . ' ' . $SelectedSampleID . _('has been deleted from the database'),'success'); unset ($SelectedSampleID); @@ -150,7 +152,7 @@ if (isset($_POST['ResetPart'])) { unset($SelectedStockItem); } - + if (isset($SampleID) AND $SampleID != '') { if (!is_numeric($SampleID)) { prnMsg(_('The Sample ID entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error'); @@ -162,13 +164,13 @@ if (!Is_Date($_POST['FromDate'])) { $InputError = 1; prnMsg(_('Invalid From Date'),'error'); - $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 15 days')); - } + $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), mktime(0, 0, 0, Date('m'), Date('d')-15, Date('Y'))); + } if (!Is_Date($_POST['ToDate'])) { $InputError = 1; prnMsg(_('Invalid To Date'),'error'); $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); - } + } if (isset($_POST['SearchParts'])) { if ($_POST['Keywords'] AND $_POST['StockCode']) { prnMsg(_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info'); @@ -182,7 +184,7 @@ SUM(locstock.quantity) as qoh, stockmaster.units, FROM stockmaster INNER JOIN locstock - ON stockmaster.stockid = locstock.stockid + ON stockmaster.stockid = locstock.stockid INNER JOIN locationusers ON locationusers.loccode = locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 @@ -228,14 +230,20 @@ stockmaster.units ORDER BY stockmaster.stockid"; } - + $ErrMsg = _('No stock items were returned by the SQL because'); $DbgMsg = _('The SQL used to retrieve the searched parts was'); - $StockItemsResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg); + $StockItemsResult = DB_query($SQL, $ErrMsg, $DbgMsg); } - if (true or !isset($LotNumber) or $LotNumber == "") { //revisit later, right now always show all inputs + if (true or !isset($LotNumber) or $LotNumber == '') { //revisit later, right now always show all inputs echo '<table class="selection"><tr><td>'; + if (!isset($LotNumber)){ + $LotNumber =''; + } + if (!isset($SampleID)){ + $SampleID=''; + } if (isset($SelectedStockItem)) { echo _('For the part') . ':<b>' . $SelectedStockItem . '</b> ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />'; } @@ -249,14 +257,13 @@ categorydescription FROM stockcategory ORDER BY categorydescription"; - $result1 = DB_query($SQL, $db); - echo ' - <table class="selection"> + $result1 = DB_query($SQL); + echo '<table class="selection"> <tr> - <td>'; - echo _('To search for Pick Lists for a specific part use the part selection facilities below') . '</td></tr>'; - echo '<tr> - <td>' . _('Select a stock category') . ':<select name="StockCat">'; + <td>' . _('To search for Pick Lists for a specific part use the part selection facilities below') . '</td> + </tr> + <tr> + <td>' . _('Select a stock category') . ':<select name="StockCat">'; while ($myrow1 = DB_fetch_array($result1)) { if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) { echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; @@ -380,7 +387,7 @@ } //no stock item selected } //end no sample id selected $ErrMsg = _('No QA samples were returned by the SQL because'); - $SampleResult = DB_query($SQL, $db, $ErrMsg); + $SampleResult = DB_query($SQL, $ErrMsg); if (DB_num_rows($SampleResult) > 0) { echo '<table cellpadding="2" width="90%" class="selection">'; @@ -410,7 +417,7 @@ $Edit = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedSampleID=' . $myrow['sampleid'] .'">' . _('Edit') .'</a>'; $Delete = '<a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?delete=yes&SelectedSampleID=' . $myrow['sampleid'].'" onclick="return confirm(\'' . _('Are you sure you wish to delete this Sample ID ?') . '\');">' . _('Delete').'</a>'; $FormatedSampleDate = ConvertSQLDate($myrow['sampledate']); - + //echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?CopyTest=yes&SelectedSampleID=' .$SelectedSampleID .'">' . _('Copy These Results') . '</a></div>'; //echo '<div class="centre"><a target="_blank" href="'. $RootPath . '/PDFTestPlan.php?SelectedSampleID=' .$SelectedSampleID .'">' . _('Print Testing Worksheet') . '</a></div>'; if ($myrow['cert']==1) { @@ -418,7 +425,7 @@ } else { $CertAllowed=_('No'); } - + echo '<td><a href="' . $ModifySampleID . '">' . str_pad($myrow['sampleid'],10,'0',STR_PAD_LEFT) . '</a></td> <td>' . $myrow['prodspeckey'] . '</td> <td>' . $myrow['description'] . '</td> @@ -447,7 +454,7 @@ if (isset($SelectedSampleID)) { echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Samples') . '</a></div>'; - + } if (! isset($_GET['delete'])) { @@ -464,10 +471,10 @@ comments, cert, sampledate - FROM qasamples + FROM qasamples WHERE sampleid='".$SelectedSampleID."'"; - - $result = DB_query($sql, $db); + + $result = DB_query($sql); $myrow = DB_fetch_array($result); $_POST['ProdSpecKey'] = $myrow['prodspeckey']; @@ -476,7 +483,7 @@ $_POST['Comments'] = $myrow['comments']; $_POST['SampleDate'] = ConvertSQLDate($myrow['sampledate']); $_POST['Cert'] = $myrow['cert']; - + echo '<input type="hidden" name="SelectedSampleID" value="' . $SelectedSampleID . '" />'; echo '<table class="selection"> <tr> @@ -487,24 +494,24 @@ echo '<tr> <td>' . _('Specification') . ':</td> <td>' . $_POST['ProdSpecKey']. '</td> - </tr>'; - echo '<tr> + </tr> + <tr> <td>' . _('Lot') . ':</td> <td>' . $_POST['LotKey']. '</td> - </tr>'; - echo '<tr> + </tr> + <tr> <td>' . _('Identifier') . ':</td> <td><input type="text" name="Identifier" size="15" maxlength="15" value="' . $_POST['Identifier']. '" /></td> - </tr>'; - echo '<tr> + </tr> + <tr> <td>' . _('Comments') . ':</td> <td><input type="text" name="Comments" size="30" maxlength="255" value="' . $_POST['Comments']. '" /></td> - </tr>'; - echo '<tr> + </tr> + <tr> <td>' . _('Sample Date') . ':</td> <td><input class="date" type="text" name="SampleDate" size="10" maxlength="10" value="' . $_POST['SampleDate']. '" /></td> - </tr>'; - echo '<tr> + </tr> + <tr> <td>' . _('Use for Cert?') . ':</td> <td><select name="Cert">'; if ($_POST['Cert']==1){ @@ -538,30 +545,29 @@ description FROM prodspecs LEFT OUTER JOIN stockmaster ON stockmaster.stockid=prodspecs.keyval"; - - $ResultSelection=DB_query($SQLSpecSelect, $db); + + $ResultSelection=DB_query($SQLSpecSelect); echo '<tr> <td>' . _('Specification') . ':</td>'; echo '<td><select name="ProdSpecKey">'; while ($MyRowSelection=DB_fetch_array($ResultSelection)){ echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>'; } - echo '</select></td> - </tr>'; - echo '<tr> + echo '</select></td> + </tr> + <tr> <td>' . _('Lot') . ':</td> - <td><input type="text" required="required" name="LotKey" size="15" maxlength="15" value="' . $_POST['LotKey']. '" /></td> - </tr>'; - echo '<tr> + <td><input type="text" required="required" name="LotKey" size="15" maxlength="15" value="' . (isset($_POST['LotKey'])? $_POST['LotKey']:'') . '" /></td> + </tr> + <tr> <td>' . _('Identifier') . ':</td> - <td><input type="text" name="Identifier" size="15" maxlength="15" value="' . $_POST['Identifier']. '" /></td> - </tr>'; - echo '<tr> + <td><input type="text" name="Identifier" size="15" maxlength="15" value="' . (isset($_POST['Identifier'])? $_POST['Identifier']:'') . '" /></td> + </tr> + <tr> <td>' . _('Comments') . ':</td> - <td><input type="text" name="Comments" size="30" maxlength="255" value="' . $_POST['Comments']. '" /></td> - </tr>'; - - echo '<tr> + <td><input type="text" name="Comments" size="30" maxlength="255" value="' . (isset($_POST['Comments'])? $_POST['Comments']:'') . '" /></td> + </tr> + <tr> <td>' . _('Use for Cert?') . ':</td> <td><select name="Cert">'; if ($_POST['Cert']==1){ Modified: trunk/doc/Manual/ManualQualityAssurance.html =================================================================== --- trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:22:52 UTC (rev 7122) +++ trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 09:15:50 UTC (rev 7123) @@ -45,7 +45,7 @@ <h2>Print Product Specification</h2> <p>Prints a Customer Facing document that shows all the QA Tests that you have specified to "Show on Product Specification"</p> <img src="images/QA_PrintProductSpecification.png" alt="QA printing a product specification" /> -<h2>Logging Samples</h2> +<h2><a id="QA_Samples">Logging Samples</a></h2> <p>Samples can be logged automatically by the system or manually by a Quality person. If the configuration is set to Yes and the item is lot or serial controlled then at P/O receipt a sample is created in the system for each new Lot or serial received for the item being received. The system will not create duplicate samples if you receive the same lot 3 times against a purchase order or work order.</p> <p>You can view and edit existing samples in the "QA Samples and Test Results" under the Manufacturing module.</p> @@ -68,7 +68,7 @@ <img src="images/QA_PrintCertOfAnalysis2.png" alt="QA print certificate of Analysis 2" /> <p>The certification looks like this:</p> <img src="images/QA_CertOfAnalysisReport.png" alt="QA Certificate of Analysis" /> -<h2>Viewing Historical Results</h2> +<h2><a id="QA_HistoricalResults">Viewing Historical Results</a></h2> <ul> <li>1) Select “Historical QA Test Results” from the Manufacturing Reports menu</li> <li>2) Select your Specification</li> |
From: <dai...@us...> - 2015-02-04 08:23:00
|
Revision: 7122 http://sourceforge.net/p/web-erp/reponame/7122 Author: daintree Date: 2015-02-04 08:22:52 +0000 (Wed, 04 Feb 2015) Log Message: ----------- finish adding Andrews quality documentation Modified Paths: -------------- trunk/ProductSpecs.php trunk/QATests.php trunk/doc/Manual/ManualOutline.php trunk/doc/Manual/ManualQualityAssurance.html Modified: trunk/ProductSpecs.php =================================================================== --- trunk/ProductSpecs.php 2015-02-04 08:12:21 UTC (rev 7121) +++ trunk/ProductSpecs.php 2015-02-04 08:22:52 UTC (rev 7122) @@ -4,7 +4,7 @@ include('includes/session.inc'); $Title = _('Product Specifications Maintenance'); $ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC. -$BookMark = 'QA';// Anchor's id in the manual's html document. +$BookMark = 'QA_ProdSpecs';// Anchor's id in the manual's html document. include('includes/header.inc'); if (isset($_GET['SelectedQATest'])){ Modified: trunk/QATests.php =================================================================== --- trunk/QATests.php 2015-02-04 08:12:21 UTC (rev 7121) +++ trunk/QATests.php 2015-02-04 08:22:52 UTC (rev 7122) @@ -3,6 +3,8 @@ include('includes/session.inc'); $Title = _('QA Tests Maintenance'); +$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC. +$BookMark = 'QA_Tests';// Anchor's id in the manual's html document. include('includes/header.inc'); if (isset($_GET['SelectedQATest'])){ Modified: trunk/doc/Manual/ManualOutline.php =================================================================== --- trunk/doc/Manual/ManualOutline.php 2015-02-04 08:12:21 UTC (rev 7121) +++ trunk/doc/Manual/ManualOutline.php 2015-02-04 08:22:52 UTC (rev 7122) @@ -237,7 +237,15 @@ 'Work order issues', 'Closing work orders'), 'QualityAssurance' =>array('Quality Assurance', - 'Overview'), + 'Overview', + 'Tests Maintenance', + 'Product Specifications', + 'Copying Specification', + 'Print Product Specification', + 'Logging Samples', + 'Entering Test Results', + 'Print Certificate of Analysis', + 'View Historical Results'), 'MRP' => array('Material requirements planning', 'MRP Overview', 'Base data required', Modified: trunk/doc/Manual/ManualQualityAssurance.html =================================================================== --- trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:12:21 UTC (rev 7121) +++ trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:22:52 UTC (rev 7122) @@ -10,7 +10,7 @@ <p>All menu options for Quality are found under Manufacturing. Your menus may look differnet based on your permissoins. The menus are shown below.</p> <img src="images/QA_Menus.png" alt="QA Menu options screen" /> -<h2>QA Tests Maintenance</h2> +<h2><a id="QA_Tests">QA Tests Maintenance</a></h2> <p>This is where all tests that will be performed are defined. Other specification related information can be captured here that isn’t tested but describes in more detail the product specification. An example of this would be Processing Conditions for your product that you wish for your customers to understand. A specification is made up of any number of tests. The test defines outer tolerances but the specification allows the upper and lower bounds of the test to be specified.</p> <img src="images/QA_Tests.png" alt="QA Tests screen" /> @@ -30,7 +30,7 @@ <li>Active: once a test has results entered against it delete is no longer allowed. This flag can be used to inactivate it and not use it on future product specifications.</li> </ul> -<h2>Product Specification</h2> +<h2><a id="QA_ProdSpecs">Product Specification</a></h2> <p>Product Specifications are a collection of QA Tests that come together to define how a Product Data Sheet is built, what we test for and what we certify our results to. These are loosely tied to Items (Stocks). If a Product Specification is named the same as a stock ID then the Product Description will be used in printed paperwork and screens. If it is not a stock id then it is considered a generic product specification that can be used to hold any type of test results in your system. This also allows cascading templates to be created for faster product specification definition. In the future I foresee there may also be a loose connection to Fixed Assets. A Product Specification is added as soon as a test is added to it. To start a new specification, go to the Product Specification Screen, Type in a specification Name or stock id and click Submit.</p> <img src="images/QA_ProductSpecificationMaintenance.png" alt="QA Product specification maintenance screen" /> |
From: <dai...@us...> - 2015-02-04 08:12:24
|
Revision: 7121 http://sourceforge.net/p/web-erp/reponame/7121 Author: daintree Date: 2015-02-04 08:12:21 +0000 (Wed, 04 Feb 2015) Log Message: ----------- finish adding Andrews quality documentation Modified Paths: -------------- trunk/doc/Manual/ManualQualityAssurance.html Added Paths: ----------- trunk/doc/Manual/images/QA_CertOfAnalysisReport.png trunk/doc/Manual/images/QA_CopyTestResults.png trunk/doc/Manual/images/QA_HistoricalResults.png trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png Modified: trunk/doc/Manual/ManualQualityAssurance.html =================================================================== --- trunk/doc/Manual/ManualQualityAssurance.html 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:12:21 UTC (rev 7121) @@ -59,4 +59,20 @@ <img src="images/QA_AdditionalTests.png" alt="QA additional test results" /> <p>Manually added tests that are not part of the normal testing plan are noted for this sample. Because they were manually added they may also be deleted from the sample.</p> <img src="images/QA_DeleteTestResult.png" alt="QA delete manually added test result" /> +<p>Results can be copied from one sample to another. The system does not limit the result to be from matching items. This is helpful if you purchase Item A, test the product then repackage it into Product B using a W/O. You can copy the test results from Product A to Product B</p> +<img src="images/QA_CopyTestResults.png" alt="QA copy test results" /> +<h2>Print a Certificate of Analysis</h2> +<p>1) From the Select QA Sample Screen Click on the "Yes" link in the column "Cert Allowed"</p> +<img src="images/QA_PrintCertOfAnalysis1.png" alt="QA print certificate of Analysis 1" /> +<p>2) Click Select the sample and then Print COA</p> +<img src="images/QA_PrintCertOfAnalysis2.png" alt="QA print certificate of Analysis 2" /> +<p>The certification looks like this:</p> +<img src="images/QA_CertOfAnalysisReport.png" alt="QA Certificate of Analysis" /> +<h2>Viewing Historical Results</h2> +<ul> +<li>1) Select “Historical QA Test Results” from the Manufacturing Reports menu</li> +<li>2) Select your Specification</li> +<li>3) Choose a date range to see sammple results from</li> +</ul> +<img src="images/QA_HistoricalResults.png" alt="QA Historical Results" /> <!-- Help End: QA --> Added: trunk/doc/Manual/images/QA_CertOfAnalysisReport.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_CertOfAnalysisReport.png =================================================================== --- trunk/doc/Manual/images/QA_CertOfAnalysisReport.png 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/images/QA_CertOfAnalysisReport.png 2015-02-04 08:12:21 UTC (rev 7121) Property changes on: trunk/doc/Manual/images/QA_CertOfAnalysisReport.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_CopyTestResults.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_CopyTestResults.png =================================================================== --- trunk/doc/Manual/images/QA_CopyTestResults.png 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/images/QA_CopyTestResults.png 2015-02-04 08:12:21 UTC (rev 7121) Property changes on: trunk/doc/Manual/images/QA_CopyTestResults.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_HistoricalResults.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_HistoricalResults.png =================================================================== --- trunk/doc/Manual/images/QA_HistoricalResults.png 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/images/QA_HistoricalResults.png 2015-02-04 08:12:21 UTC (rev 7121) Property changes on: trunk/doc/Manual/images/QA_HistoricalResults.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png =================================================================== --- trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png 2015-02-04 08:12:21 UTC (rev 7121) Property changes on: trunk/doc/Manual/images/QA_PrintCertOfAnalysis1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png =================================================================== --- trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png 2015-02-03 11:33:49 UTC (rev 7120) +++ trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png 2015-02-04 08:12:21 UTC (rev 7121) Property changes on: trunk/doc/Manual/images/QA_PrintCertOfAnalysis2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <ex...@us...> - 2015-02-03 11:34:00
|
Revision: 7120 http://sourceforge.net/p/web-erp/reponame/7120 Author: exsonqu Date: 2015-02-03 11:33:49 +0000 (Tue, 03 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-03 11:31:59 UTC (rev 7119) +++ trunk/doc/Change.log 2015-02-03 11:33:49 UTC (rev 7120) @@ -1,5 +1,5 @@ webERP Change Log - +03/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php. 3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual. 3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order. 2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed. |
From: <ex...@us...> - 2015-02-03 11:32:08
|
Revision: 7119 http://sourceforge.net/p/web-erp/reponame/7119 Author: exsonqu Date: 2015-02-03 11:31:59 +0000 (Tue, 03 Feb 2015) Log Message: ----------- 03/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php. Modified Paths: -------------- trunk/CopyBOM.php Modified: trunk/CopyBOM.php =================================================================== --- trunk/CopyBOM.php 2015-02-03 08:56:58 UTC (rev 7118) +++ trunk/CopyBOM.php 2015-02-03 11:31:59 UTC (rev 7119) @@ -108,7 +108,7 @@ $myrow = DB_fetch_row($result); $sql = "UPDATE stockmaster set - lastcostupdate = " . $myrow[0] . ", + lastcostupdate = '" . $myrow[0] . "', actualcost = " . $myrow[1] . ", lastcost = " . $myrow[2] . ", materialcost = " . $myrow[3] . ", @@ -208,4 +208,4 @@ include('includes/footer.inc'); } -?> \ No newline at end of file +?> |
From: <dai...@us...> - 2015-02-03 08:57:05
|
Revision: 7118 http://sourceforge.net/p/web-erp/reponame/7118 Author: daintree Date: 2015-02-03 08:56:58 +0000 (Tue, 03 Feb 2015) Log Message: ----------- fix bug preventing crediting an invoice that was originally over-delivered Modified Paths: -------------- trunk/Credit_Invoice.php trunk/doc/Change.log Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2015-02-03 08:50:09 UTC (rev 7117) +++ trunk/Credit_Invoice.php 2015-02-03 08:56:58 UTC (rev 7118) @@ -494,8 +494,7 @@ foreach($_SESSION['CreditItems' . $identifier]->LineItems as $CreditLine) { $SQL = "SELECT count(*) FROM salesorderdetails WHERE orderno = '" . $_SESSION['CreditItems'.$identifier]->OrderNo . "' AND stkcode = '" . $CreditLine->StockID . "' - AND quantity >=" . $CreditLine->QtyDispatched . " - AND qtyinvoiced >=" . $CreditLine->QtyDispatched; + AND qtyinvoiced >='" . $CreditLine->QtyDispatched . "'"; $ErrMsg = _('Failed to retrieve salesoderdetails to compare if the order has been invoiced and that it is possible that the credit note may not already have been done'); $DuplicateCreditResult = DB_query($SQL,$ErrMsg); $myrow1 = DB_fetch_array($DuplicateCreditResult); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-03 08:50:09 UTC (rev 7117) +++ trunk/doc/Change.log 2015-02-03 08:56:58 UTC (rev 7118) @@ -1,4 +1,7 @@ webERP Change Log + +3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual. +3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order. 2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed. 31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account". 30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8 |
From: <dai...@us...> - 2015-02-03 08:50:11
|
Revision: 7117 http://sourceforge.net/p/web-erp/reponame/7117 Author: daintree Date: 2015-02-03 08:50:09 +0000 (Tue, 03 Feb 2015) Log Message: ----------- additional work to commit Andrews documentation Modified Paths: -------------- trunk/doc/Manual/ManualQualityAssurance.html Added Paths: ----------- trunk/doc/Manual/images/QA_AdditionalTests.png trunk/doc/Manual/images/QA_CopySpecification.png trunk/doc/Manual/images/QA_DeleteTestResult.png trunk/doc/Manual/images/QA_LogSampleResults.png trunk/doc/Manual/images/QA_LogSampleResults2.png trunk/doc/Manual/images/QA_PrintProductSpecification.png trunk/doc/Manual/images/QA_ProdSpecAddTasks.png trunk/doc/Manual/images/QA_ProdSpecValues.png trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png Modified: trunk/doc/Manual/ManualQualityAssurance.html =================================================================== --- trunk/doc/Manual/ManualQualityAssurance.html 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/ManualQualityAssurance.html 2015-02-03 08:50:09 UTC (rev 7117) @@ -16,17 +16,47 @@ <img src="images/QA_TestsEntry.png" alt="QA Tests Entry screen" /> -Test Name: The name of the Test you are setting up -Method: ASTM, ISO, UL or other. -Group By: Free Form. Can be used to Group certain Test on the Product Specification or Certificate of -Analysis -Units: How this is measure. PSI, Fahrenheit, Celsius etc. -Type: How do we measure/Enter this value (Text, Date, Numeric Range, and Selection List?) -Possible Values: (Only valid for type Select List, controls what appears in the drop down?) -Numeric Value: Enforces numbers to be entered for this test type -Show on Cert: Does this test print on the Certificate of Analysis (Can be overwritten at a Product level) -Show on Cert: Does this test print on the Product Specification (Can be overwritten at a Product level) -Show on Cert: Does this test print on the Test Plan (Can be overwritten at a Product level) -Active: once a test has results entered against it delete is no longer allowed. This flag can be used to -inactivate it and not use it on future product specifications. +<ul> + <li>Test Name: The name of the Test you are setting up</li> + <li>Method: ASTM, ISO, UL or other.</li> + <li>Group By: Free Form. Can be used to Group certain Test on the Product Specification or Certificate of Analysis</li> + <li>Units: How this is measure. PSI, Fahrenheit, Celsius etc.</li> + <li>Type: How do we measure/Enter this value (Text, Date, Numeric Range, and Selection List?) + Possible Values: (Only valid for type Select List, controls what appears in the drop down?) +Numeric Value: Enforces numbers to be entered for this test type</li> + <li>Show on Cert: Does this test print on the Certificate of Analysis (Can be overwritten at a Product level)</li> + <li>Show on Product Specification: Does this test print on the Product Specification (Can be overwritten at a Product level)</li> + <li>Show on Test Plan: Does this test print on the Test Plan (Can be overwritten at a Product level)</li> + <li>Active: once a test has results entered against it delete is no longer allowed. This flag can be used to +inactivate it and not use it on future product specifications.</li> +</ul> +<h2>Product Specification</h2> +<p>Product Specifications are a collection of QA Tests that come together to define how a Product Data Sheet is built, what we test for and what we certify our results to. These are loosely tied to Items (Stocks). If a Product Specification is named the same as a stock ID then the Product Description will be used in printed paperwork and screens. If it is not a stock id then it is considered a generic product specification that can be used to hold any type of test results in your system. This also allows cascading templates to be created for faster product specification definition. In the future I foresee there may also be a loose connection to Fixed Assets. A Product Specification is added as soon as a test is added to it. +To start a new specification, go to the Product Specification Screen, Type in a specification Name or stock id and click Submit.</p> +<img src="images/QA_ProductSpecificationMaintenance.png" alt="QA Product specification maintenance screen" /> +<p>Then click on "Add More Tasks"</p> +<img src="images/QA_ProdSpecAddTasks.png" alt="QA Product Specification Add Tasks" /> +<p>Adding additoinal tests to the Specifcation. Click "Add Tests". All tests not yet on this specification shown. You may enter the values for the specification on this screen before clicking the Add button</p> +<img src="images/QA_ProdSpecValues.png" alt="QA Enter Product Specification Test Values" /> +<h2>Copying Specifications</h2> +<p>Specifications can be quickly copied from one specification to another. From the Product Specification Maintenance screen select the From Specification. Choose "Copy this +Specification". Then enter the Destination Specification.</p> +<img src="images/QA_CopySpecification.png" alt="QA copying a specification" /> +<h2>Print Product Specification</h2> +<p>Prints a Customer Facing document that shows all the QA Tests that you have specified to "Show on Product Specification"</p> +<img src="images/QA_PrintProductSpecification.png" alt="QA printing a product specification" /> +<h2>Logging Samples</h2> +<p>Samples can be logged automatically by the system or manually by a Quality person. If the configuration is set to Yes and the item is lot or serial controlled then at P/O receipt a sample is created in the system for each new Lot or serial received for the item being received. The system will not create duplicate samples if you receive the same lot 3 times against a purchase order or work order.</p> +<p>You can view and edit existing samples in the "QA Samples and Test Results" under the Manufacturing +module.</p> +<img src="images/QA_LogSampleResults.png" alt="QA log sample results" /> +<p>When manually adding a sample you select a specification, enter a lot # (No validation exists) and an identifier and some comments. An identifier can be used to distinguish multiple samples for the same lot from each other. In many manufacturing environments samples are taken through the process for example at machine startup, quarter, half, three quarter processing and at batch end. The identifier allows us to distinguish these from each other. It can also be used to specify a retest later of a sample retain. Duplicate for Lot OK – if you choose no and a sample already exists for this lot it will not create a new one. Use for Cert marks the specific sample to be used for certification if multiple samples exist for +a particular lot. Only one sample can be marked as “Use for Cert” per Item/lot combination. The system also disallows a sample being used for certification if it is missing test results. A warning is given is test results are out of specification. Some companies may wish to change this warning to a hard stop. This will require a code change or a new configuration parameter to be entered into the system.</p> +<h2>Entering Test Results for a Sample</h2> +<p>Selecting a sample from the Select Sample screen allows test results to be entered as well as a test date and the name of the person that performed the testing. When reviewing the Test Plan Results screen the tests are color coded. Yellow: No Result Entered. Orange: Out of Specification. White: In Spec.</p> +<img src="images/QA_LogSampleResults2.png" alt="QA log sample results" /> +<p>Additional tests (just for this sample) can be added without affecting the existing template.</p> +<img src="images/QA_AdditionalTests.png" alt="QA additional test results" /> +<p>Manually added tests that are not part of the normal testing plan are noted for this sample. Because they were manually added they may also be deleted from the sample.</p> +<img src="images/QA_DeleteTestResult.png" alt="QA delete manually added test result" /> <!-- Help End: QA --> Added: trunk/doc/Manual/images/QA_AdditionalTests.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_AdditionalTests.png =================================================================== --- trunk/doc/Manual/images/QA_AdditionalTests.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_AdditionalTests.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_AdditionalTests.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_CopySpecification.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_CopySpecification.png =================================================================== --- trunk/doc/Manual/images/QA_CopySpecification.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_CopySpecification.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_CopySpecification.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_DeleteTestResult.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_DeleteTestResult.png =================================================================== --- trunk/doc/Manual/images/QA_DeleteTestResult.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_DeleteTestResult.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_DeleteTestResult.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_LogSampleResults.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_LogSampleResults.png =================================================================== --- trunk/doc/Manual/images/QA_LogSampleResults.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_LogSampleResults.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_LogSampleResults.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_LogSampleResults2.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_LogSampleResults2.png =================================================================== --- trunk/doc/Manual/images/QA_LogSampleResults2.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_LogSampleResults2.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_LogSampleResults2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_PrintProductSpecification.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_PrintProductSpecification.png =================================================================== --- trunk/doc/Manual/images/QA_PrintProductSpecification.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_PrintProductSpecification.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_PrintProductSpecification.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_ProdSpecAddTasks.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_ProdSpecAddTasks.png =================================================================== --- trunk/doc/Manual/images/QA_ProdSpecAddTasks.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_ProdSpecAddTasks.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_ProdSpecAddTasks.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_ProdSpecValues.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_ProdSpecValues.png =================================================================== --- trunk/doc/Manual/images/QA_ProdSpecValues.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_ProdSpecValues.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_ProdSpecValues.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png =================================================================== (Binary files differ) Index: trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png =================================================================== --- trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png 2015-02-03 06:29:37 UTC (rev 7116) +++ trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png 2015-02-03 08:50:09 UTC (rev 7117) Property changes on: trunk/doc/Manual/images/QA_ProductSpecificationMaintenance.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <dai...@us...> - 2015-02-03 06:29:47
|
Revision: 7116 http://sourceforge.net/p/web-erp/reponame/7116 Author: daintree Date: 2015-02-03 06:29:37 +0000 (Tue, 03 Feb 2015) Log Message: ----------- add QA to sysadmin role Modified Paths: -------------- trunk/sql/mysql/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql trunk/sql/mysql/upgrade4.11.4-4.12.sql Added Paths: ----------- trunk/sql/mysql/upgrade4.12-4.13.sql Modified: trunk/sql/mysql/country_sql/default.sql =================================================================== --- trunk/sql/mysql/country_sql/default.sql 2015-02-02 16:05:28 UTC (rev 7115) +++ trunk/sql/mysql/country_sql/default.sql 2015-02-03 06:29:37 UTC (rev 7116) @@ -7042,6 +7042,7 @@ INSERT INTO `securitygroups` VALUES (8,13); INSERT INTO `securitygroups` VALUES (8,14); INSERT INTO `securitygroups` VALUES (8,15); +INSERT INTO `securitygroups` VALUES (8,16); INSERT INTO `securitygroups` VALUES (9,0); INSERT INTO `securitygroups` VALUES (9,9); Modified: trunk/sql/mysql/country_sql/demo.sql =================================================================== --- trunk/sql/mysql/country_sql/demo.sql 2015-02-02 16:05:28 UTC (rev 7115) +++ trunk/sql/mysql/country_sql/demo.sql 2015-02-03 06:29:37 UTC (rev 7116) @@ -11314,6 +11314,7 @@ INSERT INTO `securitygroups` VALUES (8,13); INSERT INTO `securitygroups` VALUES (8,14); INSERT INTO `securitygroups` VALUES (8,15); +INSERT INTO `securitygroups` VALUES (8,16); INSERT INTO `securitygroups` VALUES (9,0); INSERT INTO `securitygroups` VALUES (9,9); Modified: trunk/sql/mysql/upgrade4.11.4-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11.4-4.12.sql 2015-02-02 16:05:28 UTC (rev 7115) +++ trunk/sql/mysql/upgrade4.11.4-4.12.sql 2015-02-03 06:29:37 UTC (rev 7116) @@ -166,8 +166,6 @@ KEY `stockid` (`stockid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1; --- Add a description for the script: -UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php'; UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; Added: trunk/sql/mysql/upgrade4.12-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12-4.13.sql (rev 0) +++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-03 06:29:37 UTC (rev 7116) @@ -0,0 +1,6 @@ +INSERT INTO `securitygroups` VALUES (8,16); +-- Add a description for the script: +UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php'; + + +-----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; \ No newline at end of file |
From: <ex...@us...> - 2015-02-02 16:05:35
|
Revision: 7115 http://sourceforge.net/p/web-erp/reponame/7115 Author: exsonqu Date: 2015-02-02 16:05:28 +0000 (Mon, 02 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-02 15:48:39 UTC (rev 7114) +++ trunk/doc/Change.log 2015-02-02 16:05:28 UTC (rev 7115) @@ -1,5 +1,5 @@ webERP Change Log - +2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed. 31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account". 30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8 27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir". |
From: <ex...@us...> - 2015-02-02 15:48:46
|
Revision: 7114 http://sourceforge.net/p/web-erp/reponame/7114 Author: exsonqu Date: 2015-02-02 15:48:39 +0000 (Mon, 02 Feb 2015) Log Message: ----------- 2/2/15 Exson: Remove suppliercontact table and related constrained key since it's not necessary and the duplicated foreign key made installation choked. Modified Paths: -------------- trunk/sql/mysql/upgrade4.11.4-4.12.sql Modified: trunk/sql/mysql/upgrade4.11.4-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11.4-4.12.sql 2015-02-01 18:10:18 UTC (rev 7113) +++ trunk/sql/mysql/upgrade4.11.4-4.12.sql 2015-02-02 15:48:39 UTC (rev 7114) @@ -166,24 +166,6 @@ KEY `stockid` (`stockid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1; - -CREATE TABLE IF NOT EXISTS `suppliercontacts` ( - `supplierid` varchar(10) NOT NULL DEFAULT '', - `contact` varchar(30) NOT NULL DEFAULT '', - `position` varchar(30) NOT NULL DEFAULT '', - `tel` varchar(30) NOT NULL DEFAULT '', - `fax` varchar(30) NOT NULL DEFAULT '', - `mobile` varchar(30) NOT NULL DEFAULT '', - `email` varchar(55) NOT NULL DEFAULT '', - `ordercontact` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`supplierid`,`contact`), - KEY `Contact` (`contact`), - KEY `SupplierID` (`supplierid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -ALTER TABLE `suppliercontacts` - ADD CONSTRAINT `suppliercontacts_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`); - -- Add a description for the script: UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php'; |
From: <vv...@us...> - 2015-02-01 18:10:25
|
Revision: 7113 http://sourceforge.net/p/web-erp/reponame/7113 Author: vvs2012 Date: 2015-02-01 18:10:18 +0000 (Sun, 01 Feb 2015) Log Message: ----------- effectiveafter <= '" . date('Y-m-d') . "' AND effectiveto > '" . date('Y-m-d') . "' Modified Paths: -------------- trunk/BOMListing.php Modified: trunk/BOMListing.php =================================================================== --- trunk/BOMListing.php 2015-01-31 18:10:59 UTC (rev 7112) +++ trunk/BOMListing.php 2015-02-01 18:10:18 UTC (rev 7113) @@ -32,7 +32,7 @@ INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE bom.parent >= '" . $_POST['FromCriteria'] . "' AND bom.parent <= '" . $_POST['ToCriteria'] . "' - AND bom.effectiveto >= '" . date('Y-m-d') . "' AND bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveto > '" . date('Y-m-d') . "' AND bom.effectiveafter <= '" . date('Y-m-d') . "' ORDER BY bom.parent, bom.component"; |
From: <rc...@us...> - 2015-01-31 18:11:02
|
Revision: 7112 http://sourceforge.net/p/web-erp/reponame/7112 Author: rchacon Date: 2015-01-31 18:10:59 +0000 (Sat, 31 Jan 2015) Log Message: ----------- Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account". Modified Paths: -------------- trunk/PrintCustTransPortrait.php trunk/Stocks.php trunk/doc/Change.log trunk/doc/Manual/ManualInventory.html trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2015-01-30 06:41:33 UTC (rev 7111) +++ trunk/PrintCustTransPortrait.php 2015-01-31 18:10:59 UTC (rev 7112) @@ -93,7 +93,7 @@ if (DB_error_no()!=1) { if (DB_num_rows($result)==1){ $myrow = DB_fetch_array($result); - $DefaultBankAccountNumber = _('Account:') .' ' .$myrow['bankaccountnumber']; + $DefaultBankAccountNumber = _('Account') .': ' .$myrow['bankaccountnumber']; $DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode']; } else { $DefaultBankAccountNumber = ''; Modified: trunk/Stocks.php =================================================================== --- trunk/Stocks.php 2015-01-30 06:41:33 UTC (rev 7111) +++ trunk/Stocks.php 2015-01-31 18:10:59 UTC (rev 7112) @@ -436,10 +436,10 @@ language_id, descriptiontranslation, longdescriptiontranslation) - VALUES('" . $StockID . "','" . - $LanguageId . "', '" . - $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" . - $_POST['LongDescription_' . str_replace('.','_',$LanguageId)]. + VALUES('" . $StockID . "','" . + $LanguageId . "', '" . + $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" . + $_POST['LongDescription_' . str_replace('.','_',$LanguageId)]. "')",$ErrMsg,$DbgMsg,true); } } @@ -466,7 +466,7 @@ $result = DB_query($sql,$ErrMsg,$DbgMsg,true); } - + //delete any properties for the item no longer relevant with the change of category $result = DB_query("DELETE FROM stockitemproperties WHERE stockid ='" . $StockID . "'",$ErrMsg, $DbgMsg, true); @@ -658,10 +658,10 @@ language_id, descriptiontranslation, longdescriptiontranslation) - VALUES('" . $StockID . "','" . - $LanguageId . "', '" . - $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" . - $_POST['longDescription_' . str_replace('.','_',$LanguageId)]. + VALUES('" . $StockID . "','" . + $LanguageId . "', '" . + $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" . + $_POST['longDescription_' . str_replace('.','_',$LanguageId)]. "')",$ErrMsg,$DbgMsg,true); } } @@ -1331,12 +1331,12 @@ </tr>'; echo '<tr> - <td><label for="Pansize">' . _('Pan Size') . ':</label></td> - <td><input class="number" id="Pansize" maxlength="6" name="Pansize" size="6" title="' . _('Order multiple. It is the minimum packing quantity.') . '" type="text" value="' . locale_number_format($_POST['Pansize'],0) . '" /></td> + <td><label for="PanSize">' . _('Pan Size') . ':</label></td> + <td><input class="number" id="PanSize" maxlength="6" name="Pansize" size="6" title="' . _('Order multiple. It is the minimum packing quantity.') . '" type="text" value="' . locale_number_format($_POST['Pansize'],0) . '" /></td> </tr> <tr> - <td>' . _('Shrinkage Factor') . ':</td> - <td><input type="text" class="number" name="ShrinkFactor" size="6" maxlength="6" value="' . locale_number_format($_POST['ShrinkFactor'],0) . '" /></td> + <td><label for="ShrinkageFactor">' . _('Shrinkage Factor') . ':</label></td> + <td><input class="number" id="ShrinkageFactor" maxlength="6" name="ShrinkFactor" size="6" title="' . _('Amount by which an output falls short of the estimated or planned output.') . '" type="text" value="' . locale_number_format($_POST['ShrinkFactor'],0) . '" /></td> </tr>'; echo '</table> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-01-30 06:41:33 UTC (rev 7111) +++ trunk/doc/Change.log 2015-01-31 18:10:59 UTC (rev 7112) @@ -1,5 +1,6 @@ webERP Change Log +31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account". 30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8 27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir". Modified: trunk/doc/Manual/ManualInventory.html =================================================================== --- trunk/doc/Manual/ManualInventory.html 2015-01-30 06:41:33 UTC (rev 7111) +++ trunk/doc/Manual/ManualInventory.html 2015-01-31 18:10:59 UTC (rev 7112) @@ -283,13 +283,13 @@ <h3>Pan Size</h3> - <p>This modifier is sometimes called the order multiple. It is the minimum packing quantity. It allows you to create planned orders in even multiples. This is especially useful if you are required by your suppliers to place orders in specific lot sizes. It is also a useful modifier is you have established your own production run sizes. This modifier causes MRP to inflate the required order quantity to an even increment of the pansize value. As with all modifiers you do need to be careful with this modifier as its use could lead to excess inventories.</p> + <p>This modifier is sometimes called the order multiple. It is the minimum packing quantity. It allows you to create planned orders in multiples of that value. This is especially useful if you are required by your suppliers to place orders in specific lot sizes. It is also a useful modifier if you have established your own production run sizes. This modifier causes MRP to inflate the required order quantity to an even increment of the pansize value. As with all modifiers you do need to be careful with this modifier as its use could lead to excess inventories.</p> <p>In other words if it is most efficient to manufacture an item in batches of 10 then the pan size would be 10, and MRP would calculate demand in batches of 10, so would inflate a demand of 17 to 20. For instance, we purchase some chemical materials which is 25 kg/pack. The pansize means you have to purchase at least one pack each time.</p> <h3>Shrinkage Factor</h3> - <p>Percentage by which an output falls short of the estimated or planned output.</p> + <p>Amount by which an output falls short of the estimated or planned output.</p> <!--Suggested content: Where is it used? (e.g. scripts, formulas, etc.)--> Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-30 06:41:33 UTC (rev 7111) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-31 18:10:59 UTC (rev 7112) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-27 09:44-0600\n" -"PO-Revision-Date: 2015-01-29 10:45-0600\n" +"PO-Revision-Date: 2015-01-31 12:03-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -662,7 +662,7 @@ #: AccountSections.php:204 msgid "Review Account Sections" -msgstr "Revisar se secciones contables" +msgstr "Revisar secciones contables" #: AccountSections.php:223 msgid "Could not retrieve the requested section please try again." @@ -2499,7 +2499,7 @@ #: BOMs.php:452 msgid "Select a Different BOM" -msgstr "Escojer una HCM diferente" +msgstr "Seleccione una HCM diferente" #: BOMs.php:468 msgid "Manufactured parent items" @@ -3852,7 +3852,7 @@ #: ConfirmDispatchControlled_Invoice.php:27 msgid "Select a line item to invoice" -msgstr "Seleccionar una fila de artículos a facturar" +msgstr "Seleccione una fila de artículos a facturar" #: ConfirmDispatchControlled_Invoice.php:30 msgid "" @@ -4384,7 +4384,7 @@ #: ConfirmDispatch_Invoice.php:730 msgid "Select a sales order for confirming deliveries and invoicing" -msgstr "Seleccionar una orden de venta para confirmar entregas y facturar" +msgstr "Seleccione una orden de venta para confirmar entregas y facturar" #: ConfirmDispatch_Invoice.php:760 msgid "Could not update the default shipping carrier for this branch because" @@ -5311,7 +5311,7 @@ #: ContractBOM.php:284 ContractOtherReqts.php:138 msgid "Back To Contract Header" -msgstr "Regresar a la cabecera de contrato" +msgstr "Volver a la cabecera de contrato" #: ContractBOM.php:295 PO_Items.php:1113 msgid "The supplier category details could not be retrieved because" @@ -5738,7 +5738,7 @@ #: Contracts.php:111 msgid "Back to Contract Selection" -msgstr "Regresar a la Selección del Contrato" +msgstr "Volver a la Selección del Contrato" #: Contracts.php:122 FixedAssetItems.php:38 Manufacturers.php:37 #: Manufacturers.php:109 SalesCategories.php:44 StockClone.php:65 @@ -6767,7 +6767,7 @@ #: CounterReturns.php:1634 CounterSales.php:2198 SelectOrderItems.php:1568 msgid "Select a Stock Category" -msgstr "Seleccionar una categoría de inventario" +msgstr "Seleccione una categoría de inventario" #: CounterReturns.php:1659 CounterSales.php:2221 SelectOrderItems.php:1592 msgid "Enter partial Description" @@ -6867,7 +6867,7 @@ #: CounterReturns.php:1827 msgid "Are you sure you wish to cancel this return?" -msgstr "¿Seguro que desea cancelar de esta devolución?" +msgstr "¿Está seguro que desea cancelar de esta devolución?" #: CounterSales.php:11 CounterSales.php:230 msgid "Counter Sales" @@ -7210,7 +7210,7 @@ #: CounterSales.php:2386 msgid "Are you sure you wish to cancel this sale?" -msgstr "¿Seguro que desea cancelar de esta venta?" +msgstr "¿Está seguro que desea cancelar de esta venta?" #: CreditItemsControlled.php:9 msgid "Specify Credited Controlled Items" @@ -7991,7 +7991,7 @@ #: StockClone.php:50 StockCostUpdate.php:18 StockReorderLevel.php:17 #: Stocks.php:60 WhereUsedInquiry.php:15 msgid "Back to Items" -msgstr "Volver a Artículos" +msgstr "Volver a artículos" #: CustItem.php:50 PurchData.php:62 msgid "" @@ -8256,7 +8256,7 @@ #: CustLoginSetup.php:15 msgid "Select A Customer" -msgstr "Seleccionar un cliente" +msgstr "Seleccione un cliente" #: CustLoginSetup.php:32 SelectCustomer.php:210 SuppLoginSetup.php:33 msgid " has been selected" @@ -9598,7 +9598,7 @@ #: CustomerReceipt.php:395 msgid "Act Transfer" -msgstr "Acta de Transferencia" +msgstr "Acta de transferencia" #: CustomerReceipt.php:404 ImportBankTrans.php:459 msgid "The SQL that failed to insert the bank transaction was" @@ -9830,7 +9830,7 @@ #: CustomerReceipt.php:1174 msgid "Select a Customer" -msgstr "Seleccionar un cliente" +msgstr "Seleccione un cliente" #: CustomerReceipt.php:1177 msgid "Text in the Customer" @@ -11297,7 +11297,7 @@ #: DiscountCategories.php:169 msgid "Select a part code" -msgstr "Seleccionar un código de pieza" +msgstr "Seleccione un código de pieza" #: DiscountCategories.php:178 msgid "Assign discount category" @@ -11464,7 +11464,7 @@ #: EDIMessageFormat.php:192 msgid "Review Message Lines" -msgstr "Revisar Líneas del Mensaje" +msgstr "Revisar líneas del mensaje" #: EDIMessageFormat.php:213 EDIMessageFormat.php:215 msgid "Heading" @@ -12780,7 +12780,7 @@ #: FixedAssetItems.php:14 msgid "Back to Select" -msgstr "Regresar a la Selección" +msgstr "Volver a seleccionar" #: FixedAssetItems.php:17 msgid "Fixed Asset Items" @@ -13516,7 +13516,7 @@ #: FreightCosts.php:46 msgid "Select the warehouse" -msgstr "Seleccione Almacén" +msgstr "Seleccione el almacén" #: FreightCosts.php:46 msgid "ship from location" @@ -14121,7 +14121,7 @@ #: GLBudgets.php:82 msgid "Select Account" -msgstr "Seleccionar Cuenta" +msgstr "Seleccionar cuenta" #: GLBudgets.php:83 msgid "Next Account" @@ -14278,7 +14278,7 @@ #: GLJournal.php:270 GLJournal.php:273 msgid "Reversing" -msgstr "Inverso" +msgstr "Reversando" #: GLJournal.php:271 GLJournal.php:274 msgid "Normal" @@ -14507,7 +14507,7 @@ #: GLTagProfit_Loss.php:97 msgid "Select tag" -msgstr "Seleccione centro de costo" +msgstr "Seleccionar centro de costo" #: GLTagProfit_Loss.php:128 msgid "Show Statement of Income and Expenditure" @@ -14979,7 +14979,7 @@ #: GoodsReceived.php:310 GoodsReceived.php:372 GoodsReceived.php:755 msgid "Select a different purchase order for receiving goods against" msgstr "" -"Seleccionar una orden de compra distinta para los bienes recibidos respecto a" +"Seleccione una orden de compra distinta para los bienes recibidos respecto a" #: GoodsReceived.php:330 msgid "To enter a delivery against this purchase order" @@ -15211,7 +15211,7 @@ #: GoodsReceivedControlled.php:66 msgid "Back To Purchase Order" -msgstr "Volver a la orden de compra" +msgstr "Volver a orden de compra" #: GoodsReceivedControlled.php:68 msgid "Receive controlled item" @@ -15260,7 +15260,7 @@ #: HistoricalTestResults.php:130 msgid "Sample ID:" -msgstr "" +msgstr "Identificación de muestra:" #: HistoricalTestResults.php:130 PDFGrn.php:142 PDFStockTransfer.php:135 msgid "Lot/Serial:" @@ -15634,7 +15634,7 @@ #: InternalStockCategoriesByRole.php:72 msgid "already allowed as internal for this security role" -msgstr "" +msgstr "ya permitido como interno para este rol de seguridad" #: InternalStockCategoriesByRole.php:80 msgid "Stock Category:" @@ -15662,7 +15662,7 @@ #: InternalStockCategoriesByRole.php:113 msgid "Select User Role" -msgstr "" +msgstr "Seleccionar perfil de usuario" #: InternalStockCategoriesByRole.php:147 msgid "Stock Categories available as internal for role" @@ -15676,10 +15676,11 @@ #, php-format msgid "Are you sure you wish to delete this internal stock category code?" msgstr "" +"¿Está seguro que desea suprimir este código de categoría inventario interno?" #: InternalStockCategoriesByRole.php:201 msgid "Select Stock Category Code" -msgstr "Seleccionar un código de categoría de inventario" +msgstr "Seleccione un código de categoría de inventario" #: InternalStockRequest.php:8 msgid "Create an Internal Materials Request" @@ -15776,7 +15777,7 @@ #: InternalStockRequest.php:227 msgid "Select a Location" -msgstr "Seleccionar una Ubicación" +msgstr "Seleccione una ubicación" #: InternalStockRequest.php:238 msgid "Date when required" @@ -16814,11 +16815,11 @@ #: Locations.php:440 Manufacturers.php:239 msgid "Review Records" -msgstr "Revisar Registros" +msgstr "Revisar registros" #: Locations.php:503 msgid "Amend Location details" -msgstr "Modificar Detalles de ubicación" +msgstr "Corregir detalles de ubicación" #: Locations.php:515 msgid "New Location details" @@ -17974,7 +17975,7 @@ #: MaintenanceTasks.php:93 MaintenanceTasks.php:133 #: MaintenanceUserSchedule.php:48 msgid "Task ID" -msgstr "" +msgstr "Identificación de tarea" #: MaintenanceTasks.php:96 MaintenanceUserSchedule.php:51 msgid "Last Completed" @@ -18131,7 +18132,7 @@ #: Manufacturers.php:272 msgid "Amend Brand Details" -msgstr "" +msgstr "Corregir detalles de marca" #: Manufacturers.php:278 msgid "New Brand/Manufacturer Details" @@ -19660,7 +19661,7 @@ #: PDFReceipt.php:9 msgid "Sales Receipt" -msgstr "Recibo de Ventas" +msgstr "Recibo de ventas" #: PDFReceipt.php:33 msgid "Customer Receipt Number " @@ -20010,7 +20011,7 @@ #: PDFWOPrint.php:89 msgid "Select a Work Order" -msgstr "" +msgstr "Seleccione una orden de trabajo" #: PDFWOPrint.php:92 msgid "Select a Work Order Number to Print before calling this page" @@ -20051,7 +20052,7 @@ #: PDFWOPrint.php:449 msgid "Signed for: " -msgstr "" +msgstr "Firmado por:" #: PDFWOPrint.php:579 PDFWOPrint.php:662 PO_PDFPurchOrder.php:388 msgid "Print or Email the Order" @@ -21068,7 +21069,7 @@ #: PO_Items.php:776 msgid " excluding Tax" -msgstr " excluyendo Impuestos" +msgstr " sin impuestos" #: PO_Items.php:781 msgid "Update Order Lines" @@ -21269,7 +21270,7 @@ #: PO_PDFPurchOrder.php:10 msgid "Select a Purchase Order" -msgstr "Seleccionar una orden de compra" +msgstr "Seleccione una orden de compra" #: PO_PDFPurchOrder.php:13 msgid "Select a Purchase Order Number to Print before calling this page" @@ -21440,7 +21441,7 @@ #: PO_SelectOSPurchOrder.php:216 PO_SelectPurchOrder.php:5 #: PO_SelectPurchOrder.php:165 msgid "Search Purchase Orders" -msgstr "Buscar Órdenes de Compra" +msgstr "Buscar órdenes de compra" #: PO_SelectOSPurchOrder.php:225 PO_SelectPurchOrder.php:179 msgid "" @@ -21456,7 +21457,7 @@ #: Shipt_Select.php:158 TestPlanResults.php:144 WorkOrderEntry.php:674 #: WorkOrderIssue.php:713 msgid "Select a stock category" -msgstr "Seleccionar una clase de existencia" +msgstr "Seleccione una clase de existencia" #: PO_SelectOSPurchOrder.php:252 PO_SelectPurchOrder.php:201 #: SelectCompletedOrder.php:487 SelectQASamples.php:279 @@ -21556,7 +21557,7 @@ #: PaymentAllocations.php:34 msgid "Back to supplier inquiry" -msgstr "Volver a Consulta de proveedor" +msgstr "Volver a consulta de proveedor" #: PaymentAllocations.php:56 msgid "There may be a problem retrieving the information. No data is returned" @@ -21907,7 +21908,7 @@ #: Payments.php:433 msgid "Act Transfer From " -msgstr "Acta de Transferencia de" +msgstr "Acta de transferencia de" #: Payments.php:441 Payments.php:588 PcAuthorizeExpenses.php:224 msgid "Cannot insert a bank transaction because" @@ -22913,7 +22914,7 @@ #: Prices.php:217 msgid "Review Prices" -msgstr "Revisar Precio" +msgstr "Revisar precios" #: Prices.php:223 PricesByCost.php:156 Prices_Customer.php:354 #: RecurringSalesOrders.php:428 SelectWorkOrder.php:337 WorkOrderEntry.php:583 @@ -22940,7 +22941,7 @@ #: Prices.php:344 msgid "Amend Price" -msgstr "Corregir el precio" +msgstr "Corregir precio" #: PricesBasedOnMarkUp.php:5 msgid "Update Pricing" @@ -23046,8 +23047,8 @@ "Are you sure you wish to update or add all the prices according to the " "criteria selected?" msgstr "" -"¿Seguro que desea actualizar o agregar todos los precios de acuerdo a los " -"criterios seleccionados?" +"¿Está seguro que desea actualizar o agregar todos los precios de acuerdo a " +"los criterios seleccionados?" #: PricesBasedOnMarkUp.php:177 msgid "No price list is selected to update. No updates will take place" @@ -23636,7 +23637,7 @@ #: PrintCustStatements.php:416 msgid "Amount received was" -msgstr "el monto recibido fue" +msgstr "Monto recibido fue" #: PrintCustStatements.php:421 msgid "Please make payments to our account:" @@ -24120,7 +24121,7 @@ #: ProductSpecs.php:546 TestPlanResults.php:803 msgid "Test Name" -msgstr "" +msgstr "Nombre de prueba" #: ProductSpecs.php:603 QATests.php:301 msgid "Show On Cert?" @@ -24645,7 +24646,7 @@ #: QATests.php:150 msgid "Show All QA Tests" -msgstr "" +msgstr "Mostrar todas las pruebas de aseguramiento de calidad" #: QATests.php:198 msgid "QA Test ID" @@ -24661,7 +24662,7 @@ #: QATests.php:243 msgid "ASTM, ISO, UL or other" -msgstr "" +msgstr "ASTM, ISO, UL u otro" #: QATests.php:246 QATests.php:391 msgid "Group By" @@ -24688,7 +24689,7 @@ #: QATests.php:388 msgid "Test ID" -msgstr "" +msgstr "Identificación de prueba" #: QATests.php:395 StockCategories.php:577 msgid "Numeric Value" @@ -25028,7 +25029,7 @@ #: RelatedItemsUpdate.php:170 msgid "Are you sure you wish to delete this relationship?" -msgstr "" +msgstr "¿Está seguro que desea suprimir esta relación?" #: RelatedItemsUpdate.php:179 msgid "There are no items related set up for this part" @@ -25040,7 +25041,7 @@ #: RelatedItemsUpdate.php:204 msgid "Amend Relation" -msgstr "" +msgstr "Corregir relación" #: ReorderLevel.php:12 ReorderLevel.php:282 msgid "Reorder Level Report" @@ -25447,7 +25448,7 @@ #: RevisionTranslations.php:63 msgid "Revised?" -msgstr "" +msgstr "¿Revisado?" #: SMTPServer.php:5 msgid "SMTP Server details" @@ -25937,7 +25938,7 @@ #: SalesAnalRepts.php:307 #, php-format msgid "Are you sure you wish to remove this report design?" -msgstr "¿Desea suprimir este diseño de informe?" +msgstr "¿Está seguro que desea suprimir este diseño de informe?" #: SalesAnalRepts.php:332 msgid "Show All Defined Reports" @@ -26217,7 +26218,7 @@ #: SalesCategories.php:273 #, php-format msgid "Are you sure you wish to delete this sales category?" -msgstr "¡Está seguro que desea suprimir esta categoría de ventas?" +msgstr "¿Está seguro que desea suprimir esta categoría de ventas?" #: SalesCategories.php:325 msgid "Edit Sub Category" @@ -26253,7 +26254,7 @@ #: SalesCategories.php:453 msgid "Select Brand" -msgstr "" +msgstr "Seleccionar marca" #: SalesCategories.php:463 msgid "Add Item To Sales Category" @@ -26840,7 +26841,7 @@ #: SalesTypes.php:156 msgid "Sales type" -msgstr "Tipos de Venta" +msgstr "Tipo de venta" #: SalesTypes.php:156 msgid "price list" @@ -26925,7 +26926,7 @@ #: SelectAsset.php:5 includes/MainMenuLinksArray.php:405 msgid "Select an Asset" -msgstr "Seleccionar un activo" +msgstr "Seleccione un activo" #: SelectAsset.php:39 msgid "" @@ -27230,7 +27231,7 @@ #: SelectCreditItems.php:957 msgid "Are you sure you wish to cancel the whole of this credit note?" -msgstr "¿Seguro que desea cancelar la totalidad de esta nota de crédito?" +msgstr "¿Está seguro que desea cancelar la totalidad de esta nota de crédito?" #: SelectCreditItems.php:959 msgid "Process Credit Note" @@ -27597,11 +27598,11 @@ #: SelectGLAccount.php:88 msgid "Select an Account Code" -msgstr "Seleccionar un código de cuenta" +msgstr "Seleccione un código de cuenta" #: SelectGLAccount.php:115 msgid "Account Type" -msgstr "Tipo de Cuenta" +msgstr "Tipo de cuenta" #: SelectOrderItems.php:12 msgid "Modifying Order" @@ -27932,7 +27933,7 @@ #: SelectOrderItems.php:1796 msgid "Add Asset To Order" -msgstr "Agregar un activo a una Orden" +msgstr "Agregar un activo a una orden" #: SelectOrderItems.php:1810 msgid "Cancel Whole Order" @@ -27940,7 +27941,7 @@ #: SelectOrderItems.php:1810 msgid "Are you sure you wish to cancel this entire order?" -msgstr "¿Seguro que desea cancelar todo el pedido?" +msgstr "¿Está seguro que desea cancelar todo el pedido?" #: SelectProduct.php:8 msgid "Search Inventory Items" @@ -28190,7 +28191,7 @@ #: SelectQASamples.php:159 SelectQASamples.php:242 SelectQASamples.php:483 #: TestPlanResults.php:44 TestPlanResults.php:127 TestPlanResults.php:755 msgid "Sample ID" -msgstr "" +msgstr "Identificación de muestra" #: SelectQASamples.php:242 TestPlanResults.php:127 msgid "Lot Number" @@ -28198,7 +28199,7 @@ #: SelectQASamples.php:244 TestPlanResults.php:129 msgid "Search Samples" -msgstr "" +msgstr "Buscar muestras" #: SelectQASamples.php:257 TestPlanResults.php:142 msgid "" @@ -28217,7 +28218,7 @@ #: SelectQASamples.php:389 SelectQASamples.php:488 SelectQASamples.php:544 #: TestPlanResults.php:279 TestPlanResults.php:756 msgid "Specification" -msgstr "" +msgstr "Especificación" #: SelectQASamples.php:391 TestPlanResults.php:281 TestPlanResults.php:757 msgid "Lot / Serial" @@ -28235,7 +28236,7 @@ #: SelectQASamples.php:394 SelectQASamples.php:504 TestPlanResults.php:284 #: TestPlanResults.php:759 msgid "Sample Date" -msgstr "" +msgstr "Fecha de muestra" #: SelectQASamples.php:396 TestPlanResults.php:286 msgid "Cert Allowed" @@ -28243,11 +28244,11 @@ #: SelectQASamples.php:411 msgid "Are you sure you wish to delete this Sample ID ?" -msgstr "" +msgstr "¿Está seguro que desea suprimir esta identificación de muestra?" #: SelectQASamples.php:449 msgid "Show All Samples" -msgstr "" +msgstr "Mostrar todas las muestras" #: SelectQASamples.php:492 SelectQASamples.php:552 #: includes/PDFWOPageHeader.inc:45 @@ -30698,7 +30699,7 @@ #: StockClone.php:524 msgid "Review Item Purchase Data." -msgstr "" +msgstr "Revisar datos compra de artículos." #: StockClone.php:525 msgid "Costing was updated for this cloned item." @@ -31508,7 +31509,7 @@ #: StockLocTransferReceive.php:348 msgid "At" -msgstr "" +msgstr "En" #: StockLocTransferReceive.php:364 msgid "Unable to COMMIT the Stock Transfer transaction" @@ -31560,7 +31561,7 @@ #: StockLocTransferReceive.php:531 msgid "Select A Different Transfer" -msgstr "Selecciones una transferencia diferente" +msgstr "Seleccione una transferencia diferente" #: StockLocTransferReceive.php:545 msgid "Select Location Receiving Into" @@ -31898,7 +31899,7 @@ #: StockTransferControlled.php:60 StockTransferControlled.php:63 msgid "Back To Transfer Screen" -msgstr "Regresar a la Pantalla de Transferencia" +msgstr "Volver a la Pantalla de Transferencia" #: StockTransferControlled.php:67 msgid "Transfer of controlled item" @@ -32499,7 +32500,7 @@ #: SuppContractChgs.php:114 SuppFixedAssetChgs.php:103 SuppInvGRNs.php:163 #: SuppShiptChgs.php:21 SuppTransGLAnalysis.php:147 SupplierInvoice.php:1900 msgid "Back to Invoice Entry" -msgstr "Regresar a introducción de facturas" +msgstr "Volver a introducción de facturas" #: SuppContractChgs.php:136 msgid "Contract Selection" @@ -34034,7 +34035,7 @@ #: SupplierInquiry.php:18 msgid "Select a Supplier to Inquire On" -msgstr "Seleccionar un proveedor para Informarse Sobre" +msgstr "Seleccione un proveedor para Informarse Sobre" #: SupplierInquiry.php:77 SupplierInquiry.php:99 msgid "The supplier details could not be retrieved by the SQL because" @@ -34540,7 +34541,7 @@ #: SupplierTenderCreate.php:475 msgid "Save Tender" -msgstr "Guardar la Licitación" +msgstr "Guardar licitación" #: SupplierTenderCreate.php:562 SupplierTenderCreate.php:564 #: SupplierTenderCreate.php:568 SupplierTenderCreate.php:570 @@ -34873,7 +34874,7 @@ #: Suppliers.php:307 Suppliers.php:597 msgid "Review Supplier Contact Details" -msgstr "" +msgstr "Revisar detalles del contacto del proveedor" #: Suppliers.php:329 msgid "The supplier number already exists in the database" @@ -37009,7 +37010,7 @@ #: TaxGroups.php:208 msgid "Review Existing Groups" -msgstr "Revisar Grupos Existentes" +msgstr "Revisar grupos existentes" #: TaxGroups.php:221 msgid "The selected tax group is no longer available." @@ -37274,7 +37275,7 @@ #: TestPlanResults.php:724 msgid "Back to Samples" -msgstr "" +msgstr "Volver a muestras" #: TestPlanResults.php:761 msgid "Used for Cert" @@ -37282,7 +37283,7 @@ #: TestPlanResults.php:807 msgid "Test Date" -msgstr "" +msgstr "Fecha de prueba" #: TestPlanResults.php:808 msgid "Tested By" @@ -37290,7 +37291,7 @@ #: TestPlanResults.php:809 msgid "Test Result" -msgstr "" +msgstr "Resultado de prueba" #: TestPlanResults.php:810 msgid "On Cert" @@ -37298,7 +37299,7 @@ #: TestPlanResults.php:920 msgid "Are you sure you wish to delete this Test from this Sample ?" -msgstr "" +msgstr "¿Está seguro que desea suprimir esta prueba de esta muestra?" #: TestPlanResults.php:973 msgid "Copy These Results" @@ -37433,7 +37434,7 @@ #: UnitsOfMeasure.php:196 msgid "Review Units of Measure" -msgstr "Revisar Unidades de Medida" +msgstr "Revisar unidades de medida" #: UnitsOfMeasure.php:218 msgid "Could not retrieve the requested unit of measure, please try again." @@ -38024,7 +38025,7 @@ #: WWW_Access.php:94 msgid "security role has been deleted" -msgstr "Se eliminó el Perfil de Seguridad" +msgstr "El Perfil de Seguridad fue suprimido" #: WWW_Access.php:133 #, php-format @@ -38033,7 +38034,7 @@ #: WWW_Access.php:148 msgid "Review Existing Roles" -msgstr "Revisar Perfiles Existentes" +msgstr "Revisar perfiles existentes" #: WWW_Access.php:160 msgid "The selected role is no longer available." @@ -38406,7 +38407,7 @@ #: WorkOrderCosting.php:32 msgid "Select a work order" -msgstr "Seleccionar una orden de trabajo" +msgstr "Seleccione una orden de trabajo" #: WorkOrderCosting.php:33 msgid "This page can only be opened if a work order has been selected." @@ -38601,7 +38602,7 @@ #: WorkOrderEntry.php:49 WorkOrderEntry.php:330 WorkOrderEntry.php:553 msgid "Select an existing work order" -msgstr "Seleccionar una orden de trabajo existente" +msgstr "Seleccione una orden de trabajo existente" #: WorkOrderEntry.php:264 msgid "" @@ -38683,7 +38684,7 @@ #: WorkOrderEntry.php:470 msgid "Select an existing outstanding work order" -msgstr "Seleccionar una Orden de Trabajo Pendiente" +msgstr "Seleccione una Orden de Trabajo Pendiente" #: WorkOrderEntry.php:509 msgid "Could not get the work order items" @@ -38976,7 +38977,7 @@ #: WorkOrderReceive.php:40 msgid "Select a work order to receive" -msgstr "Seleccionar una Orden de Trabajo a recibir" +msgstr "Seleccione una Orden de Trabajo a recibir" #: WorkOrderReceive.php:42 msgid "" @@ -39322,7 +39323,7 @@ #: Z_ChangeBranchCode.php:44 msgid "a unique branch code must be entered for the new code" -msgstr "debe entrar un código de sucursal único para el nuevo código" +msgstr "debe introducir un código de sucursal único para el nuevo código" #: Z_ChangeBranchCode.php:52 msgid "Inserting the new customer branches master record" @@ -39459,7 +39460,7 @@ #: Z_ChangeCustomerCode.php:34 msgid "a unique customer code must be entered for the new code" -msgstr "debe introducir un código de cliente único" +msgstr "debe introducir un código de cliente único para el nuevo código" #: Z_ChangeCustomerCode.php:41 msgid "Inserting the new debtors master record" @@ -39581,11 +39582,13 @@ #: Z_ChangeGLAccountCode.php:45 msgid "already exists as a GL account code in the system" -msgstr "" +msgstr "ya existe como código de cuenta contable en el sistema" #: Z_ChangeGLAccountCode.php:45 msgid "a unique GL account code must be entered for the new code" msgstr "" +"debe introducir un código de un código de cuenta contable único para el " +"nuevo código" #: Z_ChangeGLAccountCode.php:52 msgid "Adding the new chartmaster record" @@ -39932,7 +39935,7 @@ #: Z_ChangeStockCategory.php:46 msgid "already exists as a stock category in the system" -msgstr "ya existe como una categoría de existencias en el sistema" +msgstr "ya existe como categoría de existencias en el sistema" #: Z_ChangeStockCategory.php:46 msgid "a unique stock category must be entered for the new stock category" @@ -40099,11 +40102,11 @@ #: Z_ChangeSupplierCode.php:62 msgid "already exists as a supplier code in the system" -msgstr "ya existe como un código de proveedor en el sistema" +msgstr "ya existe como código de proveedor en el sistema" #: Z_ChangeSupplierCode.php:62 msgid "a unique supplier code must be entered for the new code" -msgstr "un código de proveedor único se debe introducir para el código nuevo" +msgstr "debe introducir un código de proveedor único para el código nuevo" #: Z_ChangeSupplierCode.php:71 msgid "Inserting the new supplier record" @@ -41316,7 +41319,7 @@ #: Z_ImportGLTransactions.php:235 msgid "Select Transaction Type" -msgstr "" +msgstr "Seleccionar tipo de transacción" #: Z_ImportGLTransactions.php:237 msgid "GL Journal" @@ -41705,8 +41708,8 @@ "Are you sure you wish to re-post all general ledger transactions since the " "selected period this can take some time?" msgstr "" -"¿Seguro de que desea volver a publicar todas las transacciones contables que " -"quedan desde el período seleccionado esto puede tomar algún tiempo?" +"¿Está seguro que desea re-publicar todas las transacciones contables desde " +"el período seleccionado? Esto puede tomar algún tiempo." #: Z_RePostGLFromPeriod.php:58 msgid "All general ledger postings have been reposted from period" @@ -45217,7 +45220,7 @@ #: includes/ConnectDB_mysql.inc:42 includes/ConnectDB_mysqli.inc:43 #: includes/ConnectDB_mysqli.inc:50 includes/ConnectDB_postgres.inc:29 msgid "Back to login page" -msgstr "Volver a la Página de Autenticación" +msgstr "Volver a página de inicio de sesión" #: includes/ConnectDB.inc:41 msgid "The company name entered (" @@ -46264,7 +46267,7 @@ #: includes/header.inc:90 ../webSHOP/includes/header.php:232 msgid "Are you sure you wish to logout?" -msgstr "¿Confirma que desea salir?" +msgstr "¿Está seguro que desea salir?" #: includes/header.inc:90 ../webSHOP/includes/header.php:232 msgid "Logout" @@ -48715,7 +48718,7 @@ #: includes/MainMenuLinksArray.php:176 msgid "Select A Shipment" -msgstr "Seleccionar un embarque" +msgstr "Seleccione un embarque" #: includes/MainMenuLinksArray.php:188 msgid "Purchase Order Detail Or Summary Inquiries" @@ -48828,7 +48831,7 @@ #: includes/MainMenuLinksArray.php:270 msgid "Select An Item" -msgstr "Seleccionar artículo" +msgstr "Seleccione un artículo" #: includes/MainMenuLinksArray.php:274 msgid "Add or Update Prices Based On Costs" @@ -48844,7 +48847,7 @@ #: includes/MainMenuLinksArray.php:288 includes/MainMenuLinksArray.php:294 msgid "Select A Work Order" -msgstr "Seleccionar una orden de trabajo" +msgstr "Seleccione una orden de trabajo" #: includes/MainMenuLinksArray.php:289 msgid "QA Samples and Test Results" @@ -49929,7 +49932,7 @@ #: reportwriter/languages/en_US/reports.php:102 msgid "Standard Color" -msgstr "" +msgstr "Color estándar" #: reportwriter/languages/en_US/reports.php:104 msgid "Third" @@ -49994,7 +49997,7 @@ #: reportwriter/languages/en_US/reports.php:127 msgid "Save Report" -msgstr "" +msgstr "Guardar informe" #: reportwriter/languages/en_US/reports.php:128 msgid "Report Page Setup" @@ -50255,7 +50258,7 @@ #: reportwriter/languages/en_US/reports.php:207 msgid "Select Stored Image" -msgstr "" +msgstr "Seleccionar imagen almacenada" #: reportwriter/languages/en_US/reports.php:208 msgid "Image Dimensions (mm)" @@ -50401,7 +50404,7 @@ #: reportwriter/languages/en_US/reports.php:261 msgid "Sales Receipts" -msgstr "" +msgstr "Recibos de ventas" #: reportwriter/languages/en_US/reports.php:262 msgid "Labels - Vendor" @@ -50465,7 +50468,7 @@ #: reportwriter/languages/en_US/reports.php:280 msgid "Round (2 decimal)" -msgstr "" +msgstr "redondear (2 decimales)" #: reportwriter/languages/en_US/reports.php:281 msgid "Convert Dollars" @@ -50769,7 +50772,7 @@ #: ../webSHOP/Checkout.php:251 ../webSHOP/Register.php:428 msgid "An email address is required" -msgstr "" +msgstr "Se requiere una dirección de correo electrónico" #: ../webSHOP/Checkout.php:252 ../webSHOP/Register.php:429 msgid "The email address must be a valid email address" @@ -50924,11 +50927,11 @@ #: ../webSHOP/Checkout.php:511 ../webSHOP/Checkout.php:623 msgid "Back to Delivery Details" -msgstr "" +msgstr "Volver a detalles de entrega" #: ../webSHOP/Checkout.php:512 msgid "Review Freight Method and Charges" -msgstr "" +msgstr "Revisar método y cargos de flete" #: ../webSHOP/Checkout.php:513 msgid "Confirm Selected Payment Method" @@ -51199,7 +51202,7 @@ #: ../webSHOP/ItemDetails.php:102 ../webSHOP/ItemDetails.php:111 #: ../webSHOP/includes/Functions.php:43 ../webSHOP/includes/Functions.php:52 msgid "Arriving Soon" -msgstr "" +msgstr "Llega pronto" #: ../webSHOP/ItemDetails.php:109 msgid "In Stock QTY" @@ -51215,7 +51218,7 @@ #: ../webSHOP/ItemDetails.php:121 msgid "Back to Category" -msgstr "" +msgstr "Volver a categoría" #: ../webSHOP/ItemDetails.php:134 msgid "Product Details" @@ -51673,7 +51676,7 @@ #: ../webSHOP/includes/PlaceOrder.php:337 msgid "Shipment information" -msgstr "" +msgstr "Información de envío" #: ../webSHOP/includes/PlaceOrder.php:339 msgid "Your order will be shipped to you shortly via" |
From: <dai...@us...> - 2015-01-30 06:41:36
|
Revision: 7111 http://sourceforge.net/p/web-erp/reponame/7111 Author: daintree Date: 2015-01-30 06:41:33 +0000 (Fri, 30 Jan 2015) Log Message: ----------- fix Z_UpdateItemCost.php - for my error Modified Paths: -------------- trunk/Z_UpdateItemCosts.php Modified: trunk/Z_UpdateItemCosts.php =================================================================== --- trunk/Z_UpdateItemCosts.php 2015-01-29 23:24:24 UTC (rev 7110) +++ trunk/Z_UpdateItemCosts.php 2015-01-30 06:41:33 UTC (rev 7111) @@ -109,7 +109,7 @@ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<div class="page_help_text">' . _('This function updates the costs of all items from a comma separated variable (csv) file.') . '<br />' . - _('The file must contain two columns, and the first row should be the following headers:') . '<br /><i>' . _('StockID, Material Cost, Labour Cost, Overhead Cost') . '</i><br />' . + _('The file must contain four columns, and the first row should be the following headers:') . '<br /><i>StockID, Material Cost, Labour Cost, Overhead Cost</i><br />' . _('followed by rows containing these four fields for each cost to be updated.') . '<br />' . _('The StockID field must have a corresponding entry in the stockmaster table.') . '</div>'; |
From: <rc...@us...> - 2015-01-29 23:24:31
|
Revision: 7110 http://sourceforge.net/p/web-erp/reponame/7110 Author: rchacon Date: 2015-01-29 23:24:24 +0000 (Thu, 29 Jan 2015) Log Message: ----------- Add bank.png image to themes. Added Paths: ----------- trunk/css/gel/images/bank.png trunk/css/professional/images/bank.png trunk/css/silverwolf/images/bank.png trunk/css/wood/images/bank.png Added: trunk/css/gel/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/bank.png =================================================================== --- trunk/css/gel/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) +++ trunk/css/gel/images/bank.png 2015-01-29 23:24:24 UTC (rev 7110) Property changes on: trunk/css/gel/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/bank.png =================================================================== --- trunk/css/professional/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) +++ trunk/css/professional/images/bank.png 2015-01-29 23:24:24 UTC (rev 7110) Property changes on: trunk/css/professional/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/bank.png =================================================================== --- trunk/css/silverwolf/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) +++ trunk/css/silverwolf/images/bank.png 2015-01-29 23:24:24 UTC (rev 7110) Property changes on: trunk/css/silverwolf/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/bank.png =================================================================== --- trunk/css/wood/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) +++ trunk/css/wood/images/bank.png 2015-01-29 23:24:24 UTC (rev 7110) Property changes on: trunk/css/wood/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <rc...@us...> - 2015-01-29 23:19:40
|
Revision: 7109 http://sourceforge.net/p/web-erp/reponame/7109 Author: rchacon Date: 2015-01-29 23:19:31 +0000 (Thu, 29 Jan 2015) Log Message: ----------- Add bank.png image to themes. Added Paths: ----------- trunk/css/default/images/bank.png trunk/css/fluid/images/bank.png trunk/css/fresh/images/bank.png trunk/css/professional-rtl/images/bank.png trunk/css/xenos/images/bank.png Added: trunk/css/default/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/default/images/bank.png =================================================================== --- trunk/css/default/images/bank.png 2015-01-29 17:54:44 UTC (rev 7108) +++ trunk/css/default/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) Property changes on: trunk/css/default/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/bank.png =================================================================== --- trunk/css/fluid/images/bank.png 2015-01-29 17:54:44 UTC (rev 7108) +++ trunk/css/fluid/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) Property changes on: trunk/css/fluid/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/bank.png =================================================================== --- trunk/css/fresh/images/bank.png 2015-01-29 17:54:44 UTC (rev 7108) +++ trunk/css/fresh/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) Property changes on: trunk/css/fresh/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional-rtl/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/bank.png =================================================================== --- trunk/css/professional-rtl/images/bank.png 2015-01-29 17:54:44 UTC (rev 7108) +++ trunk/css/professional-rtl/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) Property changes on: trunk/css/professional-rtl/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/bank.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/bank.png =================================================================== --- trunk/css/xenos/images/bank.png 2015-01-29 17:54:44 UTC (rev 7108) +++ trunk/css/xenos/images/bank.png 2015-01-29 23:19:31 UTC (rev 7109) Property changes on: trunk/css/xenos/images/bank.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <rc...@us...> - 2015-01-29 17:54:57
|
Revision: 7108 http://sourceforge.net/p/web-erp/reponame/7108 Author: rchacon Date: 2015-01-29 17:54:44 +0000 (Thu, 29 Jan 2015) Log Message: ----------- Spanish files update. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-29 14:01:52 UTC (rev 7107) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-29 17:54:44 UTC (rev 7108) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-27 09:44-0600\n" -"PO-Revision-Date: 2015-01-27 11:02-0600\n" +"PO-Revision-Date: 2015-01-29 10:45-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -93,7 +93,7 @@ msgstr "" "El grupo de cuenta maestro seleccionado parece resultar en una estructura de " "cuenta recursiva - seleccione un grupo de cuenta maestro alternativo o haga " -"éste grupo un grupo de cuenta de alto nivel" +"éste grupo un grupo de cuenta de alto nivel" #: AccountGroups.php:107 msgid "Could not check whether the group is recursive because" @@ -175,23 +175,23 @@ #: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125 #: Currencies.php:244 Currencies.php:252 Currencies.php:260 #: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321 -#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296 -#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334 -#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141 -#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79 -#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284 -#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320 -#: Locations.php:329 Locations.php:337 Manufacturers.php:154 -#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146 -#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128 -#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166 -#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 -#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771 -#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 -#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 -#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134 -#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135 -#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88 +#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146 +#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 +#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 +#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95 +#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293 +#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329 +#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154 +#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153 +#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135 +#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172 +#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 +#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779 +#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819 +#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 +#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142 +#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88 +#: WorkCentres.php:89 WorkCentres.php:95 msgid "There are" msgstr "Existen" @@ -250,46 +250,47 @@ #: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110 #: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102 #: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193 -#: Credit_Invoice.php:276 CreditStatus.php:21 Currencies.php:30 +#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30 #: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238 #: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 #: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 #: FixedAssetLocations.php:13 FixedAssetRegister.php:16 #: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 -#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11 -#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311 -#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386 -#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516 -#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 -#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29 -#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60 -#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148 -#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 -#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 -#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20 -#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24 -#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 -#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28 -#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11 -#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291 -#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559 -#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510 -#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14 -#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174 -#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 -#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 -#: StockLocMovements.php:14 StockLocStatus.php:29 +#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250 +#: GLJournalInquiry.php:11 HistoricalTestResults.php:38 +#: InternalStockRequest.php:311 InventoryPlanning.php:354 +#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516 +#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91 +#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60 +#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10 +#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59 +#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149 +#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11 +#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38 +#: PurchData.php:241 PurchData.php:373 PurchData.php:401 +#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320 +#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14 +#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40 +#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48 +#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220 +#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65 +#: SelectOrderItems.php:559 SelectOrderItems.php:1463 +#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43 +#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220 +#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229 +#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160 +#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29 #: StockSerialItemResearch.php:30 SupplierPriceList.php:14 #: SupplierPriceList.php:224 SupplierPriceList.php:394 #: SupplierPriceList.php:398 SupplierPriceList.php:449 -#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556 +#: SupplierPriceList.php:499 SupplierTenderCreate.php:556 #: SupplierTenderCreate.php:664 SupplierTenders.php:322 -#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27 -#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 -#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22 -#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31 -#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57 -#: ../webSHOP/includes/header.php:216 +#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304 +#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10 +#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111 +#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11 +#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58 +#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251 msgid "Search" msgstr "Buscar" @@ -323,44 +324,44 @@ #: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101 #: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628 #: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663 -#: MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 -#: MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207 -#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275 -#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296 -#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65 -#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600 -#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134 -#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 -#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407 -#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423 -#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606 -#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621 -#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645 -#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670 -#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306 -#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332 -#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417 -#: QATests.php:422 QATests.php:427 QATests.php:432 -#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 -#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 -#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 -#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476 -#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351 -#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367 -#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362 -#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513 -#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582 -#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289 -#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341 -#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413 -#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499 -#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949 -#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283 -#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502 -#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632 -#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772 -#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805 -#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088 +#: MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 +#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 +#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 PDFWOPrint.php:604 +#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 +#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416 +#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208 +#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282 +#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248 +#: ProductSpecs.php:186 ProductSpecs.php:407 ProductSpecs.php:412 +#: ProductSpecs.php:418 ProductSpecs.php:423 ProductSpecs.php:428 +#: ProductSpecs.php:560 ProductSpecs.php:606 ProductSpecs.php:608 +#: ProductSpecs.php:619 ProductSpecs.php:621 ProductSpecs.php:632 +#: ProductSpecs.php:634 ProductSpecs.php:645 ProductSpecs.php:647 +#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:291 +#: QATests.php:293 QATests.php:304 QATests.php:306 QATests.php:317 +#: QATests.php:319 QATests.php:330 QATests.php:332 QATests.php:343 +#: QATests.php:345 QATests.php:412 QATests.php:417 QATests.php:422 +#: QATests.php:427 QATests.php:432 RecurringSalesOrders.php:493 +#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284 +#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420 +#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451 +#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264 +#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227 +#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237 +#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511 +#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570 +#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667 +#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337 +#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395 +#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495 +#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924 +#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258 +#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90 +#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543 +#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672 +#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780 +#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849 +#: SystemParameters.php:945 SystemParameters.php:1088 #: SystemParameters.php:1090 SystemParameters.php:1100 #: SystemParameters.php:1102 SystemParameters.php:1156 #: SystemParameters.php:1168 SystemParameters.php:1170 @@ -370,14 +371,14 @@ #: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 #: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516 #: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704 -#: WWW_Users.php:706 +#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "Sí" #: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452 -#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414 -#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801 -#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428 +#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218 +#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418 +#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428 #: CompanyPreferences.php:439 CompanyPreferences.php:443 #: CompanyPreferences.php:454 CompanyPreferences.php:458 #: ContractCosting.php:200 Currencies.php:332 Currencies.php:513 @@ -387,15 +388,15 @@ #: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99 #: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629 #: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668 -#: MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 -#: MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206 -#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209 -#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290 -#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64 -#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601 +#: MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 +#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64 +#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:601 #: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409 +#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207 +#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276 +#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297 +#: PcAuthorizeExpenses.php:246 ProductSpecs.php:189 ProductSpecs.php:409 #: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425 #: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613 #: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637 @@ -435,37 +436,40 @@ #: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515 #: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703 #: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44 +#: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "No" #: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112 +#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112 #: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362 #: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455 -#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205 +#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165 #: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334 #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96 +#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173 #: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333 -#: Labels.php:358 Locations.php:420 MailingGroupMaintenance.php:178 -#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309 -#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205 -#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 -#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 -#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253 -#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465 -#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255 -#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130 -#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663 -#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722 -#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410 -#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296 +#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309 +#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 +#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210 +#: PaymentTerms.php:205 PcAssignCashToTab.php:277 +#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236 +#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253 +#: Prices_Customer.php:286 ProductSpecs.php:463 PurchData.php:312 +#: QATests.php:465 SalesCategories.php:272 SalesGLPostings.php:137 +#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206 +#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633 +#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705 +#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132 +#: SelectQASamples.php:410 SellThroughSupport.php:298 Shippers.php:144 +#: StockCategories.php:296 SuppTransGLAnalysis.php:125 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184 -#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185 -#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350 -#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 +#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190 +#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132 +#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110 +#: includes/OutputSerialItems.php:20 +#: reportwriter/languages/en_US/reports.php:143 #, php-format msgid "Edit" msgstr "Editar" @@ -476,24 +480,24 @@ #: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113 +#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113 #: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124 -#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:410 -#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167 -#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206 +#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 +#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167 +#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 -#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 +#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174 #: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607 -#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 -#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121 -#: PaymentMethods.php:211 Payments.php:1103 PaymentTerms.php:206 +#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310 +#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 +#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768 +#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103 #: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227 #: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181 -#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286 -#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464 -#: PurchData.php:314 PurchData.php:721 QATests.php:466 +#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287 +#: ProductSpecs.php:464 PurchData.php:314 PurchData.php:721 QATests.php:466 #: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170 #: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273 #: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241 @@ -504,14 +508,15 @@ #: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145 #: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626 #: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117 -#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166 +#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90 +#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166 #: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452 -#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 -#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191 -#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186 -#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133 -#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60 +#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186 +#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920 +#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133 +#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60 #: includes/OutputSerialItems.php:99 +#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "Suprimir" @@ -552,7 +557,7 @@ "long and less than 30 characters long. Only alpha numeric characters can be " "used." msgstr "" -"Se debe ingresar un nombre único para el grupo de cuentas -de al menos 3 " +"Se debe ingresar un nombre único para el grupo de cuentas -de al menos 3 " "caracteres y menos de 30 caracteres. Sólo se pueden usar caracteres " "alfanuméricos." @@ -583,23 +588,23 @@ #: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368 +#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368 #: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 -#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641 -#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424 -#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 -#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 +#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641 +#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424 +#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146 +#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310 #: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659 #: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 #: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524 #: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653 -#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327 +#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327 #: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967 -#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774 +#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283 msgid "Enter Information" -msgstr "Guardar la información" +msgstr "Introducir información" #: AccountSections.php:5 includes/MainMenuLinksArray.php:388 msgid "Account Sections" @@ -700,12 +705,12 @@ #: AddCustomerContacts.php:59 AddCustomerNotes.php:51 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68 #: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105 -#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91 -#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104 -#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74 +#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380 +#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98 +#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:313 QATests.php:74 #: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66 -#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531 -#: SupplierTypes.php:68 +#: SelectQASamples.php:83 Stocks.php:589 SupplierTypes.php:68 +#: Suppliers.php:531 msgid "has been updated" msgstr "ha sido actualizado" @@ -723,7 +728,7 @@ #: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162 #: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208 #: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286 -#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108 +#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152 #: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176 #: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144 msgid "Name" @@ -754,17 +759,18 @@ #: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67 #: includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19 -#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443 -#: ../webSHOP/Register.php:607 +#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 +#: ../webSHOP/Register.php:595 msgid "Email" msgstr "Correo-e" #: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1122 -#: Customers.php:1130 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 +#: Customers.php:1130 PDFQuotation.php:252 PDFQuotationPortrait.php:249 +#: PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 #: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238 -#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 PDFQuotation.php:252 -#: PDFQuotationPortrait.php:249 SelectCustomer.php:613 ShopParameters.php:198 -#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312 +#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 SelectCustomer.php:613 +#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306 +#: WOSerialNos.php:312 msgid "Notes" msgstr "Notas" @@ -782,7 +788,7 @@ msgstr "Código del contacto" #: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239 -#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:622 +#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610 msgid "Contact Name" msgstr "Nombre del contacto" @@ -791,8 +797,8 @@ #: SelectCustomer.php:425 SelectOrderItems.php:597 #: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63 #: includes/PDFTransPageHeader.inc:84 -#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:537 -#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:735 +#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389 +#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 msgid "Phone" msgstr "Teléfono" @@ -837,21 +843,22 @@ #: CustomerAllocations.php:378 CustomerInquiry.php:251 #: CustomerTransInquiry.php:100 GLAccountInquiry.php:173 #: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 -#: PaymentAllocations.php:66 PcAssignCashToTab.php:238 -#: PcAuthorizeExpenses.php:93 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 -#: PrintCustTrans.php:856 PrintCustTransPortrait.php:907 -#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 -#: ReverseGRN.php:398 SelectCustomer.php:659 SelectCustomer.php:701 -#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491 -#: StockDispatch.php:277 StockDispatch.php:288 StockDispatch.php:299 -#: StockLocMovements.php:92 StockMovements.php:100 -#: StockSerialItemResearch.php:82 SupplierAllocations.php:456 -#: SupplierAllocations.php:569 SupplierAllocations.php:644 -#: SupplierInquiry.php:209 SupplierTransInquiry.php:105 Tax.php:408 +#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 PaymentAllocations.php:66 +#: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:856 +#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186 +#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398 +#: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538 +#: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277 +#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92 +#: StockMovements.php:100 StockSerialItemResearch.php:82 +#: SupplierAllocations.php:456 SupplierAllocations.php:569 +#: SupplierAllocations.php:644 SupplierInquiry.php:209 +#: SupplierTransInquiry.php:105 Tax.php:408 #: includes/PDFQuotationPageHeader.inc:23 #: includes/PDFQuotationPortraitPageHeader.inc:80 #: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:63 +#: reportwriter/languages/en_US/reports.php:64 msgid "Date" msgstr "Fecha" @@ -953,16 +960,17 @@ msgstr "" #: AgedControlledInventory.php:12 InventoryQuantities.php:155 -#: InventoryValuation.php:217 Locations.php:392 Locations.php:453 -#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemands.php:27 -#: MRPDemandTypes.php:17 MRP.php:542 MRPPlannedPurchaseOrders.php:265 +#: InventoryValuation.php:217 Locations.php:392 Locations.php:453 MRP.php:542 +#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemandTypes.php:17 +#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265 #: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321 -#: PricesByCost.php:8 ReorderLevelLocation.php:12 ReorderLevel.php:194 +#: PricesByCost.php:8 ReorderLevel.php:194 ReorderLevelLocation.php:12 #: SelectProduct.php:88 StockDispatch.php:319 StockMovements.php:22 #: StockQties_csv.php:8 StockQuantityByDate.php:10 StockReorderLevel.php:20 #: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45 #: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:15 #: includes/MainMenuLinksArray.php:26 +#: reportwriter/languages/en_US/reports.php:243 msgid "Inventory" msgstr "Inventario" @@ -972,6 +980,7 @@ #: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261 #: StockClone.php:53 Stocks.php:63 +#: reportwriter/languages/en_US/reports.php:103 msgid "Stock" msgstr "Existencia" @@ -989,43 +998,43 @@ #: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345 #: InternalStockRequest.php:559 InternalStockRequest.php:629 #: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290 -#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50 -#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295 -#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258 MRPReport.php:536 -#: MRPReport.php:750 MRPReschedules.php:192 MRPShortages.php:350 -#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190 +#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295 +#: MRPPlannedWorkOrders.php:258 MRPReport.php:536 MRPReport.php:750 +#: MRPReschedules.php:192 MRPShortages.php:350 MaintenanceTasks.php:95 +#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194 +#: PDFCOA.php:64 PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335 +#: PO_Items.php:716 PO_Items.php:1187 PO_SelectOSPurchOrder.php:263 +#: PO_SelectPurchOrder.php:214 PaymentTerms.php:182 PcExpenses.php:190 #: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178 -#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335 -#: PDFOrderStatus.php:337 PO_Items.php:716 PO_Items.php:1187 -#: PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214 -#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73 -#: ReorderLevel.php:298 ReverseGRN.php:397 SalesCategories.php:509 -#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120 -#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147 -#: SelectCreditItems.php:1021 SelectOrderItems.php:1473 +#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154 +#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397 +#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103 +#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505 +#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473 #: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756 #: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560 #: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680 #: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173 #: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92 #: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120 -#: SuppInvGRNs.php:258 SupplierCredit.php:317 SupplierCredit.php:385 -#: SupplierInvoice.php:666 SupplierInvoice.php:746 SupplierPriceList.php:39 -#: SupplierPriceList.php:271 SupplierPriceList.php:533 -#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695 -#: SupplierTenderCreate.php:853 SupplierTenders.php:326 -#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309 +#: SuppInvGRNs.php:258 SuppPriceList.php:309 SupplierCredit.php:317 +#: SupplierCredit.php:385 SupplierInvoice.php:666 SupplierInvoice.php:746 +#: SupplierPriceList.php:39 SupplierPriceList.php:271 +#: SupplierPriceList.php:533 SupplierTenderCreate.php:434 +#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853 +#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687 #: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170 #: WorkCentres.php:128 WorkOrderCosting.php:98 WorkOrderCosting.php:130 #: WorkOrderEntry.php:735 WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33 -#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 -#: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51 +#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:29 +#: includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 -#: includes/PDFTransPageHeaderPortrait.inc:267 api/api_xml-rpc.php:3489 -#: ../webSHOP/includes/PlaceOrder.php:250 +#: includes/PDFTransPageHeaderPortrait.inc:267 +#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 +#: ../webSHOP/includes/PlaceOrder.php:236 msgid "Description" msgstr "Descripción" @@ -1065,16 +1074,18 @@ #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692 #: SelectCreditItems.php:696 SelectOrderItems.php:1313 -#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 -#: SupplierAllocations.php:458 SupplierAllocations.php:570 -#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:214 -#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:139 Tax.php:250 -#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109 +#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97 +#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458 +#: SupplierAllocations.php:570 SupplierAllocations.php:645 +#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250 +#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271 +#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 +#: includes/PDFQuotationPageHeader.inc:109 #: includes/PDFQuotationPortraitPageHeader.inc:100 -#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271 -#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 -#: ../webSHOP/includes/DisplayShoppingCart.php:8 -#: ../webSHOP/includes/PlaceOrder.php:299 +#: includes/PO_PDFOrderPageHeader.inc:81 +#: reportwriter/languages/en_US/reports.php:107 +#: ../webSHOP/includes/DisplayShoppingCart.php:7 +#: ../webSHOP/includes/PlaceOrder.php:285 #, php-format msgid "Total" msgstr "Total" @@ -1102,20 +1113,20 @@ #: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241 #: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301 #: InventoryQuantities.php:84 InventoryValuation.php:64 -#: MailInventoryValuation.php:22 MailInventoryValuation.php:120 -#: MailSalesReport_csv.php:30 MailSalesReport.php:23 #: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106 #: MRPReport.php:147 MRPReport.php:508 MRPReschedules.php:45 #: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167 -#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20 -#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20 -#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33 -#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267 -#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447 -#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500 -#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39 -#: SelectProduct.php:44 StockCheck.php:60 StockCheck.php:132 -#: SupplierTenderCreate.php:671 SupplierTenders.php:397 SuppPriceList.php:138 +#: MailInventoryValuation.php:22 MailInventoryValuation.php:120 +#: MailSalesReport.php:23 MailSalesReport_csv.php:30 OutstandingGRNs.php:46 +#: OutstandingGRNs.php:59 PDFCustomerList.php:20 PDFCustomerList.php:232 +#: PDFCustomerList.php:244 PDFLowGP.php:20 PDFSellThroughSupportClaim.php:17 +#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59 +#: PDFStockCheckComparison.php:267 PurchaseByPrefSupplier.php:399 +#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471 +#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531 +#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:44 +#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138 +#: SupplierTenderCreate.php:671 SupplierTenders.php:397 #: includes/PDFPaymentRun_PymtFooter.php:152 msgid "Problem Report" msgstr "Informe de problemas" @@ -1131,23 +1142,23 @@ #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45 #: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257 #: Dashboard.php:437 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 -#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:112 -#: GLBalanceSheet.php:150 GLBalanceSheet.php:329 GLProfit_Loss.php:188 -#: GLProfit_Loss.php:200 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 -#: GLTrialBalance.php:168 GLTrialBalance.php:182 InventoryPlanning.php:102 +#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:112 GLBalanceSheet.php:150 +#: GLBalanceSheet.php:329 GLProfit_Loss.php:188 GLProfit_Loss.php:200 +#: GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 GLTrialBalance.php:168 +#: GLTrialBalance.php:182 GetStockImage.php:150 InventoryPlanning.php:102 #: InventoryPlanning.php:179 InventoryPlanning.php:216 #: InventoryPlanning.php:265 InventoryPlanning.php:340 #: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244 #: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304 #: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87 #: InventoryQuantities.php:98 InventoryValuation.php:67 -#: InventoryValuation.php:92 MailInventoryValuation.php:123 -#: MailInventoryValuation.php:219 MailInventoryValuation.php:243 -#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117 +#: InventoryValuation.php:92 MRPPlannedPurchaseOrders.php:117 #: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109 #: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39 #: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48 #: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170 +#: MailInventoryValuation.php:123 MailInventoryValuation.php:219 +#: MailInventoryValuation.php:243 MailInventoryValuation.php:251 #: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235 #: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100 #: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 @@ -1156,29 +1167,29 @@ #: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 #: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 #: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 -#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256 -#: PrintCustOrder.php:238 PrintWOItemSlip.php:122 +#: PO_PDFPurchOrder.php:156 PrintCustOrder.php:238 +#: PrintCustOrder_generic.php:256 PrintWOItemSlip.php:122 #: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 #: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503 #: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182 #: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42 #: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 #: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141 -#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65 #: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186 -#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171 -#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 +#: SuppPaymentRun.php:217 SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54 +#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310 +#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 #: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383 #: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 #: includes/PDFPaymentRun_PymtFooter.php:59 #: includes/PDFPaymentRun_PymtFooter.php:89 #: includes/PDFPaymentRun_PymtFooter.php:119 #: includes/PDFPaymentRun_PymtFooter.php:156 #: includes/PDFPaymentRun_PymtFooter.php:187 #: includes/PDFPaymentRun_PymtFooter.php:218 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 msgid "Back to the menu" msgstr "Volver al menú" @@ -1204,32 +1215,32 @@ #: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574 #: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91 #: Dashboard.php:259 Dashboard.php:439 DeliveryDetails.php:409 -#: GLProfit_Loss.php:609 GLTagProfit_Loss.php:515 Payments.php:361 -#: PDFRemittanceAdvice.php:85 PurchData.php:114 PurchData.php:132 -#: PurchData.php:360 RecurringSalesOrders.php:267 ReverseGRN.php:192 -#: ReverseGRN.php:206 ReverseGRN.php:385 SelectCreditItems.php:1447 +#: GLProfit_Loss.php:609 GLTagProfit_Loss.php:515 PDFRemittanceAdvice.php:85 +#: Payments.php:361 PurchData.php:114 PurchData.php:132 PurchData.php:360 +#: RecurringSalesOrders.php:267 ReverseGRN.php:192 ReverseGRN.php:206 +#: ReverseGRN.php:385 SMTPServer.php:62 SelectCreditItems.php:1447 #: SelectSalesOrder.php:209 SelectSalesOrder.php:375 SellThroughSupport.php:81 -#: SellThroughSupport.php:97 SMTPServer.php:62 StockCheck.php:217 -#: StockClone.php:430 StockClone.php:504 StockCostUpdate.php:78 -#: StockCostUpdate.php:88 StockLocStatus.php:165 StockMovements.php:93 -#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285 -#: StockTransfers.php:201 StockUsageGraph.php:55 StockUsage.php:142 -#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:138 -#: SupplierInquiry.php:194 SupplierPriceList.php:382 -#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188 -#: SuppPaymentRun.php:219 WorkOrderCosting.php:427 WorkOrderReceive.php:298 -#: WOSerialNos.php:49 Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97 +#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430 +#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88 +#: StockLocStatus.php:165 StockMovements.php:93 StockQuantityByDate.php:98 +#: StockReorderLevel.php:45 StockStatus.php:285 StockTransfers.php:201 +#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114 +#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:78 +#: SupplierInquiry.php:100 SupplierInquiry.php:138 SupplierInquiry.php:194 +#: SupplierPriceList.php:382 SupplierTransInquiry.php:97 WOSerialNos.php:49 +#: WorkOrderCosting.php:427 WorkOrderReceive.php:298 +#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97 #: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63 #: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88 #: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:90 +#: includes/ConnectDB_mysql.inc:66 includes/ConnectDB_mysqli.inc:74 #: includes/PDFPaymentRun_PymtFooter.php:61 #: includes/PDFPaymentRun_PymtFooter.php:91 #: includes/PDFPaymentRun_PymtFooter.php:121 #: includes/PDFPaymentRun_PymtFooter.php:158 -#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:74 -#: includes/ConnectDB_mysql.inc:66 +#: includes/PDFPaymentRun_PymtFooter.php:189 #: ../webSHOP/includes/DatabaseFunctions.php:60 -#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68 +#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70 msgid "The SQL that failed was" msgstr "El SQL que falló fue" @@ -1314,21 +1325,21 @@ #: PDFPriceList.php:351 PDFRemittanceAdvice.php:175 #: PDFStockCheckComparison.php:373 PrintCustTrans.php:570 #: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447 -#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:263 Tax.php:385 +#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385 msgid "Print PDF" msgstr "Imprimir PDF" #: AgedSuppliers.php:14 msgid "Aged Supplier Listing" -msgstr "Listado de Saldos de Proveedores por Vencimiento" +msgstr "Listado de Saldos de proveedores por Vencimiento" #: AgedSuppliers.php:15 msgid "Aged Suppliers" -msgstr "Saldos de Proveedores por Vencimiento" +msgstr "Saldos de proveedores por Vencimiento" #: AgedSuppliers.php:108 msgid "Aged Supplier Account Analysis" -msgstr "Análisis de Saldos de Proveedores por Vencimiento" +msgstr "Análisis de Saldos de proveedores por Vencimiento" #: AgedSuppliers.php:110 SupplierBalsAtPeriodEnd.php:53 msgid "The Supplier details could not be retrieved by the SQL because" @@ -1336,7 +1347,7 @@ #: AgedSuppliers.php:195 msgid "Aged Supplier Account Analysis - Problem Report" -msgstr "Análisis Contable de Proveedores Antiguos - Informe de problemas" +msgstr "Análisis Contable de proveedores Antiguos - Informe de problemas" #: AgedSuppliers.php:197 msgid "The details of outstanding transactions for Supplier" @@ -1344,14 +1355,14 @@ #: AgedSuppliers.php:263 AgedSuppliers.php:273 msgid "Aged Supplier Analysis" -msgstr "Análisis de Saldos de Proveedores por Vencimiento" +msgstr "Análisis de Saldos de proveedores por Vencimiento" #: AgedSuppliers.php:265 msgid "There are no results so the PDF is empty" msgstr "No hay resultados por lo que el PDF esta vacío" #: AgedSuppliers.php:287 OutstandingGRNs.php:267 PDFRemittanceAdvice.php:153 -#: SupplierBalsAtPeriodEnd.php:131 SuppPaymentRun.php:265 +#: SuppPaymentRun.php:265 SupplierBalsAtPeriodEnd.php:131 #: Z_ClearPOBackOrders.php:20 msgid "From Supplier Code" msgstr "Desde código proveedor" @@ -1362,7 +1373,7 @@ "Introduzca el primer código alfabético de proveedor a incluir en el informe" #: AgedSuppliers.php:291 OutstandingGRNs.php:271 PDFRemittanceAdvice.php:157 -#: SupplierBalsAtPeriodEnd.php:135 SuppPaymentRun.php:269 +#: SuppPaymentRun.php:269 SupplierBalsAtPeriodEnd.php:135 #: Z_ClearPOBackOrders.php:23 msgid "To Supplier Code" msgstr "Hasta código proveedor" @@ -1430,7 +1441,7 @@ "Cannot delete this area because customer branches have been created using " "this area" msgstr "" -"No se puede suprimir esta zona porque existen Sucursales de clientes que la " +"No se puede suprimir esta zona porque existen sucursales de clientes que la " "usan" #: Areas.php:115 @@ -1455,12 +1466,12 @@ #: Areas.php:131 CustomerTypes.php:167 Factors.php:140 #: FixedAssetCategories.php:142 GLAccounts.php:196 -#: InternalStockCategoriesByRole.php:102 Locations.php:366 -#: Manufacturers.php:163 MRPDemands.php:250 PcAssignCashToTab.php:138 +#: InternalStockCategoriesByRole.php:102 Locations.php:366 MRPDemands.php:250 +#: Manufacturers.php:163 PcAssignCashToTab.php:138 #: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101 #: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215 #: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:233 -#: Suppliers.php:672 SupplierTypes.php:132 Z_DeleteInvoice.php:178 +#: SupplierTypes.php:132 Suppliers.php:672 Z_DeleteInvoice.php:178 #: includes/DefineOfferClass.php:134 msgid "has been deleted" msgstr "ha sido eliminado" @@ -1522,7 +1533,7 @@ #: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145 #: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70 #: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225 -#: PDFPriceList.php:324 PO_Items.php:1124 POReport.php:1586 +#: PDFPriceList.php:324 POReport.php:1586 PO_Items.php:1124 #: ReorderLevel.php:212 ReorderLevel.php:214 ReorderLevel.php:244 #: ReorderLevel.php:246 SalesGraph.php:103 SalesGraph.php:105 #: SalesGraph.php:125 SalesGraph.php:127 SalesGraph.php:149 SalesGraph.php:151 @@ -1541,6 +1552,7 @@ #: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71 #: TopItems.php:73 WorkOrderEntry.php:677 WorkOrderEntry.php:680 #: WorkOrderIssue.php:716 WorkOrderIssue.php:719 +#: reportwriter/languages/en_US/reports.php:54 msgid "All" msgstr "Todos" @@ -1570,9 +1582,9 @@ msgstr "Usuario" #: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295 -#: CustomerAllocations.php:376 CustomerInquiry.php:249 -#: CustomerPurchases.php:82 CustomerTransInquiry.php:21 -#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111 +#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAllocations.php:376 +#: CustomerInquiry.php:249 CustomerPurchases.php:82 +#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:98 #: DailyBankTransactions.php:129 GLAccountInquiry.php:171 #: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194 #: ProductSpecs.php:386 QATests.php:255 QATests.php:393 @@ -1583,6 +1595,7 @@ #: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57 #: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11 #: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152 +#: reportwriter/languages/en_US/reports.php:111 msgid "Type" msgstr "Tipo" @@ -1591,7 +1604,7 @@ msgstr "Tabla" #: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777 -#: api/api_xml-rpc.php:2187 +#: api/api_xml-rpc.php:2187 reportwriter/languages/en_US/reports.php:72 msgid "Field Name" msgstr "Nombre del campo" @@ -1619,34 +1632,36 @@ #: BOMs.php:913 ContractBOM.php:353 CounterReturns.php:1691 #: CounterSales.php:2101 CounterSales.php:2255 CustItem.php:297 #: CustomerBranches.php:407 CustomerReceipt.php:1200 GLCodesInquiry.php:26 -#: InternalStockRequest.php:558 InternalStockRequest.php:628 -#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257 -#: MRPReport.php:749 NoSalesItems.php:193 PDFOrdersInvoiced.php:334 -#: PDFOrderStatus.php:336 PO_Header.php:561 PO_Items.php:1186 -#: PO_SelectOSPurchOrder.php:262 PO_SelectPurchOrder.php:213 -#: PricesByCost.php:152 PurchData.php:469 RelatedItemsUpdate.php:153 -#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207 +#: InternalStockRequest.php:558 InternalStockRequest.php:628 MRPDemands.php:91 +#: MRPPlannedWorkOrders.php:257 MRPReport.php:749 MaterialsNotUsed.php:34 +#: NoSalesItems.php:193 PDFOrderStatus.php:336 PDFOrdersInvoiced.php:334 +#: PO_Header.php:561 PO_Items.php:1186 PO_SelectOSPurchOrder.php:262 +#: PO_SelectPurchOrder.php:213 PricesByCost.php:152 PurchData.php:469 +#: RelatedItemsUpdate.php:153 ReorderLevelLocation.php:72 +#: RevisionTranslations.php:59 SalesPeople.php:207 #: SelectCompletedOrder.php:504 SelectCreditItems.php:1020 #: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472 #: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291 #: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218 #: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148 -#: StockCategories.php:263 SupplierPriceList.php:270 SupplierPriceList.php:455 -#: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852 -#: SupplierTenders.php:686 SuppPriceList.php:308 TestPlanResults.php:176 -#: TopItems.php:169 UserLocations.php:175 WorkOrderEntry.php:734 -#: WorkOrderIssue.php:760 includes/PDFTopItemsHeader.inc:49 -#: includes/PO_PDFOrderPageHeader.inc:75 ../webSHOP/ItemDetails.php:72 +#: StockCategories.php:263 SuppPriceList.php:308 SupplierPriceList.php:270 +#: SupplierPriceList.php:455 SupplierTenderCreate.php:617 +#: SupplierTenderCreate.php:852 SupplierTenders.php:686 +#: TestPlanResults.php:176 TopItems.php:169 UserLocations.php:175 +#: WorkOrderEntry.php:734 WorkOrderIssue.php:760 +#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75 +#: ../webSHOP/ItemDetails.php:72 msgid "Code" msgstr "Código" #: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52 #: FixedAssetRegister.php:366 GLJournalInquiry.php:28 GLJournalInquiry.php:45 -#: PcReportTab.php:269 POReport.php:517 POReport.php:1521 +#: POReport.php:517 POReport.php:1521 PcReportTab.php:269 #: SalesAnalRepts.php:436 SalesAnalRepts.php:464 SalesAnalRepts.php:493 #: SalesAnalRepts.php:512 SalesInquiry.php:798 SalesInquiry.php:1106 #: StockDispatch.php:513 StockLocTransferReceive.php:104 #: SupplierTransInquiry.php:53 includes/PO_PDFOrderPageHeader.inc:40 +#: reportwriter/languages/en_US/reports.php:105 msgid "To" msgstr "Para" @@ -1659,851 +1674,13 @@ msgid "No item description was automatically translated" msgstr "Ninguna descripción de artículo fue traducido automáticamente" -#: BackupDatabase.php:7 -msgid "Backup webERP Database" -msgstr "Respaldar base de datos del webERP" - -#: BackupDatabase.php:20 -msgid "Deleted" -msgstr "Eliminado" - -#: BackupDatabase.php:23 -msgid "Unable to delete" -msgstr "No fue posible eliminar" - -#: BackupDatabase.php:28 -msgid "All backup files on the server have been deleted" -msgstr "Se han eliminado todos los archivos de respaldo del servidor" - -#: BackupDatabase.php:30 -msgid "No backup files on the server were deleted" -msgstr "No se borraron los archivos de respaldo en el servidor" - -#: BackupDatabase.php:34 -msgid "Backup" -msgstr "Respaldo" - -#: BackupDatabase.php:43 -msgid "" -"The backup file has now been created. You must now download this to your " -"computer because in case the web-server has a disk failure the backup would " -"then not on the same machine. Use the link below" -msgstr "" -"Se ha creado el archivo de copia de seguridad. Ahora debe descargarlo a su " -"computador ya que en caso de que el servidor web tenga una falla en el " -"disco. la copia de seguridad estará no en la misma máquina. Use el enlace de " -"abajo" - -#: BackupDatabase.php:43 -msgid "Download the backup file to your locale machine" -msgstr "Descargue el archivo de copia de seguridad en su máquina" - -#: BackupDatabase.php:44 -msgid "" -"Once you have downloaded the database backup file to your local machine you " -"should use the link below to delete it - backup files can consume a lot of " -"space on your hosting account and will accumulate if not deleted - they also " -"contain sensitive information which would otherwise be available for others " -"to download!" -msgstr "" -"Una vez que haya descargado el archivo de copia de seguridad de la base de " -"datos a su equipo local, se debe utilizar el enlace de abajo para eliminarlo " -"- los archivos de copia de seguridad pueden consumir una gran cantidad de " -"espacio en su cuenta de alojamiento y se acumulará si no se eliminan - " -"también contienen información que de otro modo estaría disponible para que " -"otros puedan descargarla!" - -#: BackupDatabase.php:47 -msgid "Delete the backup file off the server" -msgstr "Borrar el archivo de respaldo del servidor" - -#: BackupDatabase.php:49 -msgid "" -"There was some problem producing a backup using mysq... [truncated message content] |
From: <aga...@us...> - 2015-01-29 14:01:55
|
Revision: 7107 http://sourceforge.net/p/web-erp/reponame/7107 Author: agaluski Date: 2015-01-29 14:01:52 +0000 (Thu, 29 Jan 2015) Log Message: ----------- 2 new emailed weekly reports, contain $AllowAnyone Added Paths: ----------- trunk/PDFSalesBySalesperson.php trunk/PDFWeeklyOrders.php Added: trunk/PDFSalesBySalesperson.php =================================================================== --- trunk/PDFSalesBySalesperson.php (rev 0) +++ trunk/PDFSalesBySalesperson.php 2015-01-29 14:01:52 UTC (rev 7107) @@ -0,0 +1,173 @@ +<?php + +/* $Id: PDFSalesBySalesperson.php 1 2014-11-11 03:26:23Z agaluski $*/ +$DatabaseName='weberp'; +$AllowAnyone = true; + +include ('includes/session.inc'); +include('includes/SQL_CommonFunctions.inc'); +include ('includes/class.pdf.php'); +$_POST['FromDate']=date('Y-m-01'); +$_POST['ToDate']= FormatDateForSQL(Date($_SESSION['DefaultDateFormat'])); +$WeekStartDate = Date(($_SESSION['DefaultDateFormat']), strtotime($WeekStartDate . ' - 7 days')); +$Recipients = GetMailList('salesbysalesperson'); +if (sizeOf($Recipients) == 0) { + $Title = _('Weekly Orders') . ' - ' . _('Problem Report'); + include('includes/header.inc'); + prnMsg( _('There are no members of the Weekly Orders Recipients email group'), 'warn'); + include('includes/footer.inc'); + exit; +} + +$sql= "SELECT salesorders.orderno, + salesorders.orddate, + salesorderdetails.stkcode, + salesorderdetails.unitprice, + stockmaster.description, + stockmaster.units, + stockmaster.decimalplaces, + salesorderdetails.quantity, + salesorderdetails.qtyinvoiced, + salesorderdetails.completed, + salesorderdetails.discountpercent, + stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS standardcost, + debtorsmaster.name, + salesman.salesmanname + FROM salesorders + INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + INNER JOIN stockmaster + ON salesorderdetails.stkcode = stockmaster.stockid + INNER JOIN debtorsmaster + ON salesorders.debtorno=debtorsmaster.debtorno + INNER JOIN custbranch ON custbranch.debtorno=salesorders.debtorno + AND custbranch.branchcode=salesorders.branchcode + INNER JOIN salesman ON salesman.salesmancode=custbranch.salesman + WHERE salesorders.orddate >='" . FormatDateForSQL($WeekStartDate) . "' + AND salesorders.orddate <='" . $_POST['ToDate'] . "' + AND salesorders.quotation=0 + ORDER BY custbranch.salesman, salesorders.orderno"; + +$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here + +if (DB_error_no($db)!=0){ + include('includes/header.inc'); + echo '<br />' . _('An error occurred getting the orders details'); + if ($debug==1){ + echo '<br />' . _('The SQL used to get the orders that failed was') . '<br />' . $sql; + } + include ('includes/footer.inc'); + exit; +} +$PaperSize="Letter_Landscape"; +include('includes/PDFStarter.php'); +$pdf->addInfo('Title',_('Weekly Orders Report')); +$pdf->addInfo('Subject',_('Orders from') . ' ' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate']); +$line_height=12; +$PageNumber = 1; +$TotalDiffs = 0; +include ('includes/PDFWeeklyOrdersPageHeader.inc'); +$Col1=2; +$Col2=40; +$Col3=160; +$Col4=210; +$Col5=260; +$Col6=390; +$Col7=450; +$Col8=510; +$Col9=570; +$Col10=650; +$Col11=660; + +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,_('Order'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Customer'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,_('Order Date'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,_('Item'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,_('Description'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,_('Quantity'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,_('Sales'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,_('Status'), 'Left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,_('Salesperson'), 'Left'); + +$YPos-=$line_height; +$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos); +$YPos-=$line_height; +$Salesman=''; +while ($myrow=DB_fetch_array($Result)){ + + if ($myrow['completed']==1) { + $Status="Closed"; + $Qty=$myrow['qtyinvoiced']; + } else { + $Qty=$myrow['quantity']; + if ($myrow['qtyinvoiced']==0) { + $Status= _('Ordered'); + } else { + $Status= _('Partial'); + } + } + $SalesValue=$Qty*$myrow['unitprice']*(1-$myrow['discountpercent']); + $SalesCost=$Qty*$myrow['standardcost']; + if ($SalesValue <> 0) { + $GP=($SalesValue-$SalesCost)/$SalesValue *100; + } else { + $GP=0; + } + + if ($Salesman > '' and $Salesman <> $myrow['salesmanname']){ + $PageNumber++; + include ('includes/PDFWeeklyOrdersPageHeader.inc'); + } /*end of new page header */ + $Salesman = $myrow['salesmanname']; + + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,$myrow['orderno'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,html_entity_decode($myrow['name'],ENT_QUOTES,'UTF-8'), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,ConvertSQLDate($myrow['orddate']), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,$myrow['stkcode'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,$myrow['description'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($myrow['quantity'],$_SESSION['CompanyRecord']['decimalplaces']), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($SalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,$Status, 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,$myrow['salesmanname'], 'left'); + if ($YPos - (2 *$line_height) < $Bottom_Margin){ + $PageNumber++; + include ('includes/PDFWeeklyOrdersPageHeader.inc'); + } /*end of new page header */ + $YPos -= $line_height; + +} //while + +include('includes/htmlMimeMail.php'); +$filename=$_SESSION['reports_dir'] . '/SalesBySalesperson.pdf'; +$pdf->Output($filename, 'F'); +$pdf->__destruct(); +$mail = new htmlMimeMail(); +$attachment = $mail->getFile($filename); +$mail->setText(_('Please find the Sales By Salesperson report')); +$mail->setSubject(_('Sales By Salesperson Report')); +$mail->addAttachment($attachment, $filename, 'application/pdf'); +//echo '<br /><div class="centre"><a href="' . $RootPath . '/' . $filename . '">' . _('click here') . '</a> ' . _('to view the file') . '</div>'; +if($_SESSION['SmtpSetting']==0){ + $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>'); + $result = $mail->send($Recipients); +}else{ + $result = SendmailBySmtp($mail,$Recipients); +} +if($result){ + $Title = _('Print Weekly Orders'); + include('includes/header.inc'); + prnMsg(_('The Weekly Orders report has been mailed'),'success'); + echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; + include('includes/footer.inc'); + exit; + +}else{ + $Title = _('Print Weekly Orders Error'); + include('includes/header.inc'); + prnMsg(_('There are errors lead to mails not sent'),'error'); + echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; + include('includes/footer.inc'); + exit; + +} +?> \ No newline at end of file Added: trunk/PDFWeeklyOrders.php =================================================================== --- trunk/PDFWeeklyOrders.php (rev 0) +++ trunk/PDFWeeklyOrders.php 2015-01-29 14:01:52 UTC (rev 7107) @@ -0,0 +1,222 @@ +<?php + +/* $Id: PDFWeeklyOrders.php 1 2014-11-11 03:26:23Z agaluski $*/ +$DatabaseName='weberp'; +$AllowAnyone = true; + +include ('includes/session.inc'); +include('includes/SQL_CommonFunctions.inc'); +include ('includes/class.pdf.php'); +$_POST['FromDate']=date('Y-m-01'); +$_POST['ToDate']= FormatDateForSQL(Date($_SESSION['DefaultDateFormat'])); +$WeekStartDate = Date(($_SESSION['DefaultDateFormat']), strtotime($WeekStartDate . ' - 7 days')); +$Recipients = GetMailList('WeeklyOrders'); +if (sizeOf($Recipients) == 0) { + $Title = _('Weekly Orders') . ' - ' . _('Problem Report'); + include('includes/header.inc'); + prnMsg( _('There are no members of the Weekly Orders Recipients email group'), 'warn'); + include('includes/footer.inc'); + exit; +} + +$sql= "SELECT salesorders.orderno, + salesorders.orddate, + salesorderdetails.stkcode, + salesorderdetails.unitprice, + stockmaster.description, + stockmaster.units, + stockmaster.decimalplaces, + salesorderdetails.quantity, + salesorderdetails.qtyinvoiced, + salesorderdetails.completed, + salesorderdetails.discountpercent, + stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS standardcost, + debtorsmaster.name + FROM salesorders + INNER JOIN salesorderdetails + ON salesorders.orderno = salesorderdetails.orderno + INNER JOIN stockmaster + ON salesorderdetails.stkcode = stockmaster.stockid + INNER JOIN debtorsmaster + ON salesorders.debtorno=debtorsmaster.debtorno + WHERE salesorders.orddate >='" . FormatDateForSQL($WeekStartDate) . "' + AND salesorders.orddate <='" . $_POST['ToDate'] . "' + AND salesorders.quotation=0 + ORDER BY salesorders.orderno"; + +$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here + +if (DB_error_no($db)!=0){ + include('includes/header.inc'); + echo '<br />' . _('An error occurred getting the orders details'); + if ($debug==1){ + echo '<br />' . _('The SQL used to get the orders that failed was') . '<br />' . $sql; + } + include ('includes/footer.inc'); + exit; +} +$PaperSize="Letter_Landscape"; +include('includes/PDFStarter.php'); +$pdf->addInfo('Title',_('Weekly Orders Report')); +$pdf->addInfo('Subject',_('Orders from') . ' ' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate']); +$line_height=12; +$PageNumber = 1; +$TotalDiffs = 0; +include ('includes/PDFWeeklyOrdersPageHeader.inc'); +$Col1=2; +$Col2=40; +$Col3=160; +$Col4=210; +$Col5=260; +$Col6=390; +$Col7=450; +$Col8=510; +$Col9=570; +$Col10=610; +$Col11=660; + +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,_('Order'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Customer'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,_('Order Date'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,_('Item'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,_('Description'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,_('Quantity'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,_('Sales'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,_('Cost'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,_('GP %'), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col10,$YPos,$Col11-$Col10-5,$FontSize,_('Status'), 'Left'); + +$YPos-=$line_height; +$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos); +$YPos-=$line_height; + +while ($myrow=DB_fetch_array($Result)){ + + if ($myrow['completed']==1) { + $Status="Closed"; + $Qty=$myrow['qtyinvoiced']; + } else { + $Qty=$myrow['quantity']; + if ($myrow['qtyinvoiced']==0) { + $Status= _('Ordered'); + } else { + $Status= _('Partial'); + } + } + $SalesValue=$Qty*$myrow['unitprice']*(1-$myrow['discountpercent']); + $SalesCost=$Qty*$myrow['standardcost']; + if ($SalesValue <> 0) { + $GP=($SalesValue-$SalesCost)/$SalesValue *100; + } else { + $GP=0; + } + + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,$myrow['orderno'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,html_entity_decode($myrow['name'],ENT_QUOTES,'UTF-8'), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,ConvertSQLDate($myrow['orddate']), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,$myrow['stkcode'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,$myrow['description'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($myrow['quantity'],$_SESSION['CompanyRecord']['decimalplaces']), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($SalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($SalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($GP,2), 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col10,$YPos,$Col11-$Col10-5,$FontSize,$Status, 'left'); + if ($YPos - (2 *$line_height) < $Bottom_Margin){ + $PageNumber++; + include ('includes/PDFWeeklyOrdersPageHeader.inc'); + } /*end of new page header */ + $YPos -= $line_height; + $TotalSalesValue += $SalesValue; + $TotalSalesCost += $SalesCost; + $TotalSalesVolume += $myrow['quantity']; +} //while +if ($TotalSalesValue <> 0) { + $TotalGP=($TotalSalesValue-$TotalSalesCost)/$TotalSalesValue *100; +} else { + $TotalGP=0; +} +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Total Order Amounts'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($TotalSalesVolume,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($TotalSalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($TotalSalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($TotalGP,2), 'right'); +if ($YPos - (2 *$line_height) < $Bottom_Margin){ + $PageNumber++; + include ('includes/PDFWeeklyOrdersPageHeader.inc'); +} /*end of new page header */ + +$YPos -= $line_height; +$YPos -= $line_height; +$TotalSalesValue=0; +$TotalSalesCost=0; +$TotalSalesVolume=0; +$TotalGP=0; +$sql = "SELECT trandate, + (price*(1-discountpercent)* (-qty)) as salesvalue, + (CASE WHEN mbflag='A' THEN 0 ELSE (standardcost * -qty) END) as cost, + stockmoves.stockid, + description, + reference, + qty, + transno + FROM stockmoves + INNER JOIN stockmaster + ON stockmoves.stockid=stockmaster.stockid + INNER JOIN custbranch + ON stockmoves.debtorno=custbranch.debtorno + AND stockmoves.branchcode=custbranch.branchcode + WHERE (stockmoves.type=10 or stockmoves.type=11) + AND trandate>='" . $_POST['FromDate'] . "' + AND trandate<='" . $_POST['ToDate'] . "'"; + +$ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db); +$SalesResult = DB_query($sql, $db,$ErrMsg); +while ($DaySalesRow=DB_fetch_array($SalesResult)) { + $TotalSalesValue += $DaySalesRow['salesvalue']; + $TotalSalesCost += $DaySalesRow['cost']; + $TotalSalesVolume -= $DaySalesRow['qty']; +} +if ($TotalSalesValue <> 0) { + $TotalGP=($TotalSalesValue-$TotalSalesCost)/$TotalSalesValue *100; +} else { + $TotalGP=0; +} +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Monthly Invoiced Total'), 'left'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($TotalSalesVolume,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($TotalSalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($TotalSalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right'); +$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($TotalGP,2), 'right'); + +include('includes/htmlMimeMail.php'); +$filename=$_SESSION['reports_dir'] . '/WeeklyOrders.pdf'; +$pdf->Output($filename, 'F'); +$pdf->__destruct(); +$mail = new htmlMimeMail(); +$attachment = $mail->getFile($filename); +$mail->setText(_('Please find the weekly order report')); +$mail->setSubject(_('Weekly Orders Report')); +$mail->addAttachment($attachment, $filename, 'application/pdf'); +if($_SESSION['SmtpSetting']==0){ + $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>'); + $result = $mail->send($Recipients); +}else{ + $result = SendmailBySmtp($mail,$Recipients); +} +if($result){ + $Title = _('Print Weekly Orders'); + include('includes/header.inc'); + prnMsg(_('The Weekly Orders report has been mailed'),'success'); + echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; + include('includes/footer.inc'); + exit; + +}else{ + $Title = _('Print Weekly Orders Error'); + include('includes/header.inc'); + prnMsg(_('There are errors lead to mails not sent'),'error'); + echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; + include('includes/footer.inc'); + exit; + +} +?> \ No newline at end of file |
From: <dai...@us...> - 2015-01-29 08:34:33
|
Revision: 7106 http://sourceforge.net/p/web-erp/reponame/7106 Author: daintree Date: 2015-01-29 08:34:26 +0000 (Thu, 29 Jan 2015) Log Message: ----------- Harald Ringehahn untranslated string Modified Paths: -------------- trunk/Z_UpdateItemCosts.php Modified: trunk/Z_UpdateItemCosts.php =================================================================== --- trunk/Z_UpdateItemCosts.php 2015-01-29 07:07:12 UTC (rev 7105) +++ trunk/Z_UpdateItemCosts.php 2015-01-29 08:34:26 UTC (rev 7106) @@ -109,7 +109,7 @@ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<div class="page_help_text">' . _('This function updates the costs of all items from a comma separated variable (csv) file.') . '<br />' . - _('The file must contain two columns, and the first row should be the following headers:') . '<br /><i>StockID, Material Cost, Labour Cost, Overhead Cost</i><br />' . + _('The file must contain two columns, and the first row should be the following headers:') . '<br /><i>' . _('StockID, Material Cost, Labour Cost, Overhead Cost') . '</i><br />' . _('followed by rows containing these four fields for each cost to be updated.') . '<br />' . _('The StockID field must have a corresponding entry in the stockmaster table.') . '</div>'; |
From: <dai...@us...> - 2015-01-29 07:07:26
|
Revision: 7105 http://sourceforge.net/p/web-erp/reponame/7105 Author: daintree Date: 2015-01-29 07:07:12 +0000 (Thu, 29 Jan 2015) Log Message: ----------- Jiro new updated zh_TW.utf8 translation Modified Paths: -------------- trunk/doc/Change.log trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-01-27 19:51:35 UTC (rev 7104) +++ trunk/doc/Change.log 2015-01-29 07:07:12 UTC (rev 7105) @@ -1,7 +1,9 @@ webERP Change Log +30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8 27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir". + 27/01/15 Version 4.12 release 25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual. Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-27 19:51:35 UTC (rev 7104) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-29 07:07:12 UTC (rev 7105) @@ -175,23 +175,23 @@ #: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125 #: Currencies.php:244 Currencies.php:252 Currencies.php:260 #: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321 -#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146 -#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 -#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 -#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95 -#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293 -#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329 -#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154 -#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153 -#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135 -#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172 -#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 -#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779 -#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819 -#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 -#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142 -#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88 -#: WorkCentres.php:89 WorkCentres.php:95 +#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296 +#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334 +#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141 +#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79 +#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284 +#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320 +#: Locations.php:329 Locations.php:337 Manufacturers.php:154 +#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146 +#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128 +#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166 +#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 +#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771 +#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 +#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 +#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134 +#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135 +#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88 msgid "There are" msgstr "Existen" @@ -250,47 +250,46 @@ #: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110 #: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102 #: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193 -#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30 +#: Credit_Invoice.php:276 CreditStatus.php:21 Currencies.php:30 #: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238 #: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 #: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 #: FixedAssetLocations.php:13 FixedAssetRegister.php:16 #: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 -#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250 -#: GLJournalInquiry.php:11 HistoricalTestResults.php:38 -#: InternalStockRequest.php:311 InventoryPlanning.php:354 -#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516 -#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91 -#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60 -#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10 -#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59 -#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149 -#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11 -#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38 -#: PurchData.php:241 PurchData.php:373 PurchData.php:401 -#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320 -#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14 -#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40 -#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48 -#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220 -#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65 -#: SelectOrderItems.php:559 SelectOrderItems.php:1463 -#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43 -#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220 -#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229 -#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160 -#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29 +#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11 +#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311 +#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386 +#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516 +#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 +#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29 +#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60 +#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148 +#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 +#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 +#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20 +#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24 +#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 +#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28 +#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11 +#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291 +#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559 +#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510 +#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14 +#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174 +#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 +#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 +#: StockLocMovements.php:14 StockLocStatus.php:29 #: StockSerialItemResearch.php:30 SupplierPriceList.php:14 #: SupplierPriceList.php:224 SupplierPriceList.php:394 #: SupplierPriceList.php:398 SupplierPriceList.php:449 -#: SupplierPriceList.php:499 SupplierTenderCreate.php:556 +#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556 #: SupplierTenderCreate.php:664 SupplierTenders.php:322 -#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304 -#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10 -#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111 -#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11 -#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58 -#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251 +#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27 +#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 +#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22 +#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31 +#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57 +#: ../webSHOP/includes/header.php:216 msgid "Search" msgstr "Buscar" @@ -324,44 +323,44 @@ #: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101 #: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628 #: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663 -#: MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 -#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 -#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 PDFWOPrint.php:604 -#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 -#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416 -#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208 -#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282 -#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248 -#: ProductSpecs.php:186 ProductSpecs.php:407 ProductSpecs.php:412 -#: ProductSpecs.php:418 ProductSpecs.php:423 ProductSpecs.php:428 -#: ProductSpecs.php:560 ProductSpecs.php:606 ProductSpecs.php:608 -#: ProductSpecs.php:619 ProductSpecs.php:621 ProductSpecs.php:632 -#: ProductSpecs.php:634 ProductSpecs.php:645 ProductSpecs.php:647 -#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:291 -#: QATests.php:293 QATests.php:304 QATests.php:306 QATests.php:317 -#: QATests.php:319 QATests.php:330 QATests.php:332 QATests.php:343 -#: QATests.php:345 QATests.php:412 QATests.php:417 QATests.php:422 -#: QATests.php:427 QATests.php:432 RecurringSalesOrders.php:493 -#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284 -#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420 -#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451 -#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264 -#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227 -#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237 -#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511 -#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570 -#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667 -#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337 -#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395 -#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495 -#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924 -#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258 -#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90 -#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543 -#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672 -#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780 -#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849 -#: SystemParameters.php:945 SystemParameters.php:1088 +#: MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 +#: MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207 +#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275 +#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296 +#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65 +#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600 +#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134 +#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 +#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407 +#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423 +#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606 +#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621 +#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645 +#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670 +#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306 +#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332 +#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417 +#: QATests.php:422 QATests.php:427 QATests.php:432 +#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 +#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 +#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 +#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476 +#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351 +#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367 +#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362 +#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513 +#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582 +#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289 +#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341 +#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413 +#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499 +#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949 +#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283 +#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502 +#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632 +#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772 +#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805 +#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088 #: SystemParameters.php:1090 SystemParameters.php:1100 #: SystemParameters.php:1102 SystemParameters.php:1156 #: SystemParameters.php:1168 SystemParameters.php:1170 @@ -371,14 +370,14 @@ #: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 #: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516 #: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704 -#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114 +#: WWW_Users.php:706 msgid "Yes" msgstr "Sí" #: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452 -#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218 -#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418 -#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428 +#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414 +#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801 +#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428 #: CompanyPreferences.php:439 CompanyPreferences.php:443 #: CompanyPreferences.php:454 CompanyPreferences.php:458 #: ContractCosting.php:200 Currencies.php:332 Currencies.php:513 @@ -388,15 +387,15 @@ #: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99 #: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629 #: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668 -#: MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 -#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64 -#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:601 +#: MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 +#: MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206 +#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209 +#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290 +#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64 +#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601 #: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207 -#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276 -#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297 -#: PcAuthorizeExpenses.php:246 ProductSpecs.php:189 ProductSpecs.php:409 +#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409 #: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425 #: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613 #: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637 @@ -436,40 +435,37 @@ #: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515 #: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703 #: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44 -#: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "No" #: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112 +#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112 #: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362 #: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455 -#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165 +#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205 #: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334 #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173 +#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96 #: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333 -#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309 -#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 -#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210 -#: PaymentTerms.php:205 PcAssignCashToTab.php:277 -#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236 -#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253 -#: Prices_Customer.php:286 ProductSpecs.php:463 PurchData.php:312 -#: QATests.php:465 SalesCategories.php:272 SalesGLPostings.php:137 -#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206 -#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633 -#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705 -#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132 -#: SelectQASamples.php:410 SellThroughSupport.php:298 Shippers.php:144 -#: StockCategories.php:296 SuppTransGLAnalysis.php:125 +#: Labels.php:358 Locations.php:420 MailingGroupMaintenance.php:178 +#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309 +#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205 +#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 +#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 +#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253 +#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465 +#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255 +#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130 +#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663 +#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722 +#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410 +#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190 -#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132 -#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110 -#: includes/OutputSerialItems.php:20 -#: reportwriter/languages/en_US/reports.php:143 +#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184 +#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185 +#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350 +#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 #, php-format msgid "Edit" msgstr "Editar" @@ -480,24 +476,24 @@ #: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113 +#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113 #: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124 -#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 -#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167 -#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166 +#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:410 +#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167 +#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 -#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174 +#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 #: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607 -#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310 -#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 -#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768 -#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103 +#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 +#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121 +#: PaymentMethods.php:211 Payments.php:1103 PaymentTerms.php:206 #: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227 #: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181 -#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287 -#: ProductSpecs.php:464 PurchData.php:314 PurchData.php:721 QATests.php:466 +#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286 +#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464 +#: PurchData.php:314 PurchData.php:721 QATests.php:466 #: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170 #: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273 #: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241 @@ -508,15 +504,14 @@ #: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145 #: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626 #: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117 -#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90 -#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166 +#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166 #: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452 -#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186 -#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920 -#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133 -#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60 +#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 +#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191 +#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186 +#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133 +#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60 #: includes/OutputSerialItems.php:99 -#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "Suprimir" @@ -588,21 +583,21 @@ #: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368 +#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368 #: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 -#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641 -#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424 -#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146 -#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310 +#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641 +#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424 +#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 +#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 #: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659 #: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 #: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524 #: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653 -#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327 +#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327 #: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967 -#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283 +#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774 msgid "Enter Information" msgstr "Guardar la información" @@ -705,12 +700,12 @@ #: AddCustomerContacts.php:59 AddCustomerNotes.php:51 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68 #: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105 -#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380 -#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98 -#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:313 QATests.php:74 +#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91 +#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104 +#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74 #: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66 -#: SelectQASamples.php:83 Stocks.php:589 SupplierTypes.php:68 -#: Suppliers.php:531 +#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531 +#: SupplierTypes.php:68 msgid "has been updated" msgstr "ha sido actualizado" @@ -728,7 +723,7 @@ #: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162 #: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208 #: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286 -#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152 +#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108 #: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176 #: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144 msgid "Name" @@ -759,18 +754,17 @@ #: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67 #: includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19 -#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 -#: ../webSHOP/Register.php:595 +#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443 +#: ../webSHOP/Register.php:607 msgid "Email" msgstr "Correo-e" #: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1122 -#: Customers.php:1130 PDFQuotation.php:252 PDFQuotationPortrait.php:249 -#: PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 +#: Customers.php:1130 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 #: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238 -#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 SelectCustomer.php:613 -#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306 -#: WOSerialNos.php:312 +#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 PDFQuotation.php:252 +#: PDFQuotationPortrait.php:249 SelectCustomer.php:613 ShopParameters.php:198 +#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312 msgid "Notes" msgstr "Notas" @@ -788,7 +782,7 @@ msgstr "Código del contacto" #: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239 -#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610 +#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:622 msgid "Contact Name" msgstr "Nombre del contacto" @@ -797,8 +791,8 @@ #: SelectCustomer.php:425 SelectOrderItems.php:597 #: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63 #: includes/PDFTransPageHeader.inc:84 -#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389 -#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 +#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:537 +#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:735 msgid "Phone" msgstr "Teléfono" @@ -843,22 +837,21 @@ #: CustomerAllocations.php:378 CustomerInquiry.php:251 #: CustomerTransInquiry.php:100 GLAccountInquiry.php:173 #: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 -#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 PaymentAllocations.php:66 -#: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:856 -#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186 -#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398 -#: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538 -#: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277 -#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92 -#: StockMovements.php:100 StockSerialItemResearch.php:82 -#: SupplierAllocations.php:456 SupplierAllocations.php:569 -#: SupplierAllocations.php:644 SupplierInquiry.php:209 -#: SupplierTransInquiry.php:105 Tax.php:408 +#: PaymentAllocations.php:66 PcAssignCashToTab.php:238 +#: PcAuthorizeExpenses.php:93 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 +#: PrintCustTrans.php:856 PrintCustTransPortrait.php:907 +#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 +#: ReverseGRN.php:398 SelectCustomer.php:659 SelectCustomer.php:701 +#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491 +#: StockDispatch.php:277 StockDispatch.php:288 StockDispatch.php:299 +#: StockLocMovements.php:92 StockMovements.php:100 +#: StockSerialItemResearch.php:82 SupplierAllocations.php:456 +#: SupplierAllocations.php:569 SupplierAllocations.php:644 +#: SupplierInquiry.php:209 SupplierTransInquiry.php:105 Tax.php:408 #: includes/PDFQuotationPageHeader.inc:23 #: includes/PDFQuotationPortraitPageHeader.inc:80 #: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:63 -#: reportwriter/languages/en_US/reports.php:64 msgid "Date" msgstr "Fecha" @@ -960,17 +953,16 @@ msgstr "" #: AgedControlledInventory.php:12 InventoryQuantities.php:155 -#: InventoryValuation.php:217 Locations.php:392 Locations.php:453 MRP.php:542 -#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemandTypes.php:17 -#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265 +#: InventoryValuation.php:217 Locations.php:392 Locations.php:453 +#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemands.php:27 +#: MRPDemandTypes.php:17 MRP.php:542 MRPPlannedPurchaseOrders.php:265 #: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321 -#: PricesByCost.php:8 ReorderLevel.php:194 ReorderLevelLocation.php:12 +#: PricesByCost.php:8 ReorderLevelLocation.php:12 ReorderLevel.php:194 #: SelectProduct.php:88 StockDispatch.php:319 StockMovements.php:22 #: StockQties_csv.php:8 StockQuantityByDate.php:10 StockReorderLevel.php:20 #: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45 #: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:15 #: includes/MainMenuLinksArray.php:26 -#: reportwriter/languages/en_US/reports.php:243 msgid "Inventory" msgstr "Inventario" @@ -980,7 +972,6 @@ #: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261 #: StockClone.php:53 Stocks.php:63 -#: reportwriter/languages/en_US/reports.php:103 msgid "Stock" msgstr "Existencia" @@ -998,43 +989,43 @@ #: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345 #: InternalStockRequest.php:559 InternalStockRequest.php:629 #: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290 -#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295 -#: MRPPlannedWorkOrders.php:258 MRPReport.php:536 MRPReport.php:750 -#: MRPReschedules.php:192 MRPShortages.php:350 MaintenanceTasks.php:95 -#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194 -#: PDFCOA.php:64 PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335 -#: PO_Items.php:716 PO_Items.php:1187 PO_SelectOSPurchOrder.php:263 -#: PO_SelectPurchOrder.php:214 PaymentTerms.php:182 PcExpenses.php:190 +#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50 +#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295 +#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258 MRPReport.php:536 +#: MRPReport.php:750 MRPReschedules.php:192 MRPShortages.php:350 +#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190 #: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178 -#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154 -#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397 -#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103 -#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505 -#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473 +#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335 +#: PDFOrderStatus.php:337 PO_Items.php:716 PO_Items.php:1187 +#: PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214 +#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73 +#: ReorderLevel.php:298 ReverseGRN.php:397 SalesCategories.php:509 +#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120 +#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147 +#: SelectCreditItems.php:1021 SelectOrderItems.php:1473 #: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756 #: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560 #: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680 #: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173 #: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92 #: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120 -#: SuppInvGRNs.php:258 SuppPriceList.php:309 SupplierCredit.php:317 -#: SupplierCredit.php:385 SupplierInvoice.php:666 SupplierInvoice.php:746 -#: SupplierPriceList.php:39 SupplierPriceList.php:271 -#: SupplierPriceList.php:533 SupplierTenderCreate.php:434 -#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853 -#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687 +#: SuppInvGRNs.php:258 SupplierCredit.php:317 SupplierCredit.php:385 +#: SupplierInvoice.php:666 SupplierInvoice.php:746 SupplierPriceList.php:39 +#: SupplierPriceList.php:271 SupplierPriceList.php:533 +#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695 +#: SupplierTenderCreate.php:853 SupplierTenders.php:326 +#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309 #: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170 #: WorkCentres.php:128 WorkOrderCosting.php:98 WorkOrderCosting.php:130 #: WorkOrderEntry.php:735 WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33 -#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:29 -#: includes/PDFInventoryPlanPageHeader.inc:51 +#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 +#: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 -#: includes/PDFTransPageHeaderPortrait.inc:267 -#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 -#: ../webSHOP/includes/PlaceOrder.php:236 +#: includes/PDFTransPageHeaderPortrait.inc:267 api/api_xml-rpc.php:3489 +#: ../webSHOP/includes/PlaceOrder.php:250 msgid "Description" msgstr "Descripción" @@ -1074,18 +1065,16 @@ #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692 #: SelectCreditItems.php:696 SelectOrderItems.php:1313 -#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97 -#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458 -#: SupplierAllocations.php:570 SupplierAllocations.php:645 -#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250 -#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271 +#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 +#: SupplierAllocations.php:458 SupplierAllocations.php:570 +#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:214 +#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:139 Tax.php:250 +#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109 +#: includes/PDFQuotationPortraitPageHeader.inc:100 +#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271 #: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 -#: includes/PDFQuotationPageHeader.inc:109 -#: includes/PDFQuotationPortraitPageHeader.inc:100 -#: includes/PO_PDFOrderPageHeader.inc:81 -#: reportwriter/languages/en_US/reports.php:107 -#: ../webSHOP/includes/DisplayShoppingCart.php:7 -#: ../webSHOP/includes/PlaceOrder.php:285 +#: ../webSHOP/includes/DisplayShoppingCart.php:8 +#: ../webSHOP/includes/PlaceOrder.php:299 #, php-format msgid "Total" msgstr "Total" @@ -1113,20 +1102,20 @@ #: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241 #: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301 #: InventoryQuantities.php:84 InventoryValuation.php:64 +#: MailInventoryValuation.php:22 MailInventoryValuation.php:120 +#: MailSalesReport_csv.php:30 MailSalesReport.php:23 #: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106 #: MRPReport.php:147 MRPReport.php:508 MRPReschedules.php:45 #: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167 -#: MailInventoryValuation.php:22 MailInventoryValuation.php:120 -#: MailSalesReport.php:23 MailSalesReport_csv.php:30 OutstandingGRNs.php:46 -#: OutstandingGRNs.php:59 PDFCustomerList.php:20 PDFCustomerList.php:232 -#: PDFCustomerList.php:244 PDFLowGP.php:20 PDFSellThroughSupportClaim.php:17 -#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59 -#: PDFStockCheckComparison.php:267 PurchaseByPrefSupplier.php:399 -#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471 -#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531 -#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:44 -#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138 -#: SupplierTenderCreate.php:671 SupplierTenders.php:397 +#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20 +#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20 +#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33 +#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267 +#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447 +#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500 +#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39 +#: SelectProduct.php:44 StockCheck.php:60 StockCheck.php:132 +#: SupplierTenderCreate.php:671 SupplierTenders.php:397 SuppPriceList.php:138 #: includes/PDFPaymentRun_PymtFooter.php:152 msgid "Problem Report" msgstr "Informe de problemas" @@ -1142,23 +1131,23 @@ #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45 #: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257 #: Dashboard.php:437 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 -#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:112 GLBalanceSheet.php:150 -#: GLBalanceSheet.php:329 GLProfit_Loss.php:188 GLProfit_Loss.php:200 -#: GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 GLTrialBalance.php:168 -#: GLTrialBalance.php:182 GetStockImage.php:150 InventoryPlanning.php:102 +#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:112 +#: GLBalanceSheet.php:150 GLBalanceSheet.php:329 GLProfit_Loss.php:188 +#: GLProfit_Loss.php:200 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 +#: GLTrialBalance.php:168 GLTrialBalance.php:182 InventoryPlanning.php:102 #: InventoryPlanning.php:179 InventoryPlanning.php:216 #: InventoryPlanning.php:265 InventoryPlanning.php:340 #: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244 #: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304 #: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87 #: InventoryQuantities.php:98 InventoryValuation.php:67 -#: InventoryValuation.php:92 MRPPlannedPurchaseOrders.php:117 +#: InventoryValuation.php:92 MailInventoryValuation.php:123 +#: MailInventoryValuation.php:219 MailInventoryValuation.php:243 +#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117 #: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109 #: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39 #: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48 #: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170 -#: MailInventoryValuation.php:123 MailInventoryValuation.php:219 -#: MailInventoryValuation.php:243 MailInventoryValuation.php:251 #: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235 #: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100 #: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 @@ -1167,29 +1156,29 @@ #: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 #: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 #: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 -#: PO_PDFPurchOrder.php:156 PrintCustOrder.php:238 -#: PrintCustOrder_generic.php:256 PrintWOItemSlip.php:122 +#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256 +#: PrintCustOrder.php:238 PrintWOItemSlip.php:122 #: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 #: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503 #: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182 #: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42 #: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 #: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141 +#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65 #: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186 -#: SuppPaymentRun.php:217 SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54 -#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310 -#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 +#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171 +#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 #: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383 #: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 -#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 #: includes/PDFPaymentRun_PymtFooter.php:59 #: includes/PDFPaymentRun_PymtFooter.php:89 #: includes/PDFPaymentRun_PymtFooter.php:119 #: includes/PDFPaymentRun_PymtFooter.php:156 #: includes/PDFPaymentRun_PymtFooter.php:187 #: includes/PDFPaymentRun_PymtFooter.php:218 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:180 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:188 +#: includes/ConstructSQLForUserDefinedSalesReport.inc:343 msgid "Back to the menu" msgstr "Volver al menú" @@ -1215,32 +1204,32 @@ #: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574 #: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91 #: Dashboard.php:259 Dashboard.php:439 DeliveryDetails.php:409 -#: GLProfit_Loss.php:609 GLTagProfit_Loss.php:515 PDFRemittanceAdvice.php:85 -#: Payments.php:361 PurchData.php:114 PurchData.php:132 PurchData.php:360 -#: RecurringSalesOrders.php:267 ReverseGRN.php:192 ReverseGRN.php:206 -#: ReverseGRN.php:385 SMTPServer.php:62 SelectCreditItems.php:1447 +#: GLProfit_Loss.php:609 GLTagProfit_Loss.php:515 Payments.php:361 +#: PDFRemittanceAdvice.php:85 PurchData.php:114 PurchData.php:132 +#: PurchData.php:360 RecurringSalesOrders.php:267 ReverseGRN.php:192 +#: ReverseGRN.php:206 ReverseGRN.php:385 SelectCreditItems.php:1447 #: SelectSalesOrder.php:209 SelectSalesOrder.php:375 SellThroughSupport.php:81 -#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430 -#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88 -#: StockLocStatus.php:165 StockMovements.php:93 StockQuantityByDate.php:98 -#: StockReorderLevel.php:45 StockStatus.php:285 StockTransfers.php:201 -#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114 -#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:78 -#: SupplierInquiry.php:100 SupplierInquiry.php:138 SupplierInquiry.php:194 -#: SupplierPriceList.php:382 SupplierTransInquiry.php:97 WOSerialNos.php:49 -#: WorkOrderCosting.php:427 WorkOrderReceive.php:298 -#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97 +#: SellThroughSupport.php:97 SMTPServer.php:62 StockCheck.php:217 +#: StockClone.php:430 StockClone.php:504 StockCostUpdate.php:78 +#: StockCostUpdate.php:88 StockLocStatus.php:165 StockMovements.php:93 +#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285 +#: StockTransfers.php:201 StockUsageGraph.php:55 StockUsage.php:142 +#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:138 +#: SupplierInquiry.php:194 SupplierPriceList.php:382 +#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188 +#: SuppPaymentRun.php:219 WorkOrderCosting.php:427 WorkOrderReceive.php:298 +#: WOSerialNos.php:49 Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97 #: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63 #: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88 #: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:90 -#: includes/ConnectDB_mysql.inc:66 includes/ConnectDB_mysqli.inc:74 #: includes/PDFPaymentRun_PymtFooter.php:61 #: includes/PDFPaymentRun_PymtFooter.php:91 #: includes/PDFPaymentRun_PymtFooter.php:121 #: includes/PDFPaymentRun_PymtFooter.php:158 -#: includes/PDFPaymentRun_PymtFooter.php:189 +#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:74 +#: includes/ConnectDB_mysql.inc:66 #: ../webSHOP/includes/DatabaseFunctions.php:60 -#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70 +#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68 msgid "The SQL that failed was" msgstr "El SQL que falló fue" @@ -1325,7 +1314,7 @@ #: PDFPriceList.php:351 PDFRemittanceAdvice.php:175 #: PDFStockCheckComparison.php:373 PrintCustTrans.php:570 #: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447 -#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385 +#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:263 Tax.php:385 msgid "Print PDF" msgstr "Imprimir PDF" @@ -1362,7 +1351,7 @@ msgstr "No hay resultados por lo que el PDF esta vacío" #: AgedSuppliers.php:287 OutstandingGRNs.php:267 PDFRemittanceAdvice.php:153 -#: SuppPaymentRun.php:265 SupplierBalsAtPeriodEnd.php:131 +#: SupplierBalsAtPeriodEnd.php:131 SuppPaymentRun.php:265 #: Z_ClearPOBackOrders.php:20 msgid "From Supplier Code" msgstr "Desde código proveedor" @@ -1373,7 +1362,7 @@ "Introduzca el primer código alfabético de proveedor a incluir en el informe" #: AgedSuppliers.php:291 OutstandingGRNs.php:271 PDFRemittanceAdvice.php:157 -#: SuppPaymentRun.php:269 SupplierBalsAtPeriodEnd.php:135 +#: SupplierBalsAtPeriodEnd.php:135 SuppPaymentRun.php:269 #: Z_ClearPOBackOrders.php:23 msgid "To Supplier Code" msgstr "Hasta código proveedor" @@ -1466,12 +1455,12 @@ #: Areas.php:131 CustomerTypes.php:167 Factors.php:140 #: FixedAssetCategories.php:142 GLAccounts.php:196 -#: InternalStockCategoriesByRole.php:102 Locations.php:366 MRPDemands.php:250 -#: Manufacturers.php:163 PcAssignCashToTab.php:138 +#: InternalStockCategoriesByRole.php:102 Locations.php:366 +#: Manufacturers.php:163 MRPDemands.php:250 PcAssignCashToTab.php:138 #: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101 #: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215 #: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:233 -#: SupplierTypes.php:132 Suppliers.php:672 Z_DeleteInvoice.php:178 +#: Suppliers.php:672 SupplierTypes.php:132 Z_DeleteInvoice.php:178 #: includes/DefineOfferClass.php:134 msgid "has been deleted" msgstr "ha sido eliminado" @@ -1533,7 +1522,7 @@ #: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145 #: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70 #: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225 -#: PDFPriceList.php:324 POReport.php:1586 PO_Items.php:1124 +#: PDFPriceList.php:324 PO_Items.php:1124 POReport.php:1586 #: ReorderLevel.php:212 ReorderLevel.php:214 ReorderLevel.php:244 #: ReorderLevel.php:246 SalesGraph.php:103 SalesGraph.php:105 #: SalesGraph.php:125 SalesGraph.php:127 SalesGraph.php:149 SalesGraph.php:151 @@ -1552,7 +1541,6 @@ #: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71 #: TopItems.php:73 WorkOrderEntry.php:677 WorkOrderEntry.php:680 #: WorkOrderIssue.php:716 WorkOrderIssue.php:719 -#: reportwriter/languages/en_US/reports.php:54 msgid "All" msgstr "Todos" @@ -1582,9 +1570,9 @@ msgstr "Usuario" #: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295 -#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAllocations.php:376 -#: CustomerInquiry.php:249 CustomerPurchases.php:82 -#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:98 +#: CustomerAllocations.php:376 CustomerInquiry.php:249 +#: CustomerPurchases.php:82 CustomerTransInquiry.php:21 +#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111 #: DailyBankTransactions.php:129 GLAccountInquiry.php:171 #: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194 #: ProductSpecs.php:386 QATests.php:255 QATests.php:393 @@ -1595,7 +1583,6 @@ #: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57 #: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11 #: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152 -#: reportwriter/languages/en_US/reports.php:111 msgid "Type" msgstr "Tipo" @@ -1604,7 +1591,7 @@ msgstr "Tabla" #: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777 -#: api/api_xml-rpc.php:2187 reportwriter/languages/en_US/reports.php:72 +#: api/api_xml-rpc.php:2187 msgid "Field Name" msgstr "Nombre del campo" @@ -1632,36 +1619,34 @@ #: BOMs.php:913 ContractBOM.php:353 CounterReturns.php:1691 #: CounterSales.php:2101 CounterSales.php:2255 CustItem.php:297 #: CustomerBranches.php:407 CustomerReceipt.php:1200 GLCodesInquiry.php:26 -#: InternalStockRequest.php:558 InternalStockRequest.php:628 MRPDemands.php:91 -#: MRPPlannedWorkOrders.php:257 MRPReport.php:749 MaterialsNotUsed.php:34 -#: NoSalesItems.php:193 PDFOrderStatus.php:336 PDFOrdersInvoiced.php:334 -#: PO_Header.php:561 PO_Items.php:1186 PO_SelectOSPurchOrder.php:262 -#: PO_SelectPurchOrder.php:213 PricesByCost.php:152 PurchData.php:469 -#: RelatedItemsUpdate.php:153 ReorderLevelLocation.php:72 -#: RevisionTranslations.php:59 SalesPeople.php:207 +#: InternalStockRequest.php:558 InternalStockRequest.php:628 +#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257 +#: MRPReport.php:749 NoSalesItems.php:193 PDFOrdersInvoiced.php:334 +#: PDFOrderStatus.php:336 PO_Header.php:561 PO_Items.php:1186 +#: PO_SelectOSPurchOrder.php:262 PO_SelectPurchOrder.php:213 +#: PricesByCost.php:152 PurchData.php:469 RelatedItemsUpdate.php:153 +#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207 #: SelectCompletedOrder.php:504 SelectCreditItems.php:1020 #: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472 #: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291 #: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218 #: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148 -#: StockCategories.php:263 SuppPriceList.php:308 SupplierPriceList.php:270 -#: SupplierPriceList.php:455 SupplierTenderCreate.php:617 -#: SupplierTenderCreate.php:852 SupplierTenders.php:686 -#: TestPlanResults.php:176 TopItems.php:169 UserLocations.php:175 -#: WorkOrderEntry.php:734 WorkOrderIssue.php:760 -#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75 -#: ../webSHOP/ItemDetails.php:72 +#: StockCategories.php:263 SupplierPriceList.php:270 SupplierPriceList.php:455 +#: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852 +#: SupplierTenders.php:686 SuppPriceList.php:308 TestPlanResults.php:176 +#: TopItems.php:169 UserLocations.php:175 WorkOrderEntry.php:734 +#: WorkOrderIssue.php:760 includes/PDFTopItemsHeader.inc:49 +#: includes/PO_PDFOrderPageHeader.inc:75 ../webSHOP/ItemDetails.php:72 msgid "Code" msgstr "Código" #: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52 #: FixedAssetRegister.php:366 GLJournalInquiry.php:28 GLJournalInquiry.php:45 -#: POReport.php:517 POReport.php:1521 PcReportTab.php:269 +#: PcReportTab.php:269 POReport.php:517 POReport.php:1521 #: SalesAnalRepts.php:436 SalesAnalRepts.php:464 SalesAnalRepts.php:493 #: SalesAnalRepts.php:512 SalesInquiry.php:798 SalesInquiry.php:1106 #: StockDispatch.php:513 StockLocTransferReceive.php:104 #: SupplierTransInquiry.php:53 includes/PO_PDFOrderPageHeader.inc:40 -#: reportwriter/languages/en_US/reports.php:105 msgid "To" msgstr "Para" @@ -1674,13 +1659,851 @@ msgid "No item description was automatically translated" msgstr "Ninguna descripción de artículo fue traducido automáticamente" +#: BackupDatabase.php:7 +msgid "Backup webERP Database" +msgstr "Respaldar base de datos del webERP" + +#: BackupDatabase.php:20 +msgid "Deleted" +msgstr "Eliminado" + +#: BackupDatabase.php:23 +msgid "Unable to delete" +msgstr "No fue posible eliminar" + +#: BackupDatabase.php:28 +msgid "All backup files on the server have been deleted" +msgstr "Se han eliminado todos los archivos de respaldo del servidor" + +#: BackupDatabase.php:30 +msgid "No backup files on the server were deleted" +msgstr "No se borraron los archivos de respaldo en el servidor" + +#: BackupDatabase.php:34 +msgid "Backup" +msgstr "Respaldo" + +#: BackupDatabase.php:43 +msgid "" +"The backup file has now been created. You must now download this to your " +"computer because in case the web-server has a disk failure the backup would " +"then not on the same machine. Use the link below" +msgstr "" +"Se ha creado el archivo de copia de seguridad. Ahora debe descargarlo a su " +"computador ya que en caso de que el servidor web tenga una falla en el " +"disco. la copia de seguridad estará no en la misma máquina. Use el enlace de " +"abajo" + +#: BackupDatabase.php:43 +msgid "Download the backup file to your locale machine" +msgstr "Descargue el archivo de copia de seguridad en su máquina" + +#: BackupDatabase.php:44 +msgid "" +"Once you have downloaded the database backup file to your local machine you " +"should use the link below to delete it - backup files can consume a lot of " +"space on your hosting account and will accumulate if not deleted - they also " +"contain sensitive information which would otherwise be available for others " +"to download!" +msgstr "" +"Una vez que haya descargado el archivo de copia de seguridad de la base de " +"datos a su equipo local, se debe utilizar el enlace de abajo para eliminarlo " +"- los archivos de copia de seguridad pueden consumir una gran cantidad de " +"espacio en su cuenta de alojamiento y se acumulará si no se eliminan - " +"también contienen información que de otro modo estaría disponible para que " +"otros puedan descargarla!" + +#: BackupDatabase.php:47 +msgid "Delete the backup file off the server" +msgstr "Borrar el archivo de respaldo del servidor" + +#: BackupDatabase.php:49 +msgid "" +"There was some problem producing a backup using mysqldump. Normally this " +"relates to a permissions issue - the web-server user must have permission to " +"write to the companies directory" +msgstr "" +"Hubo algún problema en la producción de una copia de seguridad usando " +"mysqldump. Normalmente, esto se refiere a un problema de permisos - el " +"usuario del servidor web debe tener permiso para escribir en el directorio " +"de empresas" + +#: BankAccounts.php:6 includes/MainMenuLinksArray.php:393 +msgid "Bank Accounts" +msgstr "Cuentas bancarias" + +#: BankAccounts.php:12 TaxAuthorities.php:149 +#: ../webSHOP/includes/Functions.php:768 +msgid "Bank" +msgstr "Banco" + +#: BankAccounts.php:13 +msgid "Bank Accounts Maintenance" +msgstr "Administrar cuentas bancarias" + +#: BankAccounts.php:15 +msgid "" +"Update Bank Account details. Account Code is for SWIFT or BSB type Bank " +"Codes. Set Default for Invoices to Currency Default or Fallback Default to " +"print Account details on Invoices (only one account should be set to Fall " +"Back Default)." +msgstr "" +"Actualizar detalles de la cuenta bancaria. El Código de Cuenta es para tipos " +"de Códigos Bancarios SWIFT o BSB. Ponga el Valor Predeterminado para las " +"Facturas la Moneda Predeterminada ó Reserva Predeterminada para imprimir los " +"detalles de la Cuenta en las Facturas (sólo una cuenta puede ser puesta en " +"Reserva Predeterminada)." + +#: BankAccounts.php:47 +msgid "The bank account code already exists in the database" +msgstr "El Código de la cuenta bancaria ya existe en la Base de Datos" + +#: BankAccounts.php:53 +msgid "The bank account name must be fifty characters or less long" +msgstr "El nombre de la cuenta bancaria no debe pasar de 50 caracteres" + +#: BankAccounts.php:59 +msgid "The bank account name may not be empty." +msgstr "El nombre de la cuenta bancaria no puede estar vacía." + +#: BankAccounts.php:65 +msgid "The bank account number may not be empty." +msgstr "El número de la cuenta bancaria no puede estar vacío." + +#: BankAccounts.php:71 +msgid "The bank ac... [truncated message content] |