Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2014-01-31 09:08:16
|
Revision: 6553
http://sourceforge.net/p/web-erp/reponame/6553
Author: daintree
Date: 2014-01-31 09:08:12 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
gilberto pt_BR translation
Modified Paths:
--------------
trunk/doc/Change.log
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
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-01-28 09:42:41 UTC (rev 6552)
+++ trunk/doc/Change.log 2014-01-31 09:08:12 UTC (rev 6553)
@@ -1,5 +1,6 @@
webERP Change Log
28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.
+30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since this was quite old
24/1/14 Andrew Galuski: Display serial items on GRN printouts
23/1/14 Phil: Fixed incompatible error traps on hyphens between new customers and new branches. Now both allow hyphens. Also prevented deletion of the last customer branch. Customer branches are now deleted when a customer is attempted to be deleted provided there are no dependent records.
19/01/14 Exson: Add sales man login control and modify the PDF to download to harmony with other files and solve backward failure problem in PrintCustStatements.php.
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2014-01-28 09:42:41 UTC (rev 6552)
+++ trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2014-01-31 09:08:12 UTC (rev 6553)
@@ -1,14 +1,14 @@
-# webERP - PORTUGUESE Translation File
-# Copyright (C) 2013 WebERP Contrib
+# webERP - PORTUGUESE BRAZIL Translation File
+# Copyright (C) 2014 WebERP Contrib
# This file is distributed under the same license as the WebERP package.
-# gsavix <gs...@gm...>, 2013.
+# gsavix <gs...@gm...> 2014
#
msgid ""
msgstr ""
-"Project-Id-Version: WebERP 4.2112\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: WebERP 4.11.2\n"
+"Report-Msgid-Bugs-To: <gs...@gm...>\n"
"POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-12-24 23:41-0300\n"
+"PO-Revision-Date: 2014-01-28 14:48-0300\n"
"Last-Translator: gilberto dos santos alves <gs...@gm...>\n"
"Language-Team: pt-br <gs...@gm...>\n"
"Language: pt_BR\n"
@@ -36,7 +36,7 @@
"The SQL that was used to retrieve the account groups of the parent account "
"group and that failed in the process was"
msgstr ""
-"O SQL que foi usado para recuperar o grupo de contas do principal grupo de "
+"SQL que foi usado para recuperar o grupo de contas do principal grupo de "
"contas e que falhou no processo foi"
#: AccountGroups.php:50
@@ -45,7 +45,7 @@
#: AccountGroups.php:51
msgid "The SQL that was used to move the account group was"
-msgstr "O SQL que foi usado para atualizar o grupo de contas foi"
+msgstr "SQL que foi usado para atualizar o grupo de contas foi"
#: AccountGroups.php:53 AccountGroups.php:334
msgid "Review Account Groups"
@@ -62,7 +62,7 @@
#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211
#: AccountGroups.php:246
msgid "The SQL that was used to retrieve the information was"
-msgstr "O SQL usado para recuperar a informação foi"
+msgstr "SQL usado para recuperar a informação foi"
#: AccountGroups.php:74
msgid "Could not check whether the group exists because"
@@ -106,7 +106,7 @@
"inherited from the parent account group. Any changes made to these fields "
"will have no effect."
msgstr ""
-"Desde que esta conta de grupo é um grupo filho, a sequencia no balancete, a "
+"Desde que esta conta de grupo é um grupo filho, a sequência no balancete, a "
"seção das contas e talvez ou não o grupo de contas aparece na folha do "
"balanço ou na conta de lucros e perdas são todas com propriedades inerentes "
"ao grupo de contas pai. Quaisquer mudanças feitas nesses campos não terão "
@@ -118,11 +118,11 @@
#: AccountGroups.php:130
msgid "The sequence in the trial balance must be an integer"
-msgstr "A sequencia no balancete deve ser um inteiro"
+msgstr "A sequência no balancete deve ser um inteiro"
#: AccountGroups.php:136
msgid "The sequence in the TB must be numeric and less than"
-msgstr "A sequencia no TB precisa ser numérico e menor que"
+msgstr "A sequência no TB precisa ser numérico e menor que"
#: AccountGroups.php:152
msgid "An error occurred in renaming the account group"
@@ -130,7 +130,7 @@
#: AccountGroups.php:153
msgid "The SQL that was used to rename the account group was"
-msgstr "O SQL que foi usado para renomear o grupo de contas foi"
+msgstr "SQL que foi usado para renomear o grupo de contas foi"
#: AccountGroups.php:172
msgid "An error occurred in updating the account group"
@@ -138,7 +138,7 @@
#: AccountGroups.php:173
msgid "The SQL that was used to update the account group was"
-msgstr "O SQL que foi usado para atualizar o grupo de contas foi"
+msgstr "SQL que foi usado para atualizar o grupo de contas foi"
#: AccountGroups.php:175 AccountSections.php:101 PaymentMethods.php:83
msgid "Record Updated"
@@ -150,7 +150,7 @@
#: AccountGroups.php:192
msgid "The SQL that was used to insert the account group was"
-msgstr "O SQL que foi usado para inserir o grupo de contas foi"
+msgstr "SQL que foi usado para inserir o grupo de contas foi"
#: AccountGroups.php:193 AccountSections.php:111
msgid "Record inserted"
@@ -228,7 +228,7 @@
#: AccountGroups.php:256
msgid "The SQL that was used to delete the account group was"
-msgstr "O SQL que foi usado para apagar o grupo de contas foi"
+msgstr "SQL que foi usado para apagar o grupo de contas foi"
#: AccountGroups.php:258
msgid "group has been deleted"
@@ -236,7 +236,7 @@
#: AccountGroups.php:283
msgid "The sql that was used to retrieve the account group information was "
-msgstr "O SQL que foi usado para recuperar o grupo de informação de contas foi"
+msgstr "SQL que foi usado para recuperar o grupo de informação de contas foi"
#: AccountGroups.php:284
msgid "Could not get account groups because"
@@ -486,7 +486,7 @@
msgid ""
"The SQL that was used to retrieve the account group and that failed in the "
"process was"
-msgstr "O SQL usado para recuperar grupo de conta foi:"
+msgstr "SQL usado para recuperar grupo de conta foi:"
#: AccountGroups.php:358
msgid "The account group name does not exist in the database"
@@ -708,7 +708,7 @@
#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:420
#: ../webSHOP/Register.php:607
msgid "Email"
-msgstr "email"
+msgstr "Email"
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1106
#: Customers.php:1114 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
@@ -1043,7 +1043,7 @@
#: ../webSHOP/includes/DatabaseFunctions.php:60
#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:68
msgid "The SQL that failed was"
-msgstr "O SQL que falhou foi"
+msgstr "SQL que falhou foi"
#: AgedDebtors.php:430
msgid ""
@@ -1527,7 +1527,7 @@
#: BankAccounts.php:130
msgid "The SQL used to insert/modify the bank account details was"
-msgstr "O SQL usado para inserir/modificar a conta bancaria foi"
+msgstr "SQL usado para inserir/modificar a conta bancaria foi"
#: BankAccounts.php:158
msgid ""
@@ -1551,7 +1551,7 @@
#: BankAccounts.php:186
msgid "The SQL used to retrieve the bank account details was"
-msgstr "O SQL usado para recuperar detalhes conta bancária foi"
+msgstr "SQL usado para recuperar detalhes conta bancária foi"
#: BankAccounts.php:191 GLJournal.php:295
msgid "GL Account Code"
@@ -1616,7 +1616,7 @@
#: BankAccounts.php:284 BankAccounts.php:290
msgid "Bank Account GL Code"
-msgstr "Código Contábil Conta Bancária"
+msgstr "Cód. Contábil Conta Banc."
#: BankAccounts.php:344
msgid "Currency Of Account"
@@ -1712,7 +1712,7 @@
#: BankAccountUsers.php:161
msgid "User Code"
-msgstr "Código Usuário"
+msgstr "Cód. Usuário"
#: BankAccountUsers.php:162 PcTabs.php:206 PcTabs.php:307
#: PO_AuthorisationLevels.php:125 SMTPServer.php:101 UserSettings.php:118
@@ -1727,7 +1727,7 @@
#: BankAccountUsers.php:178
#, php-format
msgid "Un-authorise"
-msgstr "Desautorisar"
+msgstr "Desautorizar"
#: BankAccountUsers.php:196
msgid "Select User"
@@ -2001,7 +2001,7 @@
#: BankReconciliation.php:76 Currencies.php:201
msgid "The SQL that failed to insert the exchange difference GL entry was"
-msgstr "O SQL que falhou na inserção da diferença Contab. Câambio foi"
+msgstr "SQL que falhou na inserção da diferença Contab. Câambio foi"
#: BankReconciliation.php:96
msgid "Exchange difference of"
@@ -2018,7 +2018,7 @@
#: BankReconciliation.php:110 CustomerReceipt.php:760
#: DailyBankTransactions.php:36 Payments.php:785 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
-msgstr "O SQL usado para recuperar banco foi"
+msgstr "SQL usado para recuperar banco foi"
#: BankReconciliation.php:120 CustomerReceipt.php:780
msgid "Bank Accounts have not yet been defined"
@@ -2177,7 +2177,7 @@
#: BOMExtendedQty.php:30 BOMIndented.php:27 BOMIndentedReverse.php:26
#: MRPCalendar.php:86 MRP.php:27
msgid "The SQL to create passbom failed with the message"
-msgstr "O SQL para criar o passbom falhou com a mensagem"
+msgstr "SQL para criar o passbom falhou com a mensagem"
#: BOMExtendedQty.php:43 BOMIndented.php:40 BOMIndentedReverse.php:39
#: MRP.php:34
@@ -2689,7 +2689,7 @@
#: BOMInquiry.php:95 BOMs.php:854 MRPCalendar.php:213 MRPDemands.php:80
#: MRPDemands.php:289 POReport.php:481 POReport.php:1256 SalesInquiry.php:758
msgid "The SQL to find the parts selected failed with the message"
-msgstr "O SQL que localiza itens falhou com a mensagem"
+msgstr "SQL que localiza itens falhou com a mensagem"
#: BOMInquiry.php:108 BOMs.php:553 BOMs.php:885 ContractBOM.php:353
#: CounterReturns.php:1667 CounterSales.php:2096 CounterSales.php:2277
@@ -2844,7 +2844,7 @@
msgid ""
"The SQL that was used to retrieve the components of the BOM and that failed "
"in the process was"
-msgstr "O SQL que falhou na recuperação dos componentes do BOM foi"
+msgstr "SQL que falhou na recuperação dos componentes do BOM foi"
#: BOMs.php:99
msgid "Could not retrieve the BOM components because"
@@ -2852,7 +2852,7 @@
#: BOMs.php:100
msgid "The SQL used to retrieve the components was"
-msgstr "O SQL usado na recuperação do componente foi"
+msgstr "SQL usado na recuperação do componente foi"
#: BOMs.php:114
msgid "No lower levels"
@@ -2936,7 +2936,7 @@
#: BOMs.php:302
msgid "The SQL used to update the component was"
-msgstr "O SQL usado para atualizar o componente foi"
+msgstr "SQL usado para atualizar o componente foi"
#: BOMs.php:305
msgid "Details for"
@@ -2955,7 +2955,7 @@
"The SQL that was used to check the component was not already on the BOM and "
"that failed in the process was"
msgstr ""
-"O SQL usado para verificar o componente que não está no BOM e falhouno "
+"SQL usado para verificar o componente que não está no BOM e falhouno "
"processo foi"
#: BOMs.php:348
@@ -2964,7 +2964,7 @@
#: BOMs.php:349
msgid "The SQL used to insert the component was"
-msgstr "O SQL usado para inserir o componente foi"
+msgstr "SQL usado para inserir o componente foi"
#: BOMs.php:354
msgid "A new component part"
@@ -2996,7 +2996,7 @@
#: BOMs.php:382
msgid "The SQL used to delete the BOM was"
-msgstr "O SQL usado para remover o BOM foi"
+msgstr "SQL usado para remover o BOM foi"
#: BOMs.php:392
msgid "The component part"
@@ -3012,7 +3012,7 @@
#: BOMs.php:416 BOMs.php:452 BOMs.php:476 BOMs.php:500 BOMs.php:524
msgid "The SQL used to retrieve description of the parent part was"
-msgstr "O SQL usado para recuperar a descrição do pai foi "
+msgstr "SQL usado para recuperar a descrição do pai foi "
#: BOMs.php:425 ConfirmDispatch_Invoice.php:1045 CounterReturns.php:1058
#: CounterSales.php:1478 Credit_Invoice.php:779 Credit_Invoice.php:807
@@ -3123,7 +3123,7 @@
#: BOMs.php:673
msgid "The SQL used to retrieve the list of potential components part was"
-msgstr "O SQL usado para recuperar a lista de potenciais componentes foi "
+msgstr "SQL usado para recuperar a lista de potenciais componentes foi "
#: BOMs.php:708
msgid "Work Centre Added"
@@ -3549,9 +3549,9 @@
"Only balance sheet general ledger accounts can be selected."
msgstr ""
"Selecione SIM paa assegurar que weberp cria lançamentos (journal) contábeis "
-"para todas as transações de inventário. weberp irá manter o controle dos "
-"saldos das contas de estoque (configuradas e selecionadas sob a categoria "
-"inventário). Sómente contas Resultado podem ser selecionadas."
+"para todas as transações de estoque. weberp irá manter o controle dos saldos "
+"das contas de estoque (configuradas e selecionadas sob a categoria estoque). "
+"Somente contas Resultado podem ser selecionadas."
#: CompanyPreferences.php:470 ConfirmDispatch_Invoice.php:652
#: ConfirmDispatch_Invoice.php:1691 Credit_Invoice.php:1563
@@ -3661,7 +3661,7 @@
#: ConfirmDispatch_Invoice.php:93
msgid "The SQL to get the order header was"
-msgstr "O SQL para obter o cabeçalho do pedido foi"
+msgstr "SQL para obter o cabeçalho do pedido foi"
#: ConfirmDispatch_Invoice.php:170 Credit_Invoice.php:137 OrderDetails.php:152
#: RecurringSalesOrders.php:135 SelectOrderItems.php:229
@@ -4125,7 +4125,7 @@
#: ConfirmDispatch_Invoice.php:759
msgid "The SQL used to update the branch default carrier was"
-msgstr "O SQL usado para atualizar o transpordador padrão foi"
+msgstr "SQL usado para atualizar o transpordador padrão foi"
#: ConfirmDispatch_Invoice.php:770 ConfirmDispatch_Invoice.php:816
#: ConfirmDispatch_Invoice.php:832 ConfirmDispatch_Invoice.php:864
@@ -4455,7 +4455,7 @@
#: StockTransfers.php:434 StockTransfers.php:443 SupplierInvoice.php:277
#: WorkOrderIssue.php:162 WorkOrderReceive.php:340 WorkOrderReceive.php:447
msgid "The following SQL to update the location stock record was used"
-msgstr "O SQL para atualizar o local de estoque foi "
+msgstr "SQL para atualizar o local de estoque foi "
#: ConfirmDispatch_Invoice.php:997 CounterReturns.php:1009
#: CounterSales.php:1430 Credit_Invoice.php:722 SelectCreditItems.php:1441
@@ -4514,7 +4514,7 @@
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
-msgstr "O SQL usado para inserir movim. componentes montados de estoque foi "
+msgstr "SQL usado para inserir movim. componentes montados de estoque foi "
#: ConfirmDispatch_Invoice.php:1061 CounterReturns.php:1074
#: CounterSales.php:1494 Credit_Invoice.php:823 SelectCreditItems.php:1504
@@ -4527,7 +4527,7 @@
msgid ""
"The following SQL to update the locations stock record for the component was "
"used"
-msgstr "O SQL usado para atualiz. estoque do compoente foi "
+msgstr "SQL usado para atualiz. estoque do compoente foi "
#: ConfirmDispatch_Invoice.php:1144 CounterReturns.php:1154
#: CounterSales.php:1576 Credit_Invoice.php:898 Credit_Invoice.php:996
@@ -4544,7 +4544,7 @@
#: SelectCreditItems.php:1319 SupplierInvoice.php:308 WorkOrderIssue.php:193
#: WorkOrderReceive.php:369 WorkOrderReceive.php:477
msgid "The following SQL to insert the stock movement records was used"
-msgstr "O SQL usado para inserir movim. de estoque foi "
+msgstr "SQL usado para inserir movim. de estoque foi "
#: ConfirmDispatch_Invoice.php:1165 CounterReturns.php:1175
#: CounterSales.php:1597 RecurringSalesOrdersProcess.php:384
@@ -4558,14 +4558,14 @@
#: RecurringSalesOrdersProcess.php:385 SelectCreditItems.php:1340
msgid ""
"The following SQL to insert the stock movement tax detail records was used"
-msgstr ""
+msgstr "SQL usado para inserir imposto do movimento de estoque foi"
#: ConfirmDispatch_Invoice.php:1182 Credit_Invoice.php:928
#: Credit_Invoice.php:938 SelectCreditItems.php:1384 StockAdjustments.php:239
#: StockAdjustments.php:257 StockLocTransferReceive.php:136
#: StockTransfers.php:276 StockTransfers.php:389
msgid "The serial stock item record could not be updated because"
-msgstr ""
+msgstr "Item de estoque serial não pode ser atualizado no DB porque"
#: ConfirmDispatch_Invoice.php:1183 Credit_Invoice.php:929
#: Credit_Invoice.php:939 SelectCreditItems.php:1385
@@ -4575,7 +4575,7 @@
#: StockLocTransferReceive.php:265 StockTransfers.php:277
#: StockTransfers.php:390
msgid "The following SQL to update the serial stock item record was used"
-msgstr ""
+msgstr "SQL usado para atualizar item serial de estoque foi"
#: ConfirmDispatch_Invoice.php:1197 Credit_Invoice.php:953
#: GoodsReceived.php:592 SelectCreditItems.php:1399 StockAdjustments.php:273
@@ -4583,7 +4583,7 @@
#: StockTransfers.php:312 StockTransfers.php:421 WorkOrderIssue.php:229
#: WorkOrderIssue.php:284 WorkOrderReceive.php:528 WorkOrderReceive.php:599
msgid "The serial stock movement record could not be inserted because"
-msgstr ""
+msgstr "Mov. item de estoque serial não pode ser inserido porque"
#: ConfirmDispatch_Invoice.php:1198 Credit_Invoice.php:954
#: GoodsReceived.php:593 StockAdjustments.php:274
@@ -4591,7 +4591,7 @@
#: StockTransfers.php:313 StockTransfers.php:422 WorkOrderIssue.php:230
#: WorkOrderIssue.php:285 WorkOrderReceive.php:529 WorkOrderReceive.php:600
msgid "The following SQL to insert the serial stock movement records was used"
-msgstr ""
+msgstr "SQL usado para inserir movimento de serial "
#: ConfirmDispatch_Invoice.php:1238 CounterReturns.php:1216
#: CounterSales.php:1676 RecurringSalesOrdersProcess.php:423
@@ -4606,7 +4606,7 @@
#: RecurringSalesOrdersProcess.php:424 SelectCreditItems.php:1662
#: api/api_salesorders.php:1027
msgid "SQL to count the no of sales analysis records"
-msgstr ""
+msgstr "SQL para contar núm. análise de vendas"
#: ConfirmDispatch_Invoice.php:1294 CounterReturns.php:1274
#: CounterSales.php:1734 RecurringSalesOrdersProcess.php:482
@@ -4623,7 +4623,7 @@
#: ConfirmDispatch_Invoice.php:1320 CounterReturns.php:1299
#: CounterSales.php:1759 Credit_Invoice.php:1268
msgid "The cost of sales GL posting could not be inserted because"
-msgstr ""
+msgstr "Lanç. Contábeis do Custo de Vendas não podem ser inseridos porque"
#: ConfirmDispatch_Invoice.php:1321 ConfirmDispatch_Invoice.php:1344
#: ConfirmDispatch_Invoice.php:1371 ConfirmDispatch_Invoice.php:1393
@@ -4648,23 +4648,23 @@
#: WorkOrderCosting.php:512 WorkOrderReceive.php:260 WorkOrderReceive.php:279
#: includes/SQL_CommonFunctions.inc:186 includes/SQL_CommonFunctions.inc:205
msgid "The following SQL to insert the GLTrans record was used"
-msgstr ""
+msgstr "SQL usado para inserir trans. contábil GLTRANS foi"
#: ConfirmDispatch_Invoice.php:1343 CounterReturns.php:1321
#: CounterSales.php:1781
msgid ""
"The stock side of the cost of sales GL posting could not be inserted because"
-msgstr ""
+msgstr "Lanç. Contáb. estoque exced. custo vendas não pode ser inserido porque"
#: ConfirmDispatch_Invoice.php:1370 CounterReturns.php:1346
#: CounterSales.php:1806 RecurringSalesOrdersProcess.php:510
msgid "The sales GL posting could not be inserted because"
-msgstr ""
+msgstr "Lanç. contábil de vendas não podem ser inseridas porque"
#: ConfirmDispatch_Invoice.php:1392 CounterReturns.php:1367
#: CounterSales.php:1827 RecurringSalesOrdersProcess.php:537
msgid "The sales discount GL posting could not be inserted because"
-msgstr ""
+msgstr "Lanç. contábil desconto de vendas não pode ser criado porque"
#: ConfirmDispatch_Invoice.php:1409
msgid "The asset disposal GL posting details could not be retrieved because"
@@ -4672,7 +4672,7 @@
#: ConfirmDispatch_Invoice.php:1410
msgid "The following SQL was used to get the asset posting details"
-msgstr "O sql que falhou na recuperação lançamentos ativo foi"
+msgstr "SQL que falhou na recuperação lançamentos ativo foi"
#: ConfirmDispatch_Invoice.php:1435
msgid "accumulated depreciation disposal"
@@ -4698,7 +4698,7 @@
#: ConfirmDispatch_Invoice.php:1479
msgid "net book value disposal"
-msgstr ""
+msgstr "valor contábil baixa"
#: ConfirmDispatch_Invoice.php:1482
msgid "The disposal net book value GL posting could not be inserted because"
@@ -4720,36 +4720,36 @@
#: SupplierCredit.php:1228 SupplierCredit.php:1316 SupplierInvoice.php:344
#: SupplierInvoice.php:1771 SupplierInvoice.php:1858
msgid "The following SQL to insert the fixed asset transaction record was used"
-msgstr ""
+msgstr "SQL usado para inserir trans. ativo fixo foi"
#: ConfirmDispatch_Invoice.php:1541
msgid "The fixed asset record could not be updated for the disposal because"
-msgstr ""
+msgstr "O trans. ativo fixo não pode ser atualizada para baixa porque"
#: ConfirmDispatch_Invoice.php:1542
msgid "The following SQL to update the fixed asset record was used"
-msgstr ""
+msgstr "SQL usado para atualizar trans. ativo fixo foi"
#: ConfirmDispatch_Invoice.php:1570 CounterReturns.php:1393
#: CounterSales.php:1853 RecurringSalesOrdersProcess.php:604
msgid "The total debtor GL posting could not be inserted because"
-msgstr ""
+msgstr "Total dos débitos na postagem Contábil não podem ser inseridas porque"
#: ConfirmDispatch_Invoice.php:1571 CounterReturns.php:1394
#: CounterSales.php:1854 RecurringSalesOrdersProcess.php:605
msgid ""
"The following SQL to insert the total debtors control GLTrans record was used"
-msgstr ""
+msgstr "SQL usado para inserir total devedor GLTrans foi "
#: ConfirmDispatch_Invoice.php:1595 RecurringSalesOrdersProcess.php:630
msgid "The freight GL posting could not be inserted because"
-msgstr ""
+msgstr "A postagem contábil frete não pode ser inserida porque"
#: ConfirmDispatch_Invoice.php:1617 CounterReturns.php:1416
#: CounterSales.php:1876 Credit_Invoice.php:1437
#: RecurringSalesOrdersProcess.php:577 SelectCreditItems.php:1977
msgid "The tax GL posting could not be inserted because"
-msgstr ""
+msgstr "Postagem Contábil de Impostos não podem ser inseridas porque"
#: ConfirmDispatch_Invoice.php:1634 CounterSales.php:2046
#: RecurringSalesOrdersProcess.php:700 Z_DeleteInvoice.php:178
@@ -4817,10 +4817,12 @@
"Enter the consignment note reference to enable tracking of the delivery in "
"the event of customer proof of delivery issues"
msgstr ""
+"Informe ref. nota consignação para habilitar rastr. de entrega como prova de "
+"entrega"
#: ConfirmDispatch_Invoice.php:1672
msgid "No Of Packages in Delivery"
-msgstr ""
+msgstr "não há núm. de Volumes"
#: ConfirmDispatch_Invoice.php:1678
msgid "Action For Balance"
@@ -4890,7 +4892,7 @@
#: Z_ChangeLocationCode.php:90 Z_ChangeStockCategory.php:65
#: Z_ChangeStockCode.php:101 includes/MiscFunctions.php:446
msgid "The SQL statement that failed was"
-msgstr ""
+msgstr "SQL que falhou foi"
#: ContractBOM.php:149 PO_Items.php:1081 SupplierTenderCreate.php:834
#: SupplierTenders.php:672
@@ -4928,7 +4930,7 @@
#: ContractBOM.php:196 PO_Items.php:580 PurchaseByPrefSupplier.php:30
#: SelectCreditItems.php:637
msgid "The SQL used to retrieve the item details but failed was"
-msgstr "O SQL que falhou usado para recuperar detalhes deste item foi"
+msgstr "SQL que falhou usado para recuperar detalhes deste item foi"
#: ContractBOM.php:209 CounterReturns.php:409 CounterSales.php:448
#: PO_Items.php:688 SelectOrderItems.php:956
@@ -4985,11 +4987,11 @@
#: ContractBOM.php:295 PO_Items.php:1099
msgid "The supplier category details could not be retrieved because"
-msgstr ""
+msgstr "Detalhes da categoria fornecedor não pode ser recuperada porque"
#: ContractBOM.php:296 PO_Items.php:1100
msgid "The SQL used to retrieve the category details but failed was"
-msgstr ""
+msgstr "O SQL, que falhou, usado para recuperar detalhe categoria foi"
#: ContractBOM.php:299 PO_Items.php:1105
msgid "Search For Stock Items"
@@ -5005,6 +5007,8 @@
"Enter any text that should appear in the item description as the basis of "
"your search"
msgstr ""
+"Informe qualquer texto que exista na descição do item, será o argumento de "
+"pesquisa"
#: ContractBOM.php:332 CounterReturns.php:1638 CounterSales.php:2247
#: PO_Items.php:1139 SelectCompletedOrder.php:484 SelectCreditItems.php:1005
@@ -5017,6 +5021,8 @@
"Enter any part of an item code to seach for all matching items containing "
"that text in the code"
msgstr ""
+"Informe qualquer parte do código do item. Será usado para pesquisar itens "
+"contendo esse argumento"
#: ContractBOM.php:337
msgid "Create a New Stock Item"
@@ -5067,11 +5073,11 @@
msgid ""
"This page is expected to be called with the contract reference to show the "
"costing for"
-msgstr ""
+msgstr "Página ativada para exibir custos do contrato para"
#: ContractCosting.php:43
msgid "Could not get the inventory issues for this contract because"
-msgstr ""
+msgstr "Não pode obter requer. de inventário para esse contrato porque"
#: ContractCosting.php:58 ContractCosting.php:66 Contracts.php:198
#: Contracts.php:751 Contracts.php:826 CopyBOM.php:156
@@ -5102,7 +5108,7 @@
#: ContractCosting.php:75
msgid "Inventory Required"
-msgstr "Inventário Requerido"
+msgstr "Estoque Requerido"
#: ContractCosting.php:82 ContractCosting.php:88 Contracts.php:995
#: CounterReturns.php:670 CounterSales.php:747 DeliveryDetails.php:873
@@ -5161,7 +5167,7 @@
#: ContractCosting.php:195
msgid "Could not get the other charges to the contract because"
-msgstr ""
+msgstr "Não pode obter outros encargos para o contrato porque"
#: ContractCosting.php:215
msgid "Actual Other Costs"
@@ -5191,7 +5197,7 @@
#: ContractCosting.php:285
msgid "The following SQL to change the status of the contract was used"
-msgstr "O SQL usado para atualizar a situação do contrato foi "
+msgstr "SQL usado para atualizar a situação do contrato foi "
#: ContractCosting.php:300 WorkOrderCosting.php:521
msgid "Could not update the work order to closed because:"
@@ -5199,7 +5205,7 @@
#: ContractCosting.php:301 WorkOrderCosting.php:522
msgid "The SQL used to close the work order was:"
-msgstr "O SQL usado para fechar a ordem produção foi"
+msgstr "SQL usado para fechar a ordem produção foi"
#: ContractCosting.php:340 GoodsReceived.php:497
#: InternalStockRequestFulfill.php:99 InternalStockRequestFulfill.php:107
@@ -5230,7 +5236,7 @@
msgid ""
"The following SQL to insert the work order receipt of finished items GLTrans "
"record was used"
-msgstr "O SQL usado para inserir lançam. contab. receb. ordem produção foi "
+msgstr "SQL usado para inserir lançam. contab. receb. ordem produção foi "
#: ContractCosting.php:418 WorkOrderReceive.php:673
msgid ""
@@ -5242,7 +5248,7 @@
#: ContractCosting.php:419 WorkOrderReceive.php:674
msgid "The following SQL to insert the WIP GLTrans record was used"
-msgstr "O SQL usado para inserir registros wip usado foi"
+msgstr "SQL usado para inserir registros wip usado foi"
#: ContractCosting.php:425 WorkOrderReceive.php:683
msgid ""
@@ -5253,7 +5259,7 @@
#: ContractCosting.php:426 WorkOrderIssue.php:344 WorkOrderReceive.php:684
msgid "The following SQL was used to update the work order"
-msgstr "O sql usado para atualizar ordem produção"
+msgstr "SQL usado para atualizar ordem produção"
#: ContractCosting.php:439
msgid ""
@@ -5546,7 +5552,7 @@
#: Contracts.php:376
msgid "The SQL that was used to update the contract item failed was"
-msgstr "O SQL usado para atualizar o contrato que falhou, foi"
+msgstr "SQL usado para atualizar o contrato que falhou, foi"
#: Contracts.php:384
msgid "The contract quotation could not be updated because"
@@ -5554,7 +5560,7 @@
#: Contracts.php:385
msgid "The SQL that failed to update the quotation was"
-msgstr "O SQL que falhou em atualizar a cotação foi"
+msgstr "SQL que falhou em atualizar a cotação foi"
#: Contracts.php:387
msgid ""
@@ -5582,7 +5588,7 @@
#: Contracts.php:475
msgid "The SQL that was used to find the item failed was"
-msgstr "O SQL que falhou usado para localizar o item foi"
+msgstr "SQL que falhou usado para localizar o item foi"
#: Contracts.php:493
msgid "The new contract item could not be added because"
@@ -5590,7 +5596,7 @@
#: Contracts.php:494
msgid "The SQL that was used to insert the contract item failed was"
-msgstr "O SQL que falhou usado para inserir o contrato foi"
+msgstr "SQL que falhou usado para inserir o contrato foi"
#: Contracts.php:502 StockClone.php:365 Stocks.php:667 Z_ImportStocks.php:238
msgid "The locations for the item"
@@ -5611,7 +5617,7 @@
#: Contracts.php:503 StockClone.php:366 Stocks.php:668 Z_ImportStocks.php:239
msgid "The SQL that was used to add the location records that failed was"
-msgstr "O SQL que falhou usado para adicionar local foi"
+msgstr "SQL que falhou usado para adicionar local foi"
#: Contracts.php:525
msgid "The customer and branch details could not be retrieved because"
@@ -5620,7 +5626,7 @@
#: Contracts.php:526
msgid ""
"The SQL that was used to find the customer and branch details failed was"
-msgstr "O sql que falhou usado para recuperar detalhes cliente e sucursal foi"
+msgstr "SQL que falhou usado para recuperar detalhes cliente e sucursal foi"
#: Contracts.php:576
msgid "The quotation cannot be added because"
@@ -5695,7 +5701,7 @@
#: Contracts.php:719 CounterReturns.php:120 CounterSales.php:125
#: SelectOrderItems.php:398 SpecialOrder.php:93
msgid "The SQL used to retrieve the customer details and failed was"
-msgstr "O sql usado para recuperar detalhes do cliente que falhou foi"
+msgstr "SQL usado para recuperar detalhes do cliente que falhou foi"
#: Contracts.php:723
msgid "The customer details were unable to be retrieved"
@@ -5703,7 +5709,7 @@
#: Contracts.php:725
msgid "The SQL used that failed to get the customer details was:"
-msgstr "O SQL que falhou na recup. do Cliente foi:"
+msgstr "SQL que falhou na recup. do Cliente foi:"
#: Contracts.php:737 CounterSales.php:193 SalesAnalRepts.php:166
#: SalesAnalRepts.php:229 SelectOrderItems.php:404 SelectOrderItems.php:494
@@ -5742,6...
[truncated message content] |
|
From: <dai...@us...> - 2014-01-31 22:17:00
|
Revision: 6554
http://sourceforge.net/p/web-erp/reponame/6554
Author: daintree
Date: 2014-01-31 22:16:56 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
Muthu: added sequence to BOMs.php
Modified Paths:
--------------
trunk/BOMs.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.11.2-4.11.3.sql
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2014-01-31 09:08:12 UTC (rev 6553)
+++ trunk/BOMs.php 2014-01-31 22:16:56 UTC (rev 6554)
@@ -17,8 +17,7 @@
// retrive all children of parent
$c_result = DB_query("SELECT parent,
component
- FROM bom WHERE parent='" . $Parent. "'"
- ,$db);
+ FROM bom WHERE parent='" . $Parent. "' ORDER BY sequence ASC" ,$db);
if (DB_num_rows($c_result) > 0) {
while ($row = DB_fetch_array($c_result)) {
@@ -70,7 +69,8 @@
function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level, $db) {
global $ParentMBflag;
- $sql = "SELECT bom.component,
+ $sql = "SELECT bom.sequence,
+ bom.component,
stockmaster.description as itemdescription,
locations.locationname,
locations.loccode,
@@ -143,6 +143,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
@@ -153,6 +154,7 @@
<td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
+ $myrow['sequence'],
$myrow['component'],
$myrow['itemdescription'],
$myrow['locationname'],
@@ -289,7 +291,8 @@
if (isset($SelectedParent) AND isset($SelectedComponent) AND $InputError != 1) {
- $sql = "UPDATE bom SET workcentreadded='" . $_POST['WorkCentreAdded'] . "',
+ $sql = "UPDATE bom SET sequence='" . $_POST['Sequence'] . "',
+ workcentreadded='" . $_POST['WorkCentreAdded'] . "',
loccode='" . $_POST['LocCode'] . "',
effectiveafter='" . $EffectiveAfterSQL . "',
effectiveto='" . $EffectiveToSQL . "',
@@ -328,7 +331,8 @@
if (DB_num_rows($result)==0) {
- $sql = "INSERT INTO bom (parent,
+ $sql = "INSERT INTO bom (sequence,
+ parent,
component,
workcentreadded,
loccode,
@@ -336,7 +340,8 @@
effectiveafter,
effectiveto,
autoissue)
- VALUES ('".$SelectedParent."',
+ VALUES ('" . $_POST['Sequence'] . "',
+ '".$SelectedParent."',
'" . $_POST['Component'] . "',
'" . $_POST['WorkCentreAdded'] . "',
'" . $_POST['LocCode'] . "',
@@ -550,6 +555,7 @@
$TableHeader = '<tr>
<th>' . _('Level') . '</th>
+ <th>' . _('Sequence') . '</th>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Location') . '</th>
@@ -595,7 +601,8 @@
if (isset($_GET['SelectedComponent']) AND $InputError !=1) {
//editing a selected component from the link to the line item
- $sql = "SELECT loccode,
+ $sql = "SELECT sequence,
+ loccode,
effectiveafter,
effectiveto,
workcentreadded,
@@ -608,6 +615,7 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
+ $_POST['Sequence'] = $myrow['sequence'];
$_POST['LocCode'] = $myrow['loccode'];
$_POST['EffectiveAfter'] = ConvertSQLDate($myrow['effectiveafter']);
$_POST['EffectiveTo'] = ConvertSQLDate($myrow['effectiveto']);
@@ -630,7 +638,7 @@
</tr>';
} else { //end of if $SelectedComponent
-
+ $_POST['Sequence'] = 0;
echo '<input type="hidden" name="SelectedParent" value="' . $SelectedParent . '" />';
/* echo "Enter the details of a new component in the fields below. <br />Click on 'Enter Information' to add the new component, once all fields are completed.";
*/
@@ -681,8 +689,12 @@
echo '</select></td>
</tr>';
}
-
echo '<tr>
+ <td>' . _('Sequence in BOM') . ':</td>
+ <td><input type="text" class="integer" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
+ </tr>';
+
+ echo '<tr>
<td>' . _('Location') . ': </td>
<td><select tabindex="2" name="LocCode">';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-01-31 09:08:12 UTC (rev 6553)
+++ trunk/doc/Change.log 2014-01-31 22:16:56 UTC (rev 6554)
@@ -1,6 +1,8 @@
webERP Change Log
+
+31/1/14 Muthu: Added sequence field to BOMs.php
+30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.
-30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since this was quite old
24/1/14 Andrew Galuski: Display serial items on GRN printouts
23/1/14 Phil: Fixed incompatible error traps on hyphens between new customers and new branches. Now both allow hyphens. Also prevented deletion of the last customer branch. Customer branches are now deleted when a customer is attempted to be deleted provided there are no dependent records.
19/01/14 Exson: Add sales man login control and modify the PDF to download to harmony with other files and solve backward failure problem in PrintCustStatements.php.
Modified: trunk/sql/mysql/upgrade4.11.2-4.11.3.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.2-4.11.3.sql 2014-01-31 09:08:12 UTC (rev 6553)
+++ trunk/sql/mysql/upgrade4.11.2-4.11.3.sql 2014-01-31 22:16:56 UTC (rev 6554)
@@ -21,4 +21,6 @@
DELETE FROM scripts WHERE script='ReportletContainer.php';
DELETE FROM scripts WHERE script='SystemCheck.php';
UPDATE holdreasons set dissallowinvoices=2 WHERE reasoncode=20;
+ALTER table stockmoves CHANGE reference reference varchar(100) NOT NULL DEFAULT '';
+ALTER TABLE bom ADD COLUMN sequence INT(11) NOT NULL DEFAULT 0 AFTER parent;
UPDATE config SET confvalue='4.11.3' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2014-01-31 22:37:37
|
Revision: 6555
http://sourceforge.net/p/web-erp/reponame/6555
Author: daintree
Date: 2014-01-31 22:37:33 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
Andrew Galuski: P & L without zero accounts fix
Modified Paths:
--------------
trunk/GLProfit_Loss.php
trunk/doc/Change.log
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2014-01-31 22:16:56 UTC (rev 6554)
+++ trunk/GLProfit_Loss.php 2014-01-31 22:37:33 UTC (rev 6555)
@@ -406,9 +406,10 @@
$SectionPrdBudget +=$AccountPeriodBudget;
if ($_POST['Detail'] == 'Detailed') {
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$myrow['accountcode']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$myrow['accountname']);
+
if (isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND ($AccountPeriodActual <> 0 OR $AccountPeriodBudget <> 0 OR $AccountPeriodLY <> 0))){ //condition for pdf
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$myrow['accountcode']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$myrow['accountname']);
if ($Section == 1) { /*Income*/
$LeftOvers = $pdf->addTextWrap($Left_Margin+310,$YPos,70,$FontSize,locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),'right');
@@ -1295,4 +1296,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-01-31 22:16:56 UTC (rev 6554)
+++ trunk/doc/Change.log 2014-01-31 22:37:33 UTC (rev 6555)
@@ -1,5 +1,6 @@
webERP Change Log
+31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
31/1/14 Muthu: Added sequence field to BOMs.php
30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.
|
|
From: <dai...@us...> - 2014-02-02 09:14:00
|
Revision: 6556
http://sourceforge.net/p/web-erp/reponame/6556
Author: daintree
Date: 2014-02-02 09:13:54 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
preparation for new release
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
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/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2014-01-31 22:37:33 UTC (rev 6555)
+++ trunk/StockLocTransferReceive.php 2014-02-02 09:13:54 UTC (rev 6556)
@@ -30,7 +30,9 @@
if (is_numeric(filter_number_format($_POST['Qty' . $i]))){
/*Update the quantity received from the inputs */
$_SESSION['Transfer']->TransferItem[$i]->Quantity= round(filter_number_format($_POST['Qty' . $i]),$_SESSION['Transfer']->TransferItem[$i]->DecimalPlaces);
- } else {
+ } elseif ($_POST['Qty' . $i]=='') {
+ $_SESSION['Transfer']->TransferItem[$i]->Quantity= 0;
+ } else {
prnMsg(_('The quantity entered for'). ' ' . $TrfLine->StockID . ' '. _('is not numeric') . '. ' . _('All quantities must be numeric'),'error');
$InputError = True;
}
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2014-01-31 22:37:33 UTC (rev 6555)
+++ trunk/UpgradeDatabase.php 2014-02-02 09:13:54 UTC (rev 6556)
@@ -180,6 +180,7 @@
case '4.11.1':
$SQLScripts[] = './sql/mysql/upgrade4.11.1-4.11.2.sql';
case '4.11.2':
+ $SQLScripts[] = './sql/mysql/upgrade4.11.2-4.11.3.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-01-31 22:37:33 UTC (rev 6555)
+++ trunk/doc/Change.log 2014-02-02 09:13:54 UTC (rev 6556)
@@ -1,5 +1,7 @@
webERP Change Log
+2/2/14 Release 4.11.3
+
31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
31/1/14 Muthu: Added sequence field to BOMs.php
30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
@@ -21,7 +23,6 @@
23/12/13 Exson: Fixed the controlled items cannot be removed due to the negative operator is modified and balance of a serial no is wrong due negative operator is missing during credit controlled items by KEYED method. Other input method has not be inspected.
22/12/13 Exson: Add a fool-proof to Credit_Invoice.php to prevent an invoice was credit again and again.
22/12/13 Exson: Modify the stock select element to a combox box which autocomplete the limited stock ID options to 300 in PriceMatrix.php. Otherwise, users have to input an stock ID themselves. To avoid a too long stock list as pointed by Tim.
-
21/12/13 Exson: Add price matrix features. Modified MainMenuLinksArray.php, GetPrice.inc and add pricematrix table and PriceMatrix.php
20/12/13 Thumb: Salesman can only review his own customer's data
14/12/12: Phil: As per Gilberto dos santos alves - Extended smtp user name to varchar(50) as sometimes a full email address is required - tidied the script a bit too.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2014-01-31 22:37:33 UTC (rev 6555)
+++ trunk/includes/ConnectDB.inc 2014-02-02 09:13:54 UTC (rev 6556)
@@ -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.11.2'; //must update manually every time there is a DB change
+$Version='4.11.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){ //need to get the database name from the file structure
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 2014-01-31 22:37:33 UTC (rev 6555)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2014-02-02 09:13:54 UTC (rev 6556)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-01 20:34+1300\n"
+"POT-Creation-Date: 2014-02-02 21:58+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"
@@ -164,24 +164,24 @@
#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
#: Currencies.php:245 Currencies.php:253 Currencies.php:261
-#: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313
-#: CustomerBranches.php:323 CustomerBranches.php:333 Customers.php:295
-#: Customers.php:304 Customers.php:312 Customers.php:320 CustomerTypes.php:147
-#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96
-#: Locations.php:250 Locations.php:258 Locations.php:269 Locations.php:278
-#: Locations.php:287 Locations.php:296 Locations.php:305 Locations.php:314
-#: Locations.php:322 Manufacturers.php:154 MRPDemandTypes.php:87
-#: PaymentMethods.php:142 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
-#: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:191 Stocks.php:726 Stocks.php:735 Stocks.php:743
-#: Stocks.php:751 Stocks.php:759 Stocks.php:767 Stocks.php:775 Stocks.php:783
-#: Suppliers.php:640 Suppliers.php:649 Suppliers.php:657 SupplierTypes.php:145
-#: TaxCategories.php:131 TaxGroups.php:132 TaxGroups.php:140
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WorkCentres.php:89
-#: WorkCentres.php:95 WWW_Access.php:86
+#: 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:147 CustomerTypes.php:157 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:80
+#: GLAccounts.php:96 Locations.php:250 Locations.php:258 Locations.php:269
+#: Locations.php:278 Locations.php:287 Locations.php:296 Locations.php:305
+#: Locations.php:314 Locations.php:322 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:142 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:150 SalesPeople.php:157
+#: SalesPeople.php:163 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:209 Stocks.php:726 Stocks.php:735
+#: Stocks.php:743 Stocks.php:751 Stocks.php:759 Stocks.php:767 Stocks.php:775
+#: Stocks.php:783 Suppliers.php:640 Suppliers.php:649 Suppliers.php:657
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
+#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:86
msgid "There are"
msgstr "يوجد"
@@ -233,12 +233,12 @@
#: AccountGroups.php:286 AccountSections.php:172 AddCustomerContacts.php:25
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
#: BOMExtendedQty.php:252 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:188 BOMListing.php:109 BOMs.php:231 BOMs.php:862
-#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1605
-#: CounterSales.php:2092 CounterSales.php:2215 Credit_Invoice.php:272
+#: BOMInquiry.php:188 BOMListing.php:109 BOMs.php:233 BOMs.php:874
+#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1619
+#: CounterSales.php:2105 CounterSales.php:2228 Credit_Invoice.php:275
#: CreditStatus.php:21 Currencies.php:30 CustEDISetup.php:17
#: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16
@@ -253,19 +253,19 @@
#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:142
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
-#: PurchaseByPrefSupplier.php:305 PurchData.php:241 PurchData.php:373
-#: PurchData.php:401 RecurringSalesOrders.php:320 SalesAnalReptCols.php:51
-#: SalesAnalRepts.php:14 SalesCategories.php:11 SalesGLPostings.php:19
-#: SalesGraph.php:39 SalesPeople.php:20 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:601 SelectOrderItems.php:1524
-#: SelectOrderItems.php:1652 SelectProduct.php:526 SelectSalesOrder.php:563
-#: SelectSupplier.php:14 SelectSupplier.php:220 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:169 SellThroughSupport.php:229 ShipmentCosting.php:11
-#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:28
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:30 PurchaseByPrefSupplier.php:305 PurchData.php:241
+#: PurchData.php:373 PurchData.php:401 RecurringSalesOrders.php:320
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:20
+#: 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:601
+#: SelectOrderItems.php:1525 SelectOrderItems.php:1653 SelectProduct.php:526
+#: SelectSalesOrder.php:563 SelectSupplier.php:14 SelectSupplier.php:220
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:169 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:28
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
@@ -299,13 +299,13 @@
msgstr ""
#: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448
-#: AccountGroups.php:450 BOMs.php:124 BOMs.php:774 BOMs.php:776
+#: AccountGroups.php:450 BOMs.php:124 BOMs.php:786 BOMs.php:788
#: CompanyPreferences.php:427 CompanyPreferences.php:429
#: CompanyPreferences.php:442 CompanyPreferences.php:444
#: CompanyPreferences.php:457 CompanyPreferences.php:459
-#: ContractCosting.php:202 Currencies.php:331 Currencies.php:497
-#: Currencies.php:499 CustomerBranches.php:426 Customers.php:642
-#: Customers.php:1032 Customers.php:1038 Customers.php:1041
+#: ContractCosting.php:202 Currencies.php:331 Currencies.php:499
+#: Currencies.php:501 CustomerBranches.php:451 Customers.php:659
+#: Customers.php:1047 Customers.php:1053 Customers.php:1056
#: DailyBankTransactions.php:148 DeliveryDetails.php:1148
#: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101
#: GLTransInquiry.php:69 Labels.php:591 Labels.php:593 Labels.php:618
@@ -331,15 +331,15 @@
#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:917
#: StockClone.php:919 StockClone.php:942 StockClone.php:944 Stocks.php:1204
#: Stocks.php:1206 Stocks.php:1229 Stocks.php:1231 SuppContractChgs.php:90
-#: SystemParameters.php:426 SystemParameters.php:449 SystemParameters.php:486
-#: SystemParameters.php:558 SystemParameters.php:566 SystemParameters.php:606
-#: SystemParameters.php:682 SystemParameters.php:691 SystemParameters.php:699
-#: SystemParameters.php:717 SystemParameters.php:724 SystemParameters.php:768
-#: SystemParameters.php:864 SystemParameters.php:1007
-#: SystemParameters.php:1009 SystemParameters.php:1019
-#: SystemParameters.php:1021 SystemParameters.php:1075
-#: SystemParameters.php:1087 SystemParameters.php:1089
-#: SystemParameters.php:1127 SystemParameters.php:1129 TaxGroups.php:311
+#: SystemParameters.php:426 SystemParameters.php:449 SystemParameters.php:484
+#: SystemParameters.php:556 SystemParameters.php:564 SystemParameters.php:604
+#: SystemParameters.php:680 SystemParameters.php:689 SystemParameters.php:697
+#: SystemParameters.php:715 SystemParameters.php:722 SystemParameters.php:766
+#: SystemParameters.php:862 SystemParameters.php:1005
+#: SystemParameters.php:1007 SystemParameters.php:1017
+#: SystemParameters.php:1019 SystemParameters.php:1073
+#: SystemParameters.php:1085 SystemParameters.php:1087
+#: SystemParameters.php:1125 SystemParameters.php:1127 TaxGroups.php:311
#: TaxGroups.php:314 TaxGroups.php:371 WWW_Users.php:491 WWW_Users.php:493
#: WWW_Users.php:664 WWW_Users.php:666
msgid "Yes"
@@ -347,13 +347,13 @@
#: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455
#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
-#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:773
-#: BOMs.php:777 CompanyPreferences.php:426 CompanyPreferences.php:430
+#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:785
+#: BOMs.php:789 CompanyPreferences.php:426 CompanyPreferences.php:430
#: CompanyPreferences.php:441 CompanyPreferences.php:445
#: CompanyPreferences.php:456 CompanyPreferences.php:460
-#: ContractCosting.php:200 Currencies.php:333 Currencies.php:502
-#: Currencies.php:504 CustomerBranches.php:426 Customers.php:641
-#: Customers.php:1030 Customers.php:1037 Customers.php:1040
+#: ContractCosting.php:200 Currencies.php:333 Currencies.php:504
+#: Currencies.php:506 CustomerBranches.php:451 Customers.php:658
+#: Customers.php:1045 Customers.php:1052 Customers.php:1055
#: DailyBankTransactions.php:150 DeliveryDetails.php:1149
#: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99
#: GLTransInquiry.php:88 Labels.php:590 Labels.php:594 Labels.php:619
@@ -379,15 +379,15 @@
#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:912
#: StockClone.php:914 StockClone.php:937 StockClone.php:939 Stocks.php:1199
#: Stocks.php:1201 Stocks.php:1224 Stocks.php:1226 SuppContractChgs.php:92
-#: SystemParameters.php:427 SystemParameters.php:450 SystemParameters.php:487
-#: SystemParameters.php:559 SystemParameters.php:567 SystemParameters.php:607
-#: SystemParameters.php:683 SystemParameters.php:692 SystemParameters.php:700
-#: SystemParameters.php:718 SystemParameters.php:725 SystemParameters.php:769
-#: SystemParameters.php:865 SystemParameters.php:1006
-#: SystemParameters.php:1010 SystemParameters.php:1018
-#: SystemParameters.php:1022 SystemParameters.php:1076
-#: SystemParameters.php:1086 SystemParameters.php:1090
-#: SystemParameters.php:1126 SystemParameters.php:1130 TaxGroups.php:312
+#: SystemParameters.php:427 SystemParameters.php:450 SystemParameters.php:485
+#: SystemParameters.php:557 SystemParameters.php:565 SystemParameters.php:605
+#: SystemParameters.php:681 SystemParameters.php:690 SystemParameters.php:698
+#: SystemParameters.php:716 SystemParameters.php:723 SystemParameters.php:767
+#: SystemParameters.php:863 SystemParameters.php:1004
+#: SystemParameters.php:1008 SystemParameters.php:1016
+#: SystemParameters.php:1020 SystemParameters.php:1074
+#: SystemParameters.php:1084 SystemParameters.php:1088
+#: SystemParameters.php:1124 SystemParameters.php:1128 TaxGroups.php:312
#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:490 WWW_Users.php:494
#: WWW_Users.php:663 WWW_Users.php:667 includes/PDFLowGPPageHeader.inc:44
#: includes/PDFTaxPageHeader.inc:35
@@ -396,9 +396,9 @@
#: AccountGroups.php:325 AccountSections.php:192 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:112
+#: BankAccounts.php:223 BOMs.php:152 COGSGLPostings.php:112
#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:363
-#: CustomerBranches.php:430 Customers.php:1115 Customers.php:1149
+#: CustomerBranches.php:455 Customers.php:1130 Customers.php:1164
#: CustomerTypes.php:206 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
@@ -408,13 +408,13 @@
#: MRPDemandTypes.php:120 PaymentMethods.php:208 PaymentTerms.php:205
#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: Prices_Customer.php:280 Prices.php:249 PurchData.php:312
+#: Prices_Customer.php:280 Prices.php:255 PurchData.php:312
#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:253
#: SalesPeople.php:232 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 SellThroughSupport.php:298
-#: Shippers.php:144 StockCategories.php:267 SupplierContacts.php:165
+#: Shippers.php:144 StockCategories.php:289 SupplierContacts.php:165
#: SupplierTenderCreate.php:155 SupplierTypes.php:189
#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182
#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
@@ -431,11 +431,11 @@
#: AccountGroups.php:326 AccountSections.php:196 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:113
+#: BankAccounts.php:224 BOMs.php:154 COGSGLPostings.php:113
#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:400
-#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:957
-#: Customers.php:1150 CustomerTypes.php:207 Departments.php:187
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:403
+#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:970
+#: Customers.php:1165 CustomerTypes.php:207 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:429 GLTags.php:97
@@ -446,22 +446,22 @@
#: PaymentMethods.php:209 Payments.php:1115 PaymentTerms.php:206
#: 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:772 Prices_Customer.php:281
-#: Prices.php:250 PurchData.php:314 PurchData.php:721
+#: PO_AuthorisationLevels.php:153 PO_Items.php:772 PriceMatrix.php:174
+#: Prices_Customer.php:281 Prices.php:256 PurchData.php:314 PurchData.php:721
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:254 SalesPeople.php:233
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:779
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1439 SellThroughSupport.php:299 Shipments.php:440
-#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:268
-#: StockCategories.php:613 StockLocTransfer.php:324 SuppContractChgs.php:99
+#: SelectOrderItems.php:1440 SellThroughSupport.php:299 Shipments.php:440
+#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:290
+#: StockCategories.php:619 StockLocTransfer.php:324 SuppContractChgs.php:99
#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147
#: SupplierContacts.php:166 SupplierTenderCreate.php:417
#: SupplierTenderCreate.php:447 SupplierTypes.php:191 SuppShiptChgs.php:90
#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:175 TaxCategories.php:183
#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:326 WWW_Access.php:127
+#: WorkCentres.php:142 WOSerialNos.php:327 WWW_Access.php:127
#: WWW_Users.php:328 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#, php-format
@@ -532,19 +532,20 @@
#: AccountGroups.php:465 AccountSections.php:263 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:399 BOMs.php:790 COGSGLPostings.php:365
-#: CreditStatus.php:259 Currencies.php:512 CustLoginSetup.php:273
+#: BankAccounts.php:399 BOMs.php:802 COGSGLPostings.php:365
+#: CreditStatus.php:259 Currencies.php:513 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:266 Labels.php:631
#: Locations.php:646 Manufacturers.php:312 MRPDemands.php:424
#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
#: PaymentMethods.php:300 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
-#: Prices_Customer.php:363 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
-#: SalesGLPostings.php:425 SalesPeople.php:373 Shippers.php:203
-#: StockCategories.php:640 SupplierContacts.php:284 SuppLoginSetup.php:292
-#: TaxAuthorities.php:329 TaxCategories.php:241 TaxProvinces.php:235
-#: UnitsOfMeasure.php:241 WorkCentres.php:280 WWW_Users.php:735
+#: PriceMatrix.php:133 Prices_Customer.php:363 SalesAnalReptCols.php:552
+#: SalesAnalRepts.php:519 SalesGLPostings.php:425 SalesPeople.php:373
+#: Shippers.php:203 StockCategories.php:646 SupplierContacts.php:284
+#: SuppLoginSetup.php:292 TaxAuthorities.php:329 TaxCategories.php:241
+#: TaxProvinces.php:235 UnitsOfMeasure.php:241 WorkCentres.php:280
+#: WWW_Users.php:735
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -664,7 +665,7 @@
msgstr ""
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
-#: CustomerBranches.php:383 Customers.php:1102 Customers.php:1110
+#: CustomerBranches.php:408 Customers.php:1117 Customers.php:1125
#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609
#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297
#: SupplierContacts.php:152 SuppTransGLAnalysis.php:108
@@ -673,8 +674,8 @@
msgid "Name"
msgstr ""
-#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1103
-#: Customers.php:1111 SelectCustomer.php:610 WWW_Access.php:110
+#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1118
+#: Customers.php:1126 SelectCustomer.php:610 WWW_Access.php:110
#: WWW_Access.php:173
msgid "Role"
msgstr ""
@@ -684,15 +685,15 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:389 CustomerBranches.php:813 CustomerInquiry.php:261
-#: Customers.php:1105 Customers.php:1113 EmailCustTrans.php:15
+#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:278
+#: Customers.php:1120 Customers.php:1128 EmailCustTrans.php:15
#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:598
#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:395
#: PO_PDFPurchOrder.php:398 PrintCustTrans.php:746 PrintCustTrans.php:977
#: PrintCustTrans.php:1026 PrintCustTransPortrait.php:789
#: PrintCustTransPortrait.php:1035 PrintCustTransPortrait.php:1091
#: SelectCustomer.php:427 SelectCustomer.php:612 SelectSupplier.php:288
-#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:185
+#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184
#: WWW_Users.php:283 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:111
@@ -701,12 +702,12 @@
msgid "Email"
msgstr ""
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1106
-#: Customers.php:1114 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
+#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1121
+#: Customers.php:1129 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
#: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238
-#: PcClaimExpensesFromTab.php:405 PcReportTab.php:336 SelectCustomer.php:613
-#: ShopParameters.php:198 SystemParameters.php:363 WOSerialNos.php:297
-#: WOSerialNos.php:303
+#: PcClaimExpensesFromTab.php:405 PcReportTab.php:336 PDFQuotation.php:248
+#: SelectCustomer.php:613 ShopParameters.php:198 SystemParameters.php:363
+#: WOSerialNos.php:298 WOSerialNos.php:304
msgid "Notes"
msgstr ""
@@ -774,8 +775,8 @@
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: BankMatching.php:283 BankReconciliation.php:217 BankReconciliation.php:294
-#: ContractCosting.php:177 CustomerAllocations.php:334
-#: CustomerAllocations.php:364 CustomerInquiry.php:204
+#: ContractCosting.php:177 CustomerAllocations.php:350
+#: CustomerAllocations.php:380 CustomerInquiry.php:221
#: CustomerTransInquiry.php:106 GLAccountInquiry.php:174
#: GLAccountReport.php:343 GLTransInquiry.php:42 MRPCalendar.php:219
#: PaymentAllocations.php:66 PcAssignCashToTab.php:238
@@ -787,7 +788,7 @@
#: StockMovements.php:98 StockSerialItemResearch.php:81
#: SupplierAllocations.php:456 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierInquiry.php:212
-#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:89
+#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:19
#: includes/PDFQuotationPortraitPageHeader.inc:88
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:48
@@ -797,10 +798,10 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:181
#: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:921
-#: Stocks.php:1208 UpgradeDatabase.php:232 UpgradeDatabase.php:235
-#: UpgradeDatabase.php:238 UpgradeDatabase.php:241 UpgradeDatabase.php:244
-#: UpgradeDatabase.php:247 UpgradeDatabase.php:250 UpgradeDatabase.php:253
-#: UpgradeDatabase.php:256 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1208 UpgradeDatabase.php:233 UpgradeDat...
[truncated message content] |
|
From: <dai...@us...> - 2014-02-03 09:04:05
|
Revision: 6558
http://sourceforge.net/p/web-erp/reponame/6558
Author: daintree
Date: 2014-02-03 09:04:01 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
Fix Payments.php was entering multiple lines for the total payment for each GL analysis line rather than just a single payment line for the total
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2014-02-03 08:48:54 UTC (rev 6557)
+++ trunk/Payments.php 2014-02-03 09:04:01 UTC (rev 6558)
@@ -337,7 +337,9 @@
/*The functional currency amount will be the
payment currenct amount / the bank account currency exchange rate - to get to the bank account currency
then / the functional currency exchange rate to get to the functional currency */
- if ($PaymentItem->Cheque=='') $PaymentItem->Cheque=0;
+ if ($PaymentItem->Cheque=='') {
+ $PaymentItem->Cheque=0;
+ }
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -346,17 +348,16 @@
narrative,
amount,
chequeno,
- tag) ";
- $SQL= $SQL . "VALUES (1,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $PaymentItem->GLCode . "',
- '" . $PaymentItem->Narrative . "',
- '" . ($PaymentItem->Amount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "',
- '". $PaymentItem->Cheque ."',
- '" . $PaymentItem->Tag . "'
- )";
+ tag)
+ VALUES (1,
+ '" . $TransNo . "',
+ '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
+ '" . $PeriodNo . "',
+ '" . $PaymentItem->GLCode . "',
+ '" . $PaymentItem->Narrative . "',
+ '" . ($PaymentItem->Amount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "',
+ '". $PaymentItem->Cheque ."',
+ '" . $PaymentItem->Tag . "')";
$ErrMsg = _('Cannot insert a GL entry for the payment using the SQL');
$result = DB_query($SQL,$db,$ErrMsg,_('The SQL that failed was'),true);
@@ -564,44 +565,16 @@
}
/*now enter the BankTrans entry */
- if ($TransType==22) {
- $SQL="INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
- VALUES ('" . $TransNo . "',
- '" . $TransType . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . -$_SESSION['PaymentDetail' . $identifier]->Amount . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "'
- )";
-
- $ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction using the SQL');
- $result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- } else {
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems as $PaymentItem) {
- $SQL="INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
+ $SQL="INSERT INTO banktrans (transno,
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode)
VALUES ('" . $TransNo . "',
'" . $TransType . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
@@ -611,13 +584,11 @@
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
'" . -$_SESSION['PaymentDetail' . $identifier]->Amount . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "' )";
+ '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "')";
- $ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction using the SQL');
- $result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- }
- }
+ $ErrMsg = _('Cannot insert a bank transaction because');
+ $DbgMsg = _('Cannot insert a bank transaction using the SQL');
+ $result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
DB_Txn_Commit($db);
prnMsg(_('Payment') . ' ' . $TransNo . ' ' . _('has been successfully entered'),'success');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-03 08:48:54 UTC (rev 6557)
+++ trunk/doc/Change.log 2014-02-03 09:04:01 UTC (rev 6558)
@@ -2,6 +2,7 @@
2/2/14 Release 4.11.3
+3/2/14 Phil: Fix bug in Payments.php that was duplicating payments for mutliple GL analysis entries. Now just a single bank trans is created for the payment which can be analysed to any number of GL accounts
31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
31/1/14 Muthu: Added sequence field to BOMs.php
30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
|
|
From: <dai...@us...> - 2014-02-03 09:12:09
|
Revision: 6560
http://sourceforge.net/p/web-erp/reponame/6560
Author: daintree
Date: 2014-02-03 09:12:04 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
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/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-03 09:06:53 UTC (rev 6559)
+++ trunk/doc/Change.log 2014-02-03 09:12:04 UTC (rev 6560)
@@ -2,6 +2,7 @@
2/2/14 Release 4.11.3
+3/2/14 Exson: Fixed installer now allows characters in the database name
3/2/14 Phil: Fix bug in Payments.php that was duplicating payments for mutliple GL analysis entries. Now just a single bank trans is created for the payment which can be analysed to any number of GL accounts
31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
31/1/14 Muthu: Added sequence field to BOMs.php
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 2014-02-03 09:06:53 UTC (rev 6559)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2014-02-03 09:12:04 UTC (rev 6560)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 21:58+1300\n"
+"POT-Creation-Date: 2014-02-03 22:05+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"
@@ -443,7 +443,7 @@
#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1115 PaymentTerms.php:206
+#: PaymentMethods.php:209 Payments.php:1086 PaymentTerms.php:206
#: 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:772 PriceMatrix.php:174
@@ -1009,7 +1009,7 @@
#: Credit_Invoice.php:746 Credit_Invoice.php:767 CustomerReceipt.php:557
#: CustomerReceipt.php:707 CustomerReceipt.php:735 CustomerTransInquiry.php:97
#: DeliveryDetails.php:409 GLProfit_Loss.php:609 GLTagProfit_Loss.php:515
-#: Payments.php:361 PDFRemittanceAdvice.php:85 PurchData.php:114
+#: Payments.php:362 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:191 ReverseGRN.php:205 ReverseGRN.php:379
#: SelectCreditItems.php:1442 SelectSalesOrder.php:208
@@ -1659,7 +1659,7 @@
#: CustomerReceipt.php:1142 CustomerTypes.php:270 ExchangeRateTrend.php:51
#: FreightCosts.php:60 GLJournal.php:139 GLJournal.php:376
#: InternalStockCategoriesByRole.php:136 InternalStockCategoriesByRole.php:226
-#: OffersReceived.php:114 Payments.php:1083 PcAssignCashToTab.php:181
+#: OffersReceived.php:114 Payments.php:1054 PcAssignCashToTab.php:181
#: PcAssignCashToTab.php:398 PcAuthorizeExpenses.php:334
#: PcClaimExpensesFromTab.php:174 PcClaimExpensesFromTab.php:422
#: PcExpenses.php:350 PcExpensesTypeTab.php:139 PcExpensesTypeTab.php:229
@@ -1671,7 +1671,7 @@
#: BankAccountUsers.php:124 BankAccountUsers.php:223
#: CustomerAllocations.php:452 CustomerReceipt.php:1143
#: InternalStockCategoriesByRole.php:137 InternalStockCategoriesByRole.php:227
-#: Payments.php:1084 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
+#: Payments.php:1055 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
#: PcAuthorizeExpenses.php:335 PcClaimExpensesFromTab.php:175
#: PcClaimExpensesFromTab.php:423 PcExpenses.php:351 PcExpensesTypeTab.php:140
#: PcExpensesTypeTab.php:230 PcTabs.php:488 PcTypeTabs.php:254
@@ -1769,7 +1769,7 @@
#: BankMatching.php:100 BankReconciliation.php:113 CounterReturns.php:829
#: Currencies.php:219 CustomerReceipt.php:785 DailyBankTransactions.php:40
-#: Payments.php:789 PDFChequeListing.php:46 TaxAuthorities.php:151
+#: Payments.php:760 PDFChequeListing.php:46 TaxAuthorities.php:151
#: TaxAuthorities.php:318
msgid "Bank Account"
msgstr ""
@@ -1789,7 +1789,7 @@
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:178 GLAccountReport.php:106
-#: Payments.php:764 PcReportTab.php:110 PDFChequeListing.php:117
+#: Payments.php:735 PcReportTab.php:110 PDFChequeListing.php:117
#: PDFChequeListing.php:127 PDFChequeListing.php:196
#: PDFDeliveryDifferences.php:194 PDFDeliveryDifferences.php:207
#: PDFDeliveryDifferences.php:306 PDFDIFOT.php:197 PDFDIFOT.php:210
@@ -1897,7 +1897,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr ""
-#: BankMatching.php:280 Payments.php:1091
+#: BankMatching.php:280 Payments.php:1062
msgid "Cheque No"
msgstr ""
@@ -1910,8 +1910,8 @@
#: CustomerAllocations.php:381 CustomerReceipt.php:947
#: CustomerTransInquiry.php:113 CustWhereAlloc.php:115 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
-#: PaymentAllocations.php:67 Payments.php:1071 Payments.php:1076
-#: Payments.php:1092 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
+#: PaymentAllocations.php:67 Payments.php:1042 Payments.php:1047
+#: Payments.php:1063 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:236
#: PcClaimExpensesFromTab.php:396 PcReportTab.php:180 PcReportTab.php:335
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
@@ -1990,7 +1990,7 @@
msgstr ""
#: BankReconciliation.php:110 CustomerReceipt.php:773
-#: DailyBankTransactions.php:36 Payments.php:785 SuppPaymentRun.php:319
+#: DailyBankTransactions.php:36 Payments.php:756 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr ""
@@ -2003,12 +2003,12 @@
msgstr ""
#: BankReconciliation.php:120 CustomerReceipt.php:793
-#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
+#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentRun.php:332
msgid "define the bank accounts"
msgstr ""
#: BankReconciliation.php:120 CustomerReceipt.php:793
-#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
+#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
msgstr ""
@@ -2061,7 +2061,7 @@
#: ContractCosting.php:176 CustomerInquiry.php:223 CustomerPurchases.php:83
#: CustomerReceipt.php:911 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
#: DailyBankTransactions.php:131 GLAccountReport.php:342
-#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:932
+#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:903
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:145
#: StockCounts.php:170 StockCounts.php:214 StockLocMovements.php:94
#: StockMovements.php:102 Z_CheckAllocs.php:64
@@ -3176,7 +3176,7 @@
msgstr ""
#: COGSGLPostings.php:200 CustomerReceipt.php:1074 GLJournal.php:387
-#: GLTransInquiry.php:44 Payments.php:1093 SupplierTransInquiry.php:172
+#: GLTransInquiry.php:44 Payments.php:1064 SupplierTransInquiry.php:172
#: TaxAuthorities.php:148 TaxAuthorities.php:149
msgid "GL Account"
msgstr ""
@@ -3473,7 +3473,7 @@
#: GoodsReceived.php:270 GoodsReceived.php:752 ImportBankTransAnalysis.php:154
#: ImportBankTransAnalysis.php:185 InternalStockRequestAuthorisation.php:106
#: InternalStockRequestFulfill.php:361 InternalStockRequest.php:249
-#: MRPCalendar.php:315 Payments.php:944 PcAuthorizeExpenses.php:108
+#: MRPCalendar.php:315 Payments.php:915 PcAuthorizeExpenses.php:108
#: PcAuthorizeExpenses.php:293 PO_AuthoriseMyOrders.php:142
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:130
#: SecurityTokens.php:97 SelectCreditItems.php:957 SellThroughSupport.php:476
@@ -6031,7 +6031,7 @@
#: GLJournal.php:366 GLJournal.php:390 ImportBankTransAnalysis.php:209
#: ImportBankTransAnalysis.php:296 InternalStockRequestAuthorisation.php:58
#: InternalStockRequestFulfill.php:287 InternalStockRequest.php:242
-#: Payments.php:940 Payments.php:1094 SelectOrderItems.php:1455
+#: Payments.php:911 Payments.php:1065 SelectOrderItems.php:1455
#: SellThroughSupport.php:265 SellThroughSupport.php:453
#: SuppContractChgs.php:80 SuppContractChgs.php:168 SupplierCredit.php:421
#: SupplierCredit.php:460 SupplierInvoice.php:785 SupplierInvoice.php:829
@@ -8325,11 +8325,11 @@
msgid "A bank account must be selected for this receipt"
msgstr ""
-#: CustomerReceipt.php:66 Payments.php:741
+#: CustomerReceipt.php:66 Payments.php:712
msgid "The bank account name cannot be retrieved because"
msgstr ""
-#: CustomerReceipt.php:76 Payments.php:751
+#: CustomerReceipt.php:76 Payments.php:722
msgid "The bank account number"
msgstr ""
@@ -8351,11 +8351,11 @@
"re-done - only customers trading in the selected currency can be selected"
msgstr ""
-#: CustomerReceipt.php:177 Payments.php:692
+#: CustomerReceipt.php:177 Payments.php:663
msgid "No General Ledger code has been chosen"
msgstr ""
-#: CustomerReceipt.php:177 GLJournal.php:174 Payments.php:675 Payments.php:692
+#: CustomerReceipt.php:177 GLJournal.php:174 Payments.php:646 Payments.php:663
msgid "so this GL analysis item could not be added"
msgstr ""
@@ -8413,7 +8413,7 @@
msgid "The SQL that failed to insert the bank transaction was"
msgstr ""
-#: CustomerReceipt.php:388 Payments.php:591 Payments.php:617
+#: CustomerReceipt.php:388 Payments.php:590
msgid "Cannot insert a bank transaction using the SQL"
msgstr ""
@@ -8482,7 +8482,7 @@
msgid "The customer details could not be retrieved because"
msgstr ""
-#: CustomerReceipt.php:772 DailyBankTransactions.php:35 Payments.php:784
+#: CustomerReceipt.php:772 DailyBankTransactions.php:35 Payments.php:755
msgid "The bank accounts could not be retrieved because"
msgstr ""
@@ -8512,8 +8512,8 @@
msgid "Receipts cannot be entered until a currency is defined"
msgstr ""
-#: CustomerReceipt.php:855 CustomerReceipt.php:874 Payments.php:868
-#: Payments.php:888
+#: CustomerReceipt.php:855 CustomerReceipt.php:874 Payments.php:839
+#: Payments.php:859
msgid "Suggested rate:"
msgstr ""
@@ -8527,11 +8527,11 @@
"currency of the receipt"
msgstr ""
-#: CustomerReceipt.php:882 Payments.php:896
+#: CustomerReceipt.php:882 Payments.php:867
msgid "Functional Exchange Rate"
msgstr ""
-#: CustomerReceipt.php:884 Payments.php:897 Payments.php:898
+#: CustomerReceipt.php:884 Payments.php:868 Payments.php:869
msgid ""
"The exchange rate between the currency of the business (the functional "
"currency) and the currency of the bank account"
@@ -8541,11 +8541,11 @@
msgid "Receipt Type"
msgstr ""
-#: CustomerReceipt.php:912 Payments.php:933
+#: CustomerReceipt.php:912 Payments.php:904
msgid "Reference on Bank Transactions Inquiry"
msgstr ""
-#: CustomerReceipt.php:924 Payments.php:941
+#: CustomerReceipt.php:924 Payments.php:912
msgid "Narrative on General Ledger Account Inquiry"
msgstr ""
@@ -8557,7 +8557,7 @@
msgid "Banked into the"
msgstr ""
-#: CustomerReceipt.php:942 Payments.php:771 PO_Items.php:236
+#: CustomerReceipt.php:942 Payments.php:742 PO_Items.php:236
#: SelectSalesOrder.php:230 SelectSalesOrder.php:391 SpecialOrder.php:480
msgid "on"
msgstr ""
@@ -8573,7 +8573,7 @@
#: CustomerReceipt.php:952 GLAccountInquiry.php:179 GLAccountReport.php:347
#: GLJournalInquiry.php:86 ImportBankTransAnalysis.php:210
#: ImportBankTransAnalysis.php:301 InternalStockRequestFulfill.php:324
-#: Payments.php:1095 PcExpenses.php:193 PcExpenses.php:325
+#: Payments.php:1066 PcExpenses.php:193 PcExpenses.php:325
#: SupplierCredit.php:461 SupplierInvoice.php:830 SuppTransGLAnalysis.php:111
msgid "Tag"
msgstr ""
@@ -8590,12 +8590,12 @@
msgstr ""
#: CustomerReceipt.php:1051 GLAccountCSV.php:67 GLAccountInquiry.php:65
-#: GLAccountReport.php:269 Payments.php:957 StockAdjustments.php:485
+#: GLAccountReport.php:269 Payments.php:928 StockAdjustments.php:485
#: SuppTransGLAnalysis.php:168
msgid "Select Tag"
msgstr ""
-#: CustomerReceipt.php:1080 GLBudgets.php:52 Payments.php:1039
+#: CustomerReceipt.php:1080 GLBudgets.php:52 Payments.php:1010
msgid "No General ledger accounts have been set up yet"
msgstr ""
@@ -8605,7 +8605,7 @@
"up"
msgstr ""
-#: CustomerReceipt.php:1124 Payments.php:1144
+#: CustomerReceipt.php:1124 Payments.php:1115
msgid "Amount of Discount"
msgstr ""
@@ -9239,7 +9239,7 @@
msgid "Bank Transactions Inquiry"
msgstr ""
-#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
+#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentRun.php:332
msgid "Bank Accounts have not yet been defined. You must first"
msgstr ""
@@ -11253,7 +11253,7 @@
msgid "Depreciation"
msgstr ""
-#: FixedAssetDepreciation.php:270 GLJournal.php:119 Payments.php:623
+#: FixedAssetDepreciation.php:270 GLJournal.php:119 Payments.php:594
msgid "has been successfully entered"
msgstr ""
@@ -12842,7 +12842,7 @@
msgid "Budget updated successfully"
msgstr ""
-#: GLBudgets.php:40 GLJournal.php:296 Payments.php:1033
+#: GLBudgets.php:40 GLJournal.php:296 Payments.php:1004
msgid "Select GL Account"
msgstr ""
@@ -13007,7 +13007,7 @@
"receipt or a bank account payment"
msgstr ""
-#: GLJournal.php:174 Payments.php:675
+#: GLJournal.php:174 Payments.php:646
msgid "The manual GL code entered does not exist in the database"
msgstr ""
@@ -13050,7 +13050,7 @@
msgid "Select a general ledger account code"
msgstr ""
-#: GLJournal.php:370 Payments.php:1059 Payments.php:1064
+#: GLJournal.php:370 Payments.php:1030 Payments.php:1035
msgid "GL Narrative"
msgstr ""
@@ -16939,8 +16939,8 @@
msgid "Supplier Number"
msgstr ""
-#: PaymentAllocations.php:65 PaymentAllocations.php:66 Payments.php:623
-#: Payments.php:761 PrintCustStatements.php:403
+#: PaymentAllocations.php:65 PaymentAllocations.php:66 Payments.php:594
+#: Payments.php:732 PrintCustStatements.php:403
msgid "Payment"
msgstr ""
@@ -17107,200 +17107,199 @@
msgid "No / Cancel Payment"
msgstr ""
-#: Payments.php:360
+#: Payments.php:361
msgid "Cannot insert a GL entry for the payment using the SQL"
msgstr ""
-#: Payments.php:433
+#: Payments.php:434
msgid "Act Transfer From "
msgstr ""
-#: Payments.php:441 Payments.php:590 Payments.php:616
-#: PcAuthorizeExpenses.php:224
+#: Payments.php:442 Payments.php:589 PcAuthorizeExpenses.php:224
msgid "Cannot insert a bank transaction because"
msgstr ""
-#: Payments.php:442 PcAuthorizeExpenses.php:225
+#: Payments.php:443 PcAuthorizeExpenses.php:225
msgid "Cannot insert a bank transaction with the SQL"
msgstr ""
-#: Payments.php:475
+#: Payments.php:476
msgid "Cannot insert a payment transaction against the supplier because"
msgstr ""
-#: Payments.php:476
+#: Payments.php:477
msgid "Cannot insert a payment transaction against the supplier using the SQL"
msgstr ""
-#: Payments.php:487
+#: Payments.php:488
msgid ""
"Cannot update the supplier record for the date of the last payment made "
"because"
msgstr ""
-#: Payments.php:488
+#: Payments.php:489
msgid ""
"Cannot update the supplier record for the date of the last payment made "
"using the SQL"
msgstr ""
-#: Payments.php:510
+#: Payments.php:511
msgid "Cannot insert a GL transaction for the creditors account debit because"
msgstr ""
-#: Payments.php:511
+#: Payments.php:512
msgid ""
"Cannot insert a GL transaction for the creditors account debit using the SQL"
msgstr ""
-#: Payments.php:531
+#: Payments.php:532
msgid "Cannot insert a GL transaction for the payment discount credit because"
msgstr ""
-#: Payments.php:532
+#: Payments.php:533
msgid ""
"Cannot insert a GL transaction for the payment discount credit using the SQL"
msgstr ""
-#: Payments.php:558
+#: Payments.php:559
msgid "Cannot insert a GL transaction for the bank account credit because"
msgstr ""
-#: Payments.php:559
+#: Payments.php:560
msgid ""
"Cannot insert a GL transaction for the bank account credit using the SQL"
msgstr ""
-#: Payments.php:647
+#: Payments.php:618
msgid "Allocate this payment"
msgstr ""
-#: Payments.php:648
+#: Payments.php:619
msgid "Enter another Payment for"
msgstr ""
-#: Payments.php:650
+#: Payments.php:621
msgid "Enter another General Ledger Payment"
msgstr ""
-#: Payments.php:678
+#: Payments.php:649
msgid "The Cheque/Voucher number has already been used"
msgstr ""
-#: Payments.php:678 Payments.php:690
+#: Payments.php:649 Payments.php:661
msgid "This GL analysis item could not be added"
msgstr ""
-#: Payments.php:690
+#: Payments.php:661
msgid "The cheque number has already been used"
msgstr ""
-#: Payments.php:742
+#: Payments.php:713
msgid "SQL used to retrieve the bank account name was"
msgstr ""
-#: Payments.php:751
+#: Payments.php:722
msgid "is not set up as a bank account with a valid general ledger account"
msgstr ""
-#: Payments.php:768
+#: Payments.php:739
msgid "from the"
msgstr ""
-#: Payments.php:790
+#: Payments.php:761
msgid "Select the bank account that the payment has been made from"
msgstr ""
-#: Payments.php:815
+#: Payments.php:786
msgid "Date Paid"
msgstr ""
-#: Payments.php:822
+#: Payments.php:793
msgid "Currency of Payment"
msgstr ""
-#: Payments.php:830
+#: Payments.php:801
msgid ""
"No currencies are defined yet. Payments cannot be entered until a currency "
"is defined"
msgstr ""
-#: Payments.php:841
+#: Payments.php:812
msgid ""
"The transaction currency does not need to be the same as the bank account "
"currency"
msgstr ""
-#: Payments.php:847 Suppliers.php:808 Suppliers.php:1015
+#: Payments.php:818 Suppliers.php:808 Suppliers.php:1015
msgid "Supplier Currency"
msgstr ""
-#: Payments.php:879
+#: Payments.php:850
msgid "Payment Exchange Rate"
msgstr ""
-#: Payments.php:880 Payments.php:881
+#: Payments.php:851 Payments.php:852
msgid ""
"The exchange rate between the currency of the bank account currency and the "
"currency of the payment"
msgstr ""
-#: Payments.php:902
+#: Payments.php:873
msgid "Payment type"
msgstr ""
-#: Payments.php:924
+#: Payments.php:895
msgid "Cheque Number"
msgstr ""
-#: Payments.php:925
+#: Payments.php:896
msgid "(if using pre-printed stationery)"
msgstr ""
-#: Payments.php:954
+#: Payments.php:925
msgid "General Ledger Payment Analysis Entry"
msgstr ""
-#: Payments.php:981 Payments.php:986
+#: Payments.php:952 Payments.php:957
msgid "Enter GL Account Manually"
msgstr ""
-#: Payments.php:982 Payments.php:987
+#: Payments.php:953 Payments.php:958
#, fuzzy
msgid "The account code"
msgstr "مجموعات العضوية"
-#: Payments.php:982 Payments.php:987
+#: Payments.php:953 Payments.php:958
msgid "doesnt exist"
msgstr ""
-#: Payments.php:992
+#: Payments.php:963
msgid "Select GL Group"
msgstr ""
-#: Payments.php:1003
+#: Payments.php:974
msgid "No General ledger account groups have been set up yet"
msgstr ""
-#: Payments.php:1003 Payments.php:1039
+#: Payments.php:974 Payments.php:1010
msgid ""
"payments cannot be analysed against GL accounts until the GL accounts are "
"set up"
msgstr ""
-#: Payments.php:1053
+#: Payments.php:1024
msgid "Cheque/Voucher Number"
msgstr ""
-#: Payments.php:1115
+#: Payments.php:1086
msgid "Are you sure you wish to delete this payment analysis item?"
msgstr ""
-#: Payments.php:1128 Payments.php:1151
+#: Payments.php:1099 Payments.php:1122
msgid "Accept and Process Payment"
msgstr ""
-#: Payments.php:1137
+#: Payments.php:1108
msgid "Amount of Payment"
msgstr ""
@@ -44296,10 +44295,9 @@
msgstr ""
#: install/index.php:170
-msgid ""
-"The Company names can only contain alphanumeric characters plus -,_, & and "
-"spaces"
-msgstr ""
+#, fuzzy
+msgid "The Company names cannot contain illegal characters such as /\\?%:|<>\""
+msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
#: install/index.php:176
msgid "The Company Name name should not be empty"
@@ -44308,8 +44306,8 @@
#: install/index.php:187
#, fuzzy
msgid ""
-"The database name must be lower case and should not contains illegal "
-"characters such as \"/\\?%:|<>\" blank etc"
+"The database name should not contains illegal characters such as \"/\\?%:|<>"
+"\" etc"
msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
#: install/index.php:193 install/index.php:539
@@ -44407,7 +44405,7 @@
#, fuzzy
msgid ""
"The database name should be lower case and not contains illegal characters "
-"such as \"/\\?%:|<>\" or blank spaces"
+"such as \"/\\?%:|<>\""
msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
#: install/index.php:561
@@ -44607,8 +44605,10 @@
msgstr ""
#: install/index.php:1024
-msgid "The name of your company"
-msgstr ""
+#, fuzzy
+msgid ""
+"The name of your company should not contain characters such as |\\?%:<>\""
+msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
#: install/index.php:1027
#, fuzzy
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 2014-02-03 09:06:53 UTC (rev 6559)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2014-02-03 09:12:04 UTC (rev 6560)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 21:58+1300\n"
+"POT-Creation-Date: 2014-02-03 22:05+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"
@@ -455,7 +455,7 @@
#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1115 PaymentTerms.php:206
+#: PaymentMethods.php:209 Payments.php:1086 PaymentTerms.php:206
#: 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:772 PriceMatrix.php:174
@@ -1033,7 +1033,7 @@
#: Credit_Invoice.php:746 Credit_Invoice.php:767 CustomerReceipt.php:557
#: CustomerReceipt.php:707 CustomerReceipt.php:735 CustomerTransInquiry.php:97
#: DeliveryDetails.php:409 GLProfit_Loss.php:609 GLTagProfit_Loss.php:515
-#: Payments.php:361 PDFRemittanceAdvice.php:85 PurchData.php:114
+#: Payments.php:362 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:191 ReverseGRN.php:205 ReverseGRN.php:379
#: SelectCreditItems.php:1442 SelectSalesOrder.php:208
@@ -1709,7 +1709,7 @@
#: CustomerReceipt.php:1142 CustomerTypes.php:270 ExchangeRateTrend.php:51
#: FreightCosts.php:60 GLJournal.php:139 GLJournal.php:376
#: InternalStockCategoriesByRole.php:136 InternalStockCategoriesByRole.php:226
-#: OffersReceived.php:114 Payments.php:1083 PcAssignCashToTab.php:181
+#: OffersReceived.php:114 Payments.php:1054 PcAssignCashToTab.php:181
#: PcAssignCashToTab.php:398 PcAuthorizeExpenses.php:334
#: PcClaimExpensesFromTab.php:174 PcClaimExpensesFromTab.php:422
#: PcExpenses.php:350 PcExpensesTypeTab.php:139 PcExpensesTypeTab.php:229
@@ -1721,7 +1721,7 @@
#: BankAccountUsers.php:124 BankAccountUsers.php:223
#: CustomerAllocations.php:452 CustomerReceipt.php:1143
#: InternalStockCategoriesByRole.php:137 InternalStockCategoriesByRole.php:227
-#: Payments.php:1084 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
+#: Payments.php:1055 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
#: PcAuthorizeExpenses.php:335 PcClaimExpensesFromTab.php:175
#: PcClaimExpensesFromTab.php:423 PcExpenses.php:351 PcExpensesTypeTab.php:140
#: PcExpensesTypeTab.php:230 PcTabs.php:488 PcTypeTabs.php:254
@@ -1826,7 +1826,7 @@
#: BankMatching.php:100 BankReconciliation.php:113 CounterReturns.php:829
#: Currencies.php:219 CustomerReceipt.php:785 DailyBankTransactions.php:40
-#: Payments.php:789 PDFChequeListing.php:46 TaxAuthorities.php:151
+#: Payments.php:760 PDFChequeListing.php:46 TaxAuthorities.php:151
#: TaxAuthorities.php:318
msgid "Bank Account"
msgstr "Bankovní účet"
@@ -1846,7 +1846,7 @@
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:178 GLAccountReport.php:106
-#: Payments.php:764 PcReportTab.php:110 PDFChequeListing.php:117
+#: Payments.php:735 PcReportTab.php:110 PDFChequeListing.php:117
#: PDFChequeListing.php:127 PDFChequeListing.php:196
#: PDFDeliveryDifferences.php:194 PDFDeliveryDifferences.php:207
#: PDFDeliveryDifferences.php:306 PDFDIFOT.php:197 PDFDIFOT.php:210
@@ -1954,7 +1954,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
-#: BankMatching.php:280 Payments.php:1091
+#: BankMatching.php:280 Payments.php:1062
msgid "Cheque No"
msgstr "Šek č."
@@ -1967,8 +1967,8 @@
#: CustomerAllocations.php:381 CustomerReceipt.php:947
#: CustomerTransInquiry.php:113 CustWhereAlloc.php:115 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
-#: PaymentAllocations.php:67 Payments.php:1071 Payments.php:1076
-#: Payments.php:1092 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
+#: PaymentAllocations.php:67 Payments.php:1042 Payments.php:1047
+#: Payments.php:1063 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:236
#: PcClaimExpensesFromTab.php:396 PcReportTab.php:180 PcReportTab.php:335
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
@@ -2050,7 +2050,7 @@
msgstr "Bankovní účty se nepodařilo získat na SQL, protože"
#: BankReconciliation.php:110 CustomerReceipt.php:773
-#: DailyBankTransactions.php:36 Payments.php:785 SuppPaymentRun.php:319
+#: DailyBankTransactions.php:36 Payments.php:756 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr "SQL slouží k získání bankovní účty byly"
@@ -2063,12 +2063,12 @@
msgstr "Musíte nejprve"
#: BankReconciliation.php:120 CustomerReceipt.php:793
-#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
+#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentR...
[truncated message content] |
|
From: <dai...@us...> - 2014-02-04 06:35:58
|
Revision: 6562
http://sourceforge.net/p/web-erp/reponame/6562
Author: daintree
Date: 2014-02-04 06:35:53 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
Tim: Top Customers Inquiry script
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.11.2-4.11.3.sql
Added Paths:
-----------
trunk/SalesTopCustomersInquiry.php
Added: trunk/SalesTopCustomersInquiry.php
===================================================================
--- trunk/SalesTopCustomersInquiry.php (rev 0)
+++ trunk/SalesTopCustomersInquiry.php 2014-02-04 06:35:53 UTC (rev 6562)
@@ -0,0 +1,270 @@
+<?php
+
+/* $Id: SalesTopCustomersInquiry.php 4261 2010-12-22 15:56:50Z $*/
+
+include('includes/session.inc');
+$Title = _('Top Customer Sales Inquiry');
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Sales Inquiry') . '" alt="" />' . ' ' . _('Top Customer Sales Inquiry') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
+
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="2" class="selection">
+ <tr><td valign="top">
+ <table>
+ <tr>
+ <th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked="checked"';
+}
+echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked="checked"';
+}
+echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked="checked"';
+}
+echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked="checked"';
+}
+echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ if (!isset($_POST['FromDate'])){
+ unset($_POST['ShowSales']);
+ $_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(1,1,1,Date('m')-12,Date('d')+1,Date('Y')));
+ $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
+ }
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table></td>
+ <td valign="top">
+ <table>'; //new sub table to set parameters for order of display
+
+
+if (!isset($_POST['OrderBy'])){ //default to order by net sales
+ $_POST['OrderBy']='NetSales';
+}
+echo '<tr><th colspan="2" class="centre">' . _('Display') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Order By Net Sales') . ':</td>
+ <td><input type="radio" name="OrderBy" value="NetSales" ';
+if ($_POST['OrderBy']=='NetSales'){
+ echo 'checked="checked"';
+}
+echo ' /></td>
+ </tr>
+ <tr>
+ <td>' . _('Order By Quantity') . ':</td>
+ <td><input type="radio" name="OrderBy" value="Quantity" ';
+if ($_POST['OrderBy']=='Quantity'){
+ echo 'checked="checked"';
+}
+if (!isset($_POST['NoToDisplay'])){
+ $_POST['NoToDisplay']=20;
+}
+ echo ' /></td>
+ </tr>
+ <tr>
+ <td>' . _('Number to Display') . ':</td>
+ <td><input type="text" class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table>';
+
+
+echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />';
+echo '</div>';
+echo '<br />';
+echo '</div>
+ </form>';
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ $sql = "SELECT stockmoves.debtorno,
+ debtorsmaster.name,
+ SUM(CASE WHEN stockmoves.type=10
+ OR stockmoves.type=11 THEN
+ -qty
+ ELSE 0 END) as salesquantity,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END) as salesvalue,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as returnvalue,
+ SUM(CASE WHEN stockmoves.type=11
+ OR stockmoves.type=10 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as netsalesvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN debtorsmaster
+ ON stockmoves.debtorno=debtorsmaster.debtorno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND trandate>='" . $FromDate . "'
+ AND trandate<='" . $ToDate . "'
+ GROUP BY stockmoves.debtorno";
+
+ if ($_POST['OrderBy']=='NetSales'){
+ $sql .= " ORDER BY netsalesvalue DESC ";
+ } else {
+ $sql .= " ORDER BY salesquantity DESC ";
+ }
+ if (is_numeric($_POST['NoToDisplay'])){
+ if ($_POST['NoToDisplay'] > 0){
+ $sql .= " LIMIT " . $_POST['NoToDisplay'];
+ }
+ }
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+
+
+ echo '<table cellpadding="2" class="selection">
+ <tr>
+ <th>' . _('Rank') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Sales Value') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Sales') . '<br />' . _('Quantity') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalQuantity = 0;
+ $i=1;
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ echo '<td>' . $i . '</td>
+ <td>' . $SalesRow['debtorno'] . ' - ' . $SalesRow['name'] . '</td>
+ <td class="number">' . locale_number_format($SalesRow['salesvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($SalesRow['returnvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($SalesRow['netsalesvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($SalesRow['salesquantity'],'Variable') . '</td>
+ </tr>';
+ $i++;
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalQuantity += $SalesRow['salesquantity'];
+
+ } //loop around category sales for the period
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr /></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr /></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td class="number" colspan="2">' . _('GRAND Total') . '</td>
+ <td class="number">' . locale_number_format($CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($CumulativeTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($CumulativeTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($CumulativeTotalQuantity,'Variable') . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-03 09:21:41 UTC (rev 6561)
+++ trunk/doc/Change.log 2014-02-04 06:35:53 UTC (rev 6562)
@@ -1,7 +1,8 @@
webERP Change Log
2/2/14 Release 4.11.3
-3/2/14 Exson: Make company names alow characters other than alphanumeric in installer.
+
+4/2/14 Tim: SalesTopCustomersInquiry.php - shows top customers over specified date range showing invoices/returns and net sales
3/2/14 Exson: Fixed installer now allows characters in the database name
3/2/14 Phil: Fix bug in Payments.php that was duplicating payments for mutliple GL analysis entries. Now just a single bank trans is created for the payment which can be analysed to any number of GL accounts
31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2014-02-03 09:21:41 UTC (rev 6561)
+++ trunk/includes/MainMenuLinksArray.php 2014-02-04 06:35:53 UTC (rev 6562)
@@ -60,7 +60,8 @@
_('Order Delivery Differences Report'),
_('Delivery In Full On Time (DIFOT) Report'),
_('Sales Order Detail Or Summary Inquiries'),
- _('Top Sales Items Report'),
+ _('Top Sales Items Inquiry'),
+ _('Top Customers Inquiry'),
_('Worst Sales Items Report'),
_('Sales With Low Gross Profit Report'),
_('Sell Through Support Claims Report'));
@@ -77,6 +78,7 @@
'/PDFDIFOT.php',
'/SalesInquiry.php',
'/TopItems.php',
+ '/SalesTopCustomersInquiry.php',
'/NoSalesItems.php',
'/PDFLowGP.php',
'/PDFSellThroughSupportClaim.php');
Modified: trunk/sql/mysql/upgrade4.11.2-4.11.3.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.2-4.11.3.sql 2014-02-03 09:21:41 UTC (rev 6561)
+++ trunk/sql/mysql/upgrade4.11.2-4.11.3.sql 2014-02-04 06:35:53 UTC (rev 6562)
@@ -23,4 +23,5 @@
UPDATE holdreasons set dissallowinvoices=2 WHERE reasoncode=20;
ALTER table stockmoves CHANGE reference reference varchar(100) NOT NULL DEFAULT '';
ALTER TABLE bom ADD COLUMN sequence INT(11) NOT NULL DEFAULT 0 AFTER parent;
+INSERT INTO scripts VALUES('TopCustomers.php',1,'Shows the top customers');
UPDATE config SET confvalue='4.11.3' WHERE confname='VersionNumber';
|
|
From: <ice...@us...> - 2014-02-06 00:22:52
|
Revision: 6563
http://sourceforge.net/p/web-erp/reponame/6563
Author: icedlava
Date: 2014-02-06 00:22:48 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
BankMatching.php - correct column heading order
Modified Paths:
--------------
trunk/BankMatching.php
trunk/doc/Change.log
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2014-02-04 06:35:53 UTC (rev 6562)
+++ trunk/BankMatching.php 2014-02-06 00:22:48 UTC (rev 6563)
@@ -100,8 +100,8 @@
<td align="left">' . _('Bank Account') . ':</td>
<td colspan="3"><select tabindex="1" autofocus="autofocus" name="BankAccount">';
-$sql = "SELECT bankaccounts.accountcode,
- bankaccounts.bankaccountname
+$sql = "SELECT bankaccounts.accountcode,
+ bankaccounts.bankaccountname
FROM bankaccounts, bankaccountusers
WHERE bankaccounts.accountcode=bankaccountusers.accountcode
AND bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
@@ -279,8 +279,8 @@
<tr>
<th class="ascending">' . _('Cheque No') . '</th>
<th class="ascending">' . _('Ref') . '</th>
+ <th class="ascending">' . _('Date') . '</th>
<th class="ascending">' . $TypeName . '</th>
- <th class="ascending">' . _('Date') . '</th>
<th class="ascending">' . _('Amount') . '</th>
<th class="ascending">' . _('Outstanding') . '</th>
<th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-04 06:35:53 UTC (rev 6562)
+++ trunk/doc/Change.log 2014-02-06 00:22:48 UTC (rev 6563)
@@ -1,5 +1,7 @@
webERP Change Log
+6/2/14 icedlava: BankMatching.php - correct column heading order.
+
2/2/14 Release 4.11.3
4/2/14 Tim: SalesTopCustomersInquiry.php - shows top customers over specified date range showing invoices/returns and net sales
@@ -8,36 +10,36 @@
31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
31/1/14 Muthu: Added sequence field to BOMs.php
30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
-28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.
+28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.
24/1/14 Andrew Galuski: Display serial items on GRN printouts
23/1/14 Phil: Fixed incompatible error traps on hyphens between new customers and new branches. Now both allow hyphens. Also prevented deletion of the last customer branch. Customer branches are now deleted when a customer is attempted to be deleted provided there are no dependent records.
19/01/14 Exson: Add sales man login control and modify the PDF to download to harmony with other files and solve backward failure problem in PrintCustStatements.php.
18/01/14 Paul T: Change property name value to uppercase to match use in the script. [causing input loss]
16/01/14 Exson: Fixed sql strict mode failure problem in StockTransfers.php by adding a '' to qualitytext fields.
-23/1/14 Tim: PO_SelectOSPurchOrder.php now allows selection of purchase orders based on order dates
+23/1/14 Tim: PO_SelectOSPurchOrder.php now allows selection of purchase orders based on order dates
14/1/14 Tim: system would go to get currency rates even though they were set to manual - bug fixed.
14/1/14 Phil: Fixed bug that was not recording the standard cost against goods received - this would put all accounting out for both standard and weighted average journals.
13/1/14 Phil: Fixed SuppInvGRNs.php price variance was not calculated correctly because cost not brought accross correctly as reported by Don Grimes
11/1/14 CQZ: Fixed that no bank accounts recorded in gl in CounterReturns.php
6/1/14 Phil: Apply Tim's bug report regarding conversion of database name to lower case in ConnectDB.inc Although uppercase characters should not be included in database names, removing this trap allows backward compatibility with users who did install with upper case database name
4/1/14 Phil: Add option to create CSV from inventory valuation rather than create PDF
-2/1/14 Exson: Fixed php-mbstring extension detection failure in install/index.php during installation.
+2/1/14 Exson: Fixed php-mbstring extension detection failure in install/index.php during installation.
27/12/13 Thumb: Fixed the stock location will loss problem when move to StockAdjustmentsControlled.php interface in StockAdjustments.php.
-23/12/13 Exson: Fixed the controlled items cannot be removed due to the negative operator is modified and balance of a serial no is wrong due negative operator is missing during credit controlled items by KEYED method. Other input method has not be inspected.
-22/12/13 Exson: Add a fool-proof to Credit_Invoice.php to prevent an invoice was credit again and again.
+23/12/13 Exson: Fixed the controlled items cannot be removed due to the negative operator is modified and balance of a serial no is wrong due negative operator is missing during credit controlled items by KEYED method. Other input method has not be inspected.
+22/12/13 Exson: Add a fool-proof to Credit_Invoice.php to prevent an invoice was credit again and again.
22/12/13 Exson: Modify the stock select element to a combox box which autocomplete the limited stock ID options to 300 in PriceMatrix.php. Otherwise, users have to input an stock ID themselves. To avoid a too long stock list as pointed by Tim.
21/12/13 Exson: Add price matrix features. Modified MainMenuLinksArray.php, GetPrice.inc and add pricematrix table and PriceMatrix.php
-20/12/13 Thumb: Salesman can only review his own customer's data
+20/12/13 Thumb: Salesman can only review his own customer's data
14/12/12: Phil: As per Gilberto dos santos alves - Extended smtp user name to varchar(50) as sometimes a full email address is required - tidied the script a bit too.
11/12/13: Thumb: fixed bug that calculated the wrong StandardCost of assembly parts in Credit_Invoice.php and SelectCreditItems.php. Bug confirmed by Phil.
11/12/13 Thumb: fixed bug that using limit without offsetting in PO_Items.php,WorkOrderEntry.php and make users' DisplayRecordsMax effective in SelectOrderItems.php.And fixed typo in SelectCreditItems.php.
9/12/13 Exson Fixed the typo of sql in DiscountCategories.php. Report by tangjun
7/12/13 Phil: Allow entry of stock counts by stock category
-7/12/13 Phil: Fixed htmlMimeEmail.inc following Tim's submission - removed & value by reference errors
-4/12/13 Exson: Alter table stockmoves reference to varchar(100) to make it can meet mysql strict mode requirements when data is more than original 40.
+7/12/13 Phil: Fixed htmlMimeEmail.inc following Tim's submission - removed & value by reference errors
+4/12/13 Exson: Alter table stockmoves reference to varchar(100) to make it can meet mysql strict mode requirements when data is more than original 40.
2/12/13 Exson: Fixed the typo in WWW_Users.php. Reported by Thumb.
-1/12/13 Exson: Fixed country Chinese sql for installation failure.
-1/12/13 CQZ: Correct Chinese translation error dispatch cut_off time.
+1/12/13 Exson: Fixed country Chinese sql for installation failure.
+1/12/13 CQZ: Correct Chinese translation error dispatch cut_off time.
1/12/13 Release 4.11.2
@@ -45,15 +47,15 @@
30/11/13 rchacon: Includes supplier-code, currency-code, and currency-name-from-CurrenciesArray.php in SelectSupplier.php.
2013/11/30 Thumb: Add salesman constraint to show salesperson's own sales orders invoice, customer etc in DailySalesInquiry.php,PDFDeliveryDifferences.php,PDFOrdersInvoiced.php,PDFOrderStatus.php,PDFPickingList.php,SalesByTypePeriodInquiry.php,SalesInquiry.php,SelectCompletedOrder.php.
28/11/13 Phil: Apply Tim's idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
-28/11/13 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice.
+28/11/13 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice.
28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder_generic.php
28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder.php
-28/11/13 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login.
-27/11/13 Thumb: Add create new scripts to import Customers and Debtors.
+28/11/13 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login.
+27/11/13 Thumb: Add create new scripts to import Customers and Debtors.
26/11/13 Phil: Supplier invoice entry now allows modification of invoice quantities and prices for multiple goods received lines in line rather than having to go into each line to modify individually.
20/11/13 rchacon: Translate the name of each language to the name in their respective language.
20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
-19/11/13 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
+19/11/13 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
19/11/13 Thumb: Add '-' to telephone no pattern in CustomerBranches.php and WWW_Users.php.
19/11/13 Thumb: Correct translation of customer text and customer code in CustomerReceipt.php of locale file.
19/11/13 Thumb: Text 'settled transaction' position adjusted to proper position in PrintCustStatements.php.
|
|
From: <ice...@us...> - 2014-02-06 01:19:27
|
Revision: 6564
http://sourceforge.net/p/web-erp/reponame/6564
Author: icedlava
Date: 2014-02-06 01:19:21 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2014-02-06 00:22:48 UTC (rev 6563)
+++ trunk/Payments.php 2014-02-06 01:19:21 UTC (rev 6564)
@@ -151,7 +151,7 @@
$DefaultFunctionalRate = false;
}
} else {
-
+
$_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
$_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
@@ -744,7 +744,7 @@
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
bankaccounts.currcode
- FROM bankaccounts
+ FROM bankaccounts
INNER JOIN chartmaster
ON bankaccounts.accountcode=chartmaster.accountcode
INNER JOIN bankaccountusers
@@ -950,12 +950,12 @@
if (isset($_POST['GLManualCode'])) {
echo '<tr>
<td>' . _('Enter GL Account Manually') . ':</td>
- <td><input type="text" name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this, GLCode.options,\'' . _('The account code') . ' \' + this.value + \'' . _('doesnt exist') . '\')" value="'. $_POST['GLManualCode'] .'" /></td>
+ <td><input type="text" name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this.value, GLCode.options,\'' . _('The account code') . ' \' + this.value + \' ' . _('doesnt exist') . '\')" value="'. $_POST['GLManualCode'] .'" /></td>
</tr>';
} else {
echo '<tr>
<td>' . _('Enter GL Account Manually') . ':</td>
- <td><input type="text" name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this, GLCode.options,\'' . _('The account code') . ' \' + this.value + \'' . _('doesnt exist') . '\')" /></td>
+ <td><input type="text" name="GLManualCode" maxlength="12" size="12" onchange="return inArray(this.value, GLCode.options,\'' . _('The account code') . ' \' + this.value + \' ' . _('doesnt exist') . '\')" /></td>
</tr>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-06 00:22:48 UTC (rev 6563)
+++ trunk/doc/Change.log 2014-02-06 01:19:21 UTC (rev 6564)
@@ -1,5 +1,6 @@
webERP Change Log
+6/2/14 icedlava: Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
6/2/14 icedlava: BankMatching.php - correct column heading order.
2/2/14 Release 4.11.3
|
|
From: <dai...@us...> - 2014-02-06 08:43:02
|
Revision: 6565
http://sourceforge.net/p/web-erp/reponame/6565
Author: daintree
Date: 2014-02-06 08:42:57 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
6/2/14 Eduardo Marzolla: geocode integration
Modified Paths:
--------------
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/geocode_genxml_suppliers.php
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/build/make_release.sh 2014-02-06 08:42:57 UTC (rev 6565)
@@ -9,37 +9,37 @@
xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php install/*.php ../webSHOP/*.php ../webSHOP/includes/*.php
-msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/de_DE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/en_US.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/el_GR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/es_ES.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/et_EE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/fa_IR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/fr_CA.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/fr_FR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/hi_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/hr_HR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/hu_HU.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/id_ID.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/it_IT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/ja_JP.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/lv_LV.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/nl_NL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/pl_PL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/pt_BR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/pt_PT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/ru_RU.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/ro_RO.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/sq_AL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/sv_SE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/sw_KE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/tr_TR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/zh_CN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/zh_HK.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/zh_TW.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
-msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/de_DE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/en_US.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/el_GR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/es_ES.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/et_EE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/fa_IR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/fr_CA.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/fr_FR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/hi_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/hr_HR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/hu_HU.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/id_ID.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/it_IT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/ja_JP.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/lv_LV.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/nl_NL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/pl_PL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/pt_BR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/pt_PT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/ru_RU.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/ro_RO.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/sq_AL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/sv_SE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/sw_KE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/tr_TR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/zh_CN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/zh_HK.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/zh_TW.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/doc/Change.log 2014-02-06 08:42:57 UTC (rev 6565)
@@ -1,10 +1,12 @@
webERP Change Log
-6/2/14 icedlava: Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
-6/2/14 icedlava: BankMatching.php - correct column heading order.
+
2/2/14 Release 4.11.3
+6/2/14 Eduardo Marzolla: geocode integration geocode with google API v3. You need to get a API Key from google. The parameters to geocode must be: geocode key: your API key geocode lat: your lat geocode long: your long geocode height: 100 geocode width: 100 host geocode: maps.googleapis.com
+6/2/14 icedlava: Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
+6/2/14 icedlava: BankMatching.php - correct column heading order.
4/2/14 Tim: SalesTopCustomersInquiry.php - shows top customers over specified date range showing invoices/returns and net sales
3/2/14 Exson: Fixed installer now allows characters in the database name
3/2/14 Phil: Fix bug in Payments.php that was duplicating payments for mutliple GL analysis entries. Now just a single bank trans is created for the payment which can be analysed to any number of GL accounts
Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/geo_displaymap_customers.php 2014-02-06 08:42:57 UTC (rev 6565)
@@ -2,14 +2,14 @@
/* $Id$*/
-$Title = _('Geocoded Customer Branches Report');
+$Title = _('Geocoded Customers Report');
include ('includes/session.inc');
include ('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
$sql="SELECT * FROM geocode_param WHERE 1";
-$ErrMsg = _('An error occurred in retrieving the currency information');;
+$ErrMsg = _('An error occurred in retrieving the currency information');
$result = DB_query($sql, $db, $ErrMsg);
$myrow = DB_fetch_array($result);
@@ -20,72 +20,100 @@
$Map_Width = $myrow['map_width'];
$Map_Host = $myrow['map_host'];
-echo '<script src="http://' . $Map_Host . '/maps?file=api&v=2&key=' . $Api_Key . '"';
+?>
+
+<style>
+ html, body, #map-canvas {
+ height: 100%;
+ width: 100%;
+ margin: 0px;
+ padding: 0px
+ }
+</style>
+
+<?
+echo '<script src="http://' . $Map_Host . '/maps/api/js?key=' . $Api_Key . '&sensor=false"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo " //<![CDATA[ "; ?>
+?>
- var iconBlue = new GIcon();
- iconBlue.image = 'http://labs.google.com/ridefinder/images/mm_20_blue.png';
- iconBlue.shadow = 'http://labs.google.com/ridefinder/images/mm_20_shadow.png';
- iconBlue.iconSize = new GSize(12, 20);
- iconBlue.shadowSize = new GSize(22, 20);
- iconBlue.iconAnchor = new GPoint(6, 20);
- iconBlue.infoWindowAnchor = new GPoint(5, 1);
+var customIcons = {
+4: {
+icon: 'http://labs.google.com/ridefinder/images/mm_20_blue.png'
+},
+5: {
+icon: 'http://labs.google.com/ridefinder/images/mm_20_red.png'
+}
+};
-var iconRed = new GIcon();
- iconRed.image = 'http://labs.google.com/ridefinder/images/mm_20_red.png';
- iconRed.shadow = 'http://labs.google.com/ridefinder/images/mm_20_shadow.png';
- iconRed.iconSize = new GSize(12, 20);
- iconRed.shadowSize = new GSize(22, 20);
- iconRed.iconAnchor = new GPoint(6, 20);
- iconRed.infoWindowAnchor = new GPoint(5, 1);
+function load() {
+var map = new google.maps.Map(document.getElementById("map"), {
+<? echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
+zoom: 4,
+mapTypeId: 'roadmap'
+});
+var infoWindow = new google.maps.InfoWindow;
- var customIcons = [];
- customIcons["commercial"] = iconBlue;
- customIcons["domestic"] = iconRed;
+// Change this depending on the name of your PHP file
+downloadUrl("geocode_genxml_customers.php", function(data) {
+var xml = data.responseXML;
+var markers = xml.documentElement.getElementsByTagName("marker");
+for (var i = 0; i < markers.length; i++) {
+var name = markers[i].getAttribute("name");
+var address = markers[i].getAttribute("address");
+var type = markers[i].getAttribute("type");
+var point = new google.maps.LatLng(
+parseFloat(markers[i].getAttribute("lat")),
+parseFloat(markers[i].getAttribute("lng")));
+var html = "<b>" + name + "</b> <br/>" + address;
+var icon = 'http://labs.google.com/ridefinder/images/mm_20_blue.png' || {};
+var marker = new google.maps.Marker({
+map: map,
+position: point,
+icon: icon.icon
+});
+bindInfoWindow(marker, map, infoWindow, html);
+}
+});
+}
- function load() {
- if (GBrowserIsCompatible()) {
- var map = new GMap2(document.getElementById("map"));
- map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());
-<? echo 'map.setCenter(new GLatLng(' . $Center_Lat . ', ' . $Center_Long . '), 10);'; ?>
+function bindInfoWindow(marker, map, infoWindow, html) {
+google.maps.event.addListener(marker, 'click', function() {
+infoWindow.setContent(html);
+infoWindow.open(map, marker);
+});
+}
- GDownloadUrl("geocode_genxml_customers.php", function(data) {
- var xml = GXml.parse(data);
- var markers = xml.documentElement.getElementsByTagName("marker");
- for (var i = 0; i < markers.length; i++) {
- var name = markers[i].getAttribute("name");
- var address = markers[i].getAttribute("address");
- var type = markers[i].getAttribute("type");
- var point = new GLatLng(parseFloat(markers[i].getAttribute("lat")),
- parseFloat(markers[i].getAttribute("lng")));
- var marker = createMarker(point, name, address, type);
- map.addOverlay(marker);
- }
- });
- }
- }
- function createMarker(point, name, address, type) {
- var marker = new GMarker(point, customIcons[type]);
- var html = "<b>" + name + "</b> <br/>" + address;
- GEvent.addListener(marker, 'click', function() {
- marker.openInfoWindowHtml(html);
- });
- return marker;
+function downloadUrl(url, callback) {
+var request = window.ActiveXObject ?
+new ActiveXObject('Microsoft.XMLHTTP') :
+new XMLHttpRequest;
+
+request.onreadystatechange = function() {
+if (request.readyState == 4) {
+request.onreadystatechange = doNothing;
+callback(request, request.status);
}
+};
- //]]>
- </script>
- </head>
+request.open('GET', url, true);
+request.send(null);
+}
- <body onload="load()" onunload="GUnload()">
-<p>
-<? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
-</p>
- </body>
+function doNothing() {}
+
+//]]>
+
+</script>
+</head>
+
+<body onload="load()" onunload="GUnload()">
+ <p>
+ <? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
+ </p>
+</body>
<?
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.inc');
Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/geo_displaymap_suppliers.php 2014-02-06 08:42:57 UTC (rev 6565)
@@ -9,7 +9,7 @@
include('includes/SQL_CommonFunctions.inc');
$sql="SELECT * FROM geocode_param WHERE 1";
-$ErrMsg = _('An error occurred in retrieving the currency information');;
+$ErrMsg = _('An error occurred in retrieving the currency information');
$result = DB_query($sql, $db, $ErrMsg);
$myrow = DB_fetch_array($result);
@@ -20,72 +20,100 @@
$Map_Width = $myrow['map_width'];
$Map_Host = $myrow['map_host'];
-echo '<script src="http://' . $Map_Host . '/maps?file=api&v=2&key=' . $Api_Key . '"';
+?>
+
+<style>
+ html, body, #map-canvas {
+ height: 100%;
+ width: 100%;
+ margin: 0px;
+ padding: 0px
+ }
+</style>
+
+<?
+echo '<script src="http://' . $Map_Host . '/maps/api/js?key=' . $Api_Key . '&sensor=false"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo " //<![CDATA[ "; ?>
+?>
- var iconBlue = new GIcon();
- iconBlue.image = 'http://labs.google.com/ridefinder/images/mm_20_blue.png';
- iconBlue.shadow = 'http://labs.google.com/ridefinder/images/mm_20_shadow.png';
- iconBlue.iconSize = new GSize(12, 20);
- iconBlue.shadowSize = new GSize(22, 20);
- iconBlue.iconAnchor = new GPoint(6, 20);
- iconBlue.infoWindowAnchor = new GPoint(5, 1);
+var customIcons = {
+ 4: {
+ icon: 'http://labs.google.com/ridefinder/images/mm_20_blue.png'
+ },
+ 5: {
+ icon: 'http://labs.google.com/ridefinder/images/mm_20_red.png'
+ }
+};
-var iconRed = new GIcon();
- iconRed.image = 'http://labs.google.com/ridefinder/images/mm_20_red.png';
- iconRed.shadow = 'http://labs.google.com/ridefinder/images/mm_20_shadow.png';
- iconRed.iconSize = new GSize(12, 20);
- iconRed.shadowSize = new GSize(22, 20);
- iconRed.iconAnchor = new GPoint(6, 20);
- iconRed.infoWindowAnchor = new GPoint(5, 1);
+function load() {
+ var map = new google.maps.Map(document.getElementById("map"), {
+ <? echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
+ zoom: 4,
+ mapTypeId: 'roadmap'
+ });
+ var infoWindow = new google.maps.InfoWindow;
- var customIcons = [];
- customIcons["commercial"] = iconBlue;
- customIcons["domestic"] = iconRed;
+ // Change this depending on the name of your PHP file
+ downloadUrl("geocode_genxml_suppliers.php", function(data) {
+ var xml = data.responseXML;
+ var markers = xml.documentElement.getElementsByTagName("marker");
+ for (var i = 0; i < markers.length; i++) {
+ var name = markers[i].getAttribute("name");
+ var address = markers[i].getAttribute("address");
+ var type = markers[i].getAttribute("type");
+ var point = new google.maps.LatLng(
+ parseFloat(markers[i].getAttribute("lat")),
+ parseFloat(markers[i].getAttribute("lng")));
+ var html = "<b>" + name + "</b> <br/>" + address;
+ var icon = 'http://labs.google.com/ridefinder/images/mm_20_blue.png' || {};
+ var marker = new google.maps.Marker({
+ map: map,
+ position: point,
+ icon: icon.icon
+ });
+ bindInfoWindow(marker, map, infoWindow, html);
+ }
+ });
+}
- function load() {
- if (GBrowserIsCompatible()) {
- var map = new GMap2(document.getElementById("map"));
- map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());
-<? echo 'map.setCenter(new GLatLng(' . $Center_Lat . ', ' . $Center_Long . '), 10);'; ?>
+function bindInfoWindow(marker, map, infoWindow, html) {
+google.maps.event.addListener(marker, 'click', function() {
+infoWindow.setContent(html);
+infoWindow.open(map, marker);
+});
+}
- GDownloadUrl("geocode_genxml_suppliers.php", function(data) {
- var xml = GXml.parse(data);
- var markers = xml.documentElement.getElementsByTagName("marker");
- for (var i = 0; i < markers.length; i++) {
- var name = markers[i].getAttribute("name");
- var address = markers[i].getAttribute("address");
- var type = markers[i].getAttribute("type");
- var point = new GLatLng(parseFloat(markers[i].getAttribute("lat")),
- parseFloat(markers[i].getAttribute("lng")));
- var marker = createMarker(point, name, address, type);
- map.addOverlay(marker);
- }
- });
- }
- }
- function createMarker(point, name, address, type) {
- var marker = new GMarker(point, customIcons[type]);
- var html = "<b>" + name + "</b> <br/>" + address;
- GEvent.addListener(marker, 'click', function() {
- marker.openInfoWindowHtml(html);
- });
- return marker;
+function downloadUrl(url, callback) {
+var request = window.ActiveXObject ?
+new ActiveXObject('Microsoft.XMLHTTP') :
+new XMLHttpRequest;
+
+request.onreadystatechange = function() {
+if (request.readyState == 4) {
+request.onreadystatechange = doNothing;
+callback(request, request.status);
}
+};
- //]]>
- </script>
- </head>
+request.open('GET', url, true);
+request.send(null);
+}
- <body onload="load()" onunload="GUnload()">
-<p>
-<? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
-</p>
- </body>
+function doNothing() {}
+
+//]]>
+
+</script>
+</head>
+
+<body onload="load()" onunload="GUnload()">
+ <p>
+ <? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
+ </p>
+</body>
<?
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.inc');
Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/geocode.php 2014-02-06 08:42:57 UTC (rev 6565)
@@ -6,7 +6,7 @@
include ('includes/session.inc');
include ('includes/header.inc');
-include('includes/SQL_CommonFunctions.inc');
+//include ('includes/SQL_CommonFunctions.inc');
$sql = "SELECT * FROM geocode_param WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');
@@ -29,58 +29,64 @@
$sql = "SELECT * FROM custbranch WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');
$result = DB_query($sql, $db, $ErrMsg);
-$row = DB_fetch_array($result);
+
// select all the suppliers
$sql = "SELECT * FROM suppliers WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');
$result2 = DB_query($sql, $db, $ErrMsg);
-$row2 = DB_fetch_array($result2);
// Initialize delay in geocode speed
$delay = 0;
-$base_url = "http://" . MAPS_HOST . "/maps/geo?output=xml" . "&key=" . KEY;
+$base_url = "http://" . MAPS_HOST . "/maps/api/geocode/xml?address=";
// Iterate through the customer branch rows, geocoding each address
-while ($row = @mysql_fetch_assoc($result)) {
+
+
+while ($row = DB_fetch_array($result)) {
$geocode_pending = true;
while ($geocode_pending) {
- $address = $row["braddress1"] . ", " . $row["braddress2"] . ", " . $row["braddress3"] . ", " . $row["braddress4"];
+ $address = urlencode($row["braddress1"] . "," . $row["braddress2"] . "," . $row["braddress3"] . "," . $row["braddress4"]);
$id = $row["branchcode"];
$debtorno =$row["debtorno"];
- $request_url = $base_url . "&q=" . urlencode($address);
+ $request_url = $base_url . $address . ',&sensor=true';
+
+ echo '<br \>' . _('Customer Code: ') . $id;
+
+
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->Response->Status->code;
- if (strcmp($status, "200") == 0) {
+ $status = $xml->status;
+
+ if (strcmp($status, "OK") == 0) {
// Successful geocode
$geocode_pending = false;
- $coordinates = $xml->Response->Placemark->Point->coordinates;
+ $coordinates = $xml->GeocodeResponse->result->geometry->location;
$coordinatesSplit = explode(",", $coordinates);
// Format: Longitude, Latitude, Altitude
- $lat = $coordinatesSplit[1];
- $lng = $coordinatesSplit[0];
+ $lat = $xml->result->geometry->location->lat;
+ $lng = $xml->result->geometry->location->lng;
$query = sprintf("UPDATE custbranch " .
" SET lat = '%s', lng = '%s' " .
" WHERE branchcode = '%s' " .
" AND debtorno = '%s' LIMIT 1;",
- mysql_real_escape_string($lat),
- mysql_real_escape_string($lng),
- mysql_real_escape_string($id),
- mysql_real_escape_string($debtorno));
- $update_result = mysql_query($query);
- if (!$update_result) {
- die("Invalid query: " . mysql_error());
- }
- } else if (strcmp($status, "620") == 0) {
- // sent geocodes too fast
- $delay += 100000;
+ ($lat),
+ ($lng),
+ ($id),
+ ($debtorno));
+
+ $update_result = DB_query($query,$db);
+
+ if ($update_result==1) {
+ echo '<br />'. 'Address: ' . $address . ' updated to geocode.';
+ echo '<br />'. 'Received status ' . $status . '<br />';
+ }
} else {
// failure to geocode
$geocode_pending = false;
- echo '<p>' . _('Customer Branch Code:') . $id . ', Address: ' . $address . _('failed to geocode.');
+ echo '<br />' . 'Address: ' . $address . _('failed to geocode.');
echo 'Received status ' . $status . '<br />';
}
usleep($delay);
@@ -88,50 +94,54 @@
}
// Iterate through the Supplier rows, geocoding each address
-while ($row2 = @mysql_fetch_assoc($result2)) {
+while ($row2 = DB_fetch_array($result2)) {
$geocode_pending = true;
while ($geocode_pending) {
- $address = $row2["address1"] . ", " . $row2["address2"] . ", " . $row2["address3"] . ", " . $row2["address4"];
+ $address = $row2["address1"] . ",+" . $row2["address2"] . ",+" . $row2["address3"] . ",+" . $row2["address4"];
+ $address = urlencode($row2["address1"] . "," . $row2["address2"] . "," . $row2["address3"] . "," . $row2["address4"]);
$id = $row2["supplierid"];
- $request_url = $base_url . "&q=" . urlencode($address);
+ $request_url = $base_url . $address . ',&sensor=true';
+
+ echo '<p>' . _('Supplier Code: ') . $id;
+
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->Response->Status->code;
- if (strcmp($status, "200") == 0) {
+ $status = $xml->status;
+
+ if (strcmp($status, "OK") == 0) {
// Successful geocode
$geocode_pending = false;
- $coordinates = $xml->Response->Placemark->Point->coordinates;
+ $coordinates = $xml->GeocodeResponse->result->geometry->location;
$coordinatesSplit = explode(",", $coordinates);
// Format: Longitude, Latitude, Altitude
- $lat = $coordinatesSplit[1];
- $lng = $coordinatesSplit[0];
+ $lat = $xml->result->geometry->location->lat;
+ $lng = $xml->result->geometry->location->lng;
+
$query = sprintf("UPDATE suppliers " .
" SET lat = '%s', lng = '%s' " .
" WHERE supplierid = '%s' LIMIT 1;",
- mysql_real_escape_string($lat),
- mysql_real_escape_string($lng),
- mysql_real_escape_string($id));
- $update_result = mysql_query($query);
- if (!$update_result) {
- die("Invalid query: " . mysql_error());
+ ($lat),
+ ($lng),
+ ($id));
+
+ $update_result = DB_query($query,$db);
+
+ if ($update_result==1) {
+ echo '<br />' . 'Address: ' . $address . ' updated to geocode.';
+ echo '<br />' . 'Received status ' . $status . '<br />';
}
- } else if (strcmp($status, "620") == 0) {
- // sent geocodes too fast
- $delay += 100000;
} else {
// failure to geocode
$geocode_pending = false;
- echo '<p>' . _('Supplier Code: ') . $id . ', Address: ' . $address . ' failed to geocode.';
- echo 'Received status ' . $status . '<br />';
+ echo '<br />' . 'Address: ' . $address . ' failed to geocode.';
+ echo '<br />' . 'Received status ' . $status . '<br />';
}
usleep($delay);
}
}
-echo '</p>';
-
echo '<br /><div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go back to Geocode Setup') . '</a></div>';
include ('includes/footer.inc');
?>
Modified: trunk/geocode_genxml_customers.php
===================================================================
--- trunk/geocode_genxml_customers.php 2014-02-06 01:19:21 UTC (rev 6564)
+++ trunk/geocode_genxml_customers.php 2014-02-06 08:42:57 UTC (rev 6565)
@@ -9,34 +9,32 @@
function parseToXML($htmlStr)
{
-$xmlStr=str_replace('<','<',$htmlStr);
-$xmlStr=str_replace('>','>',$xmlStr);
-$xmlStr=str_replace('"','"',$xmlStr);
-$xmlStr=str_replace("'",''',$xmlStr);
-$xmlStr=str_replace("&",'&',$xmlStr);
-return $xmlStr;
+ $xmlStr=str_replace('<','<',$htmlStr);
+ $xmlStr=str_replace('>','>',$xmlStr);
+ $xmlStr=str_replace('"','"',$xmlStr);
+ $xmlStr=str_replace("'",''',$xmlStr);
+ $xmlStr=str_replace("&",'&',$xmlStr);
+ return $xmlStr;
}
$sql = "SELECT * FROM custbranch WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');;
$result = DB_query($sql, $db, $ErrMsg);
-$myrow = DB_fetch_array($result);
header("Content-type: text/xml");
-// Start XML file, echo parent node
+// Iterate through the rows, printing XML nodes for each
echo '<markers>';
-// Iterate through the rows, printing XML nodes for each
-while ($myrow = @mysql_fetch_assoc($result)){
- // ADD TO XML DOCUMENT NODE
- echo '<marker ';
- echo 'name="' . parseToXML($myrow['brname']) . '" ';
- echo 'address="' . parseToXML($myrow["braddress1"] . ", " . $myrow["braddress2"] . ", " . $myrow["braddress3"] . ", " . $myrow["braddress4"]) . '" ';
- echo 'lat="' . $myrow['lat'] . '" ';
- echo 'lng="' . $myrow['lng'] . '" ';
- echo 'type="' . $myrow['type'] . '" ';
- echo '/>';
+while ($myrow = DB_fetch_array($result)){
+ // ADD TO XML DOCUMENT NODE
+ echo '<marker ';
+ echo 'name="' . parseToXML($myrow['br...
[truncated message content] |
|
From: <dai...@us...> - 2014-02-08 04:12:11
|
Revision: 6566
http://sourceforge.net/p/web-erp/reponame/6566
Author: daintree
Date: 2014-02-08 04:12:08 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Deletion of internal requests
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/InternalStockRequestAuthorisation.php
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2014-02-06 08:42:57 UTC (rev 6565)
+++ trunk/CustomerReceipt.php 2014-02-08 04:12:08 UTC (rev 6566)
@@ -175,18 +175,36 @@
if ($_POST['GLCode'] == '' AND $_GET['Type']=='GL') {
prnMsg( _('No General Ledger code has been chosen') . ' - ' . _('so this GL analysis item could not be added'),'warn');
+
} else {
- $_SESSION['ReceiptBatch']->add_to_batch(filter_number_format($_POST['Amount']),
- $_POST['CustomerID'],
- filter_number_format($_POST['Discount']),
- $_POST['Narrative'],
- $_POST['GLCode'],
- $_POST['PayeeBankDetail'],
- $_POST['CustomerName'],
- $_POST['tag']);
-
- /*Make sure the same receipt is not double processed by a page refresh */
- $Cancel = 1;
+ $AllowThisPosting = true;
+ if ($_SESSION['ProhibitJournalsToControlAccounts'] == 1) {
+ if ($_SESSION['CompanyRecord']['gllink_debtors'] == '1' AND $_POST['GLCode'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ prnMsg(_('Payments involving the debtors control account cannot be entered. The general ledger debtors ledger (AR) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
+ $AllowThisPosting = false;
+ }
+ if ($_SESSION['CompanyRecord']['gllink_creditors'] == '1' AND
+ ($_POST['GLCode'] == $_SESSION['CompanyRecord']['creditorsact'] OR $_POST['GLCode'] == $_SESSION['CompanyRecord']['grnact'])) {
+ prnMsg(_('Payments involving the creditors control account or the GRN suspense account cannot be entered. The general ledger creditors ledger (AP) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
+ $AllowThisPosting = false;
+ }
+ if ($_POST['GLCode'] == $_SESSION['CompanyRecord']['retainedearnings']) {
+ prnMsg(_('Payments involving the retained earnings control account cannot be entered. This account is automtically maintained.'), 'warn');
+ $AllowThisPosting = false;
+ }
+ }
+ if ($AllowThisPosting) {
+ $_SESSION['ReceiptBatch']->add_to_batch(filter_number_format($_POST['Amount']),
+ $_POST['CustomerID'],
+ filter_number_format($_POST['Discount']),
+ $_POST['Narrative'],
+ $_POST['GLCode'],
+ $_POST['PayeeBankDetail'],
+ $_POST['CustomerName'],
+ $_POST['tag']);
+ /*Make sure the same receipt is not double processed by a page refresh */
+ $Cancel = 1;
+ }
}
}
Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php 2014-02-06 08:42:57 UTC (rev 6565)
+++ trunk/InternalStockRequestAuthorisation.php 2014-02-08 04:12:08 UTC (rev 6566)
@@ -13,14 +13,29 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . $Title . '" alt="" />' . ' ' . $Title . '</p>';
if (isset($_POST['UpdateAll'])) {
- foreach ($_POST as $key => $value) {
- if (mb_substr($key,0,6)=='status') {
- $RequestNo=mb_substr($key,6);
+ foreach ($_POST as $POSTVariableName => $POSTValue) {
+ if (mb_substr($POSTVariableName,0,6)=='status') {
+ $RequestNo=mb_substr($POSTVariableName,6);
$sql="UPDATE stockrequest
SET authorised='1'
- WHERE dispatchid='".$RequestNo."'";
+ WHERE dispatchid='" . $RequestNo . "'";
$result=DB_query($sql, $db);
}
+ if (strpos($POSTVariableName, 'cancel')) {
+ $CancelItems = explode('cancel', $POSTVariableName);
+ $sql = "UPDATE stockrequestitems
+ SET completed=1
+ WHERE dispatchid='" . $CancelItems[0] . "'
+ AND dispatchitemsid='" . $CancelItems[1] . "'";
+ $result = DB_query($sql, $db);
+ $result = DB_Query("SELECT stockid FROM stockrequestitems WHERE completed=0 AND dispatchid='" . $CancelItems[0] . "'",$db);
+ if (DB_num_rows($result) ==0){
+ $result = DB_query("UPDATE stockrequest
+ SET authorised='1'
+ WHERE dispatchid='" . $CancelItems[0] . "'",$db);
+ }
+
+ }
}
}
@@ -47,10 +62,8 @@
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 '<table class="selection">';
-
-/* Create the table for the purchase order header */
-echo '<tr>
+echo '<table class="selection">
+ <tr>
<th>' . _('Request Number') . '</th>
<th>' . _('Department') . '</th>
<th>' . _('Location Of Stock') . '</th>
@@ -69,7 +82,7 @@
<td>' . $myrow['narrative'] . '</td>
<td><input type="checkbox" name="status'.$myrow['dispatchid'].'" /></td>
</tr>';
- $linesql="SELECT stockrequestitems.dispatchitemsid,
+ $LinesSQL="SELECT stockrequestitems.dispatchitemsid,
stockrequestitems.stockid,
stockrequestitems.decimalplaces,
stockrequestitems.uom,
@@ -78,8 +91,9 @@
FROM stockrequestitems
INNER JOIN stockmaster
ON stockmaster.stockid=stockrequestitems.stockid
- WHERE dispatchid='".$myrow['dispatchid'] . "'";
- $lineresult=DB_query($linesql, $db);
+ WHERE dispatchid='".$myrow['dispatchid'] . "'
+ AND completed=0";
+ $LineResult=DB_query($LinesSQL, $db);
echo '<tr>
<td></td>
@@ -89,13 +103,15 @@
<th>' . _('Product') . '</th>
<th>' . _('Quantity Required') . '</th>
<th>' . _('Units') . '</th>
+ <th>' . _('Cancel Line') . '</th>
</tr>';
- while ($linerow=DB_fetch_array($lineresult)) {
+ while ($LineRow=DB_fetch_array($LineResult)) {
echo '<tr>
- <td>' . $linerow['description'] . '</td>
- <td class="number">' . locale_number_format($linerow['quantity'],$linerow['decimalplaces']) . '</td>
- <td>' . $linerow['uom'] . '</td>
+ <td>' . $LineRow['description'] . '</td>
+ <td class="number">' . locale_number_format($LineRow['quantity'],$LineRow['decimalplaces']) . '</td>
+ <td>' . $LineRow['uom'] . '</td>
+ <td><input type="checkbox" name="' . $myrow['dispatchid'] . 'cancel' . $LineRow['dispatchitemsid'] . '" /></td
</tr>';
} // end while order line detail
echo '</table>
@@ -108,4 +124,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2014-02-06 08:42:57 UTC (rev 6565)
+++ trunk/Payments.php 2014-02-08 04:12:08 UTC (rev 6566)
@@ -649,13 +649,31 @@
prnMsg( _('The Cheque/Voucher number has already been used') . ' - ' . _('This GL analysis item could not be added'),'error');
} else {
$myrow = DB_fetch_array($Result);
- $_SESSION['PaymentDetail' . $identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
- $_POST['GLNarrative'],
- $_POST['GLManualCode'],
- $myrow['accountname'],
- $_POST['Tag'],
- $_POST['Cheque']);
- unset($_POST['GLManualCode']);
+ $AllowThisPosting = true;
+ if ($_SESSION['ProhibitJournalsToControlAccounts'] == 1) {
+ if ($_SESSION['CompanyRecord']['gllink_debtors'] == '1' AND $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ prnMsg(_('Payments involving the debtors control account cannot be entered. The general ledger debtors ledger (AR) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
+ $AllowThisPosting = false;
+ }
+ if ($_SESSION['CompanyRecord']['gllink_creditors'] == '1' AND
+ ($_POST['GLManualCode'] == $_SESSION['CompanyRecord']['creditorsact'] OR $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['grnact'])) {
+ prnMsg(_('Payments involving the creditors control account or the GRN suspense account cannot be entered. The general ledger creditors ledger (AP) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
+ $AllowThisPosting = false;
+ }
+ if ($_POST['GLManualCode'] == $_SESSION['CompanyRecord']['retainedearnings']) {
+ prnMsg(_('Payments involving the retained earnings control account cannot be entered. This account is automtically maintained.'), 'warn');
+ $AllowThisPosting = false;
+ }
+ }
+ if ($AllowThisPosting) {
+ $_SESSION['PaymentDetail' . $identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
+ $_POST['GLNarrative'],
+ $_POST['GLManualCode'],
+ $myrow['accountname'],
+ $_POST['Tag'],
+ $_POST['Cheque']);
+ unset($_POST['GLManualCode']);
+ }
}
} else if (DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!=''){
prnMsg( _('The cheque number has already been used') . ' - ' . _('This GL analysis item could not be added'),'error');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-06 08:42:57 UTC (rev 6565)
+++ trunk/doc/Change.log 2014-02-08 04:12:08 UTC (rev 6566)
@@ -2,8 +2,9 @@
-2/2/14 Release 4.11.3
+10/2/14 Release 4.11.3
+8/2/14 Phil: Used Tim's code as the basis to allow deletion of internal stock request items.
6/2/14 Eduardo Marzolla: geocode integration geocode with google API v3. You need to get a API Key from google. The parameters to geocode must be: geocode key: your API key geocode lat: your lat geocode long: your long geocode height: 100 geocode width: 100 host geocode: maps.googleapis.com
6/2/14 icedlava: Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
6/2/14 icedlava: BankMatching.php - correct column heading order.
|
|
From: <dai...@us...> - 2014-02-08 04:35:37
|
Revision: 6567
http://sourceforge.net/p/web-erp/reponame/6567
Author: daintree
Date: 2014-02-08 04:35:32 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Pre 4.11.3 removed all fuzzy translations
Modified Paths:
--------------
trunk/doc/Change.log
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-P-Y.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/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-08 04:12:08 UTC (rev 6566)
+++ trunk/doc/Change.log 2014-02-08 04:35:32 UTC (rev 6567)
@@ -1,9 +1,8 @@
webERP Change Log
+8/2/14 Release 4.11.3
-
-10/2/14 Release 4.11.3
-
+8/2/14 Phil: prevented GL posting to control accounts from Payments.php and CustomerReceipts.php where the configuration option to stop postings to these accounts is set.
8/2/14 Phil: Used Tim's code as the basis to allow deletion of internal stock request items.
6/2/14 Eduardo Marzolla: geocode integration geocode with google API v3. You need to get a API Key from google. The parameters to geocode must be: geocode key: your API key geocode lat: your lat geocode long: your long geocode height: 100 geocode width: 100 host geocode: maps.googleapis.com
6/2/14 icedlava: Payments.php - correct javascript to prevent error popup on every manual GL code entry, correct spacing.
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 2014-02-08 04:12:08 UTC (rev 6566)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2014-02-08 04:35:32 UTC (rev 6567)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-03 22:05+1300\n"
+"POT-Creation-Date: 2014-02-08 17:33+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"
@@ -15,10 +15,10 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-"X-Generator: Poedit 1.5.4\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:368
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:370
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -37,28 +37,24 @@
msgstr ""
#: AccountGroups.php:50
-#, fuzzy
msgid "An error occurred in moving the account group"
-msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+msgstr ""
#: AccountGroups.php:51
-#, fuzzy
msgid "The SQL that was used to move the account group was"
-msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+msgstr ""
#: AccountGroups.php:53 AccountGroups.php:334
msgid "Review Account Groups"
msgstr ""
#: AccountGroups.php:54
-#, fuzzy
msgid "All accounts in the account group:"
-msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+msgstr ""
#: AccountGroups.php:54
-#, fuzzy
msgid "have been changed to the account group:"
-msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+msgstr ""
#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211
#: AccountGroups.php:246
@@ -118,14 +114,12 @@
msgstr ""
#: AccountGroups.php:152
-#, fuzzy
msgid "An error occurred in renaming the account group"
-msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+msgstr ""
#: AccountGroups.php:153
-#, fuzzy
msgid "The SQL that was used to rename the account group was"
-msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+msgstr ""
#: AccountGroups.php:172
msgid "An error occurred in updating the account group"
@@ -425,16 +419,15 @@
msgstr "تحرير"
#: AccountGroups.php:326
-#, fuzzy
msgid "Are you sure you wish to delete this account group?"
-msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+msgstr ""
#: AccountGroups.php:326 AccountSections.php:196 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BankAccounts.php:224 BOMs.php:154 COGSGLPostings.php:113
#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:403
-#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:970
+#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:988
#: Customers.php:1165 CustomerTypes.php:207 Departments.php:187
#: DiscountCategories.php:238 DiscountMatrix.php:183 EDIMessageFormat.php:151
#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
@@ -443,7 +436,7 @@
#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1086 PaymentTerms.php:206
+#: PaymentMethods.php:209 Payments.php:1104 PaymentTerms.php:206
#: 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:772 PriceMatrix.php:174
@@ -483,31 +476,27 @@
msgstr ""
#: AccountGroups.php:372
-#, fuzzy
msgid "Edit Account Group Details"
-msgstr "مجموعات العضوية"
+msgstr ""
#: AccountGroups.php:396
-#, fuzzy
msgid "New Account Group Details"
-msgstr "مجموعات العضوية"
+msgstr ""
#: AccountGroups.php:403
msgid "Account Group Name"
msgstr ""
#: AccountGroups.php:404
-#, fuzzy
msgid "Enter the account group name"
-msgstr "لم يتمكن الحصول على مجموات العضو لان"
+msgstr ""
#: AccountGroups.php:404
-#, fuzzy
msgid ""
"A unique name for the account group must be entered - at least 3 characters "
"long and less than 30 characters long. Only alpha numeric characters can be "
"used."
-msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+msgstr ""
#: AccountGroups.php:413 AccountGroups.php:415
msgid "Top Level Group"
@@ -549,7 +538,7 @@
msgid "Enter Information"
msgstr "أدخل المعلومات"
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:367
+#: AccountSections.php:7 includes/MainMenuLinksArray.php:369
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -558,9 +547,8 @@
msgstr "قسم العضو موجود مسبقا فى قاعدة البيانات"
#: AccountSections.php:71
-#, fuzzy
msgid "The account section name cannot contain any illegal characters"
-msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
+msgstr ""
#: AccountSections.php:77
msgid "The account section name must contain at least one character"
@@ -619,23 +607,20 @@
msgstr "العودة الى العملاء"
#: AddCustomerContacts.php:25
-#, fuzzy
msgid "Contacts for Customer"
-msgstr "العودة الى العملاء"
+msgstr ""
#: AddCustomerContacts.php:27
msgid "Edit contact for"
msgstr ""
#: AddCustomerContacts.php:39
-#, fuzzy
msgid "The Contact ID must be an integer."
-msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
+msgstr ""
#: AddCustomerContacts.php:42
-#, fuzzy
msgid "The contact name must be forty characters or less long"
-msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+msgstr ""
#: AddCustomerContacts.php:45
msgid "The contact name may not be empty"
@@ -774,7 +759,7 @@
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
-#: BankMatching.php:283 BankReconciliation.php:217 BankReconciliation.php:294
+#: BankMatching.php:282 BankReconciliation.php:217 BankReconciliation.php:294
#: ContractCosting.php:177 CustomerAllocations.php:350
#: CustomerAllocations.php:380 CustomerInquiry.php:221
#: CustomerTransInquiry.php:106 GLAccountInquiry.php:174
@@ -846,9 +831,8 @@
msgstr ""
#: AddCustomerTypeNotes.php:34
-#, fuzzy
msgid "The contacts notes must be two hundred characters or less long"
-msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+msgstr ""
#: AddCustomerTypeNotes.php:37
msgid "The contacts notes may not be empty"
@@ -1006,8 +990,8 @@
#: ConfirmDispatch_Invoice.php:171 ConfirmDispatch_Invoice.php:998
#: ConfirmDispatch_Invoice.php:1012 Contracts.php:592 CounterReturns.php:1024
#: CounterReturns.php:1038 CounterSales.php:1442 CounterSales.php:1456
-#: Credit_Invoice.php:746 Credit_Invoice.php:767 CustomerReceipt.php:557
-#: CustomerReceipt.php:707 CustomerReceipt.php:735 CustomerTransInquiry.php:97
+#: Credit_Invoice.php:746 Credit_Invoice.php:767 CustomerReceipt.php:575
+#: CustomerReceipt.php:725 CustomerReceipt.php:753 CustomerTransInquiry.php:97
#: DeliveryDetails.php:409 GLProfit_Loss.php:609 GLTagProfit_Loss.php:515
#: Payments.php:362 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
@@ -1391,9 +1375,8 @@
msgstr ""
#: BackupDatabase.php:20
-#, fuzzy
msgid "Deleted"
-msgstr "حذف"
+msgstr ""
#: BackupDatabase.php:23
msgid "Unable to delete"
@@ -1548,7 +1531,7 @@
msgstr ""
#: BankAccounts.php:196 Currencies.php:447 CustomerAllocations.php:353
-#: CustomerReceipt.php:819 CustomerTransInquiry.php:114 OffersReceived.php:112
+#: CustomerReceipt.php:837 CustomerTransInquiry.php:114 OffersReceived.php:112
#: PcReportTab.php:276 PcTabs.php:208 PcTabs.php:355
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210
#: PO_AuthorisationLevels.php:216 PO_AuthoriseMyOrders.php:115
@@ -1597,14 +1580,12 @@
msgstr ""
#: BankAccountUsers.php:4
-#, fuzzy
msgid "Maintenance Of Bank Account Authorised Users"
-msgstr "مجموعات العضوية"
+msgstr ""
-#: BankAccountUsers.php:7 includes/MainMenuLinksArray.php:373
-#, fuzzy
+#: BankAccountUsers.php:7 includes/MainMenuLinksArray.php:375
msgid "Bank Account Authorised Users"
-msgstr "مجموعات العضوية"
+msgstr ""
#: BankAccountUsers.php:31
msgid "You have not selected any bank account"
@@ -1623,29 +1604,24 @@
msgstr ""
#: BankAccountUsers.php:71
-#, fuzzy
msgid "has been authorised to use"
-msgstr "تم حذف المجموعة"
+msgstr ""
#: BankAccountUsers.php:71 BankAccountUsers.php:84 BankAccountUsers.php:141
-#, fuzzy
msgid "bank account"
-msgstr "مجموعات العضوية"
+msgstr ""
#: BankAccountUsers.php:82
-#, fuzzy
msgid "The bank account user record could not be deleted because"
-msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
+msgstr ""
#: BankAccountUsers.php:84
-#, fuzzy
msgid "has been un-authorised to use"
-msgstr "تم حذف المجموعة"
+msgstr ""
#: BankAccountUsers.php:97
-#, fuzzy
msgid "Select Bank Account"
-msgstr "مجموعات العضوية"
+msgstr ""
#: BankAccountUsers.php:105 BankAccountUsers.php:205
#: InternalStockCategoriesByRole.php:120 InternalStockCategoriesByRole.php:209
@@ -1655,11 +1631,11 @@
msgid "Not Yet Selected"
msgstr ""
-#: BankAccountUsers.php:123 BankAccountUsers.php:222 CustomerReceipt.php:930
-#: CustomerReceipt.php:1142 CustomerTypes.php:270 ExchangeRateTrend.php:51
+#: BankAccountUsers.php:123 BankAccountUsers.php:222 CustomerReceipt.php:948
+#: CustomerReceipt.php:1160 CustomerTypes.php:270 ExchangeRateTrend.php:51
#: FreightCosts.php:60 GLJournal.php:139 GLJournal.php:376
#: InternalStockCategoriesByRole.php:136 InternalStockCategoriesByRole.php:226
-#: OffersReceived.php:114 Payments.php:1054 PcAssignCashToTab.php:181
+#: OffersReceived.php:114 Payments.php:1072 PcAssignCashToTab.php:181
#: PcAssignCashToTab.php:398 PcAuthorizeExpenses.php:334
#: PcClaimExpensesFromTab.php:174 PcClaimExpensesFromTab.php:422
#: PcExpenses.php:350 PcExpensesTypeTab.php:139 PcExpensesTypeTab.php:229
@@ -1669,9 +1645,9 @@
msgstr ""
#: BankAccountUsers.php:124 BankAccountUsers.php:223
-#: CustomerAllocations.php:452 CustomerReceipt.php:1143
+#: CustomerAllocations.php:452 CustomerReceipt.php:1161
#: InternalStockCategoriesByRole.php:137 InternalStockCategoriesByRole.php:227
-#: Payments.php:1055 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
+#: Payments.php:1073 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
#: PcAuthorizeExpenses.php:335 PcClaimExpensesFromTab.php:175
#: PcClaimExpensesFromTab.php:423 PcExpenses.php:351 PcExpensesTypeTab.php:140
#: PcExpensesTypeTab.php:230 PcTabs.php:488 PcTypeTabs.php:254
@@ -1697,9 +1673,9 @@
msgstr ""
#: BankAccountUsers.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Are you sure you wish to un-authorise this user?"
-msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+msgstr ""
#: BankAccountUsers.php:178
#, php-format
@@ -1707,9 +1683,8 @@
msgstr ""
#: BankAccountUsers.php:196
-#, fuzzy
msgid "Select User"
-msgstr "العودة الى العملاء"
+msgstr ""
#: BankMatching.php:6
msgid "Bank Account Matching"
@@ -1768,8 +1743,8 @@
msgstr ""
#: BankMatching.php:100 BankReconciliation.php:113 CounterReturns.php:829
-#: Currencies.php:219 CustomerReceipt.php:785 DailyBankTransactions.php:40
-#: Payments.php:760 PDFChequeListing.php:46 TaxAuthorities.php:151
+#: Currencies.php:219 CustomerReceipt.php:803 DailyBankTransactions.php:40
+#: Payments.php:778 PDFChequeListing.php:46 TaxAuthorities.php:151
#: TaxAuthorities.php:318
msgid "Bank Account"
msgstr ""
@@ -1789,7 +1764,7 @@
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:178 GLAccountReport.php:106
-#: Payments.php:735 PcReportTab.php:110 PDFChequeListing.php:117
+#: Payments.php:753 PcReportTab.php:110 PDFChequeListing.php:117
#: PDFChequeListing.php:127 PDFChequeListing.php:196
#: PDFDeliveryDifferences.php:194 PDFDeliveryDifferences.php:207
#: PDFDeliveryDifferences.php:306 PDFDIFOT.php:197 PDFDIFOT.php:210
@@ -1897,7 +1872,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr ""
-#: BankMatching.php:280 Payments.php:1062
+#: BankMatching.php:280 Payments.php:1080
msgid "Cheque No"
msgstr ""
@@ -1907,11 +1882,11 @@
msgstr ""
#: BankMatching.php:284 ConfirmDispatch_Invoice.php:301 Credit_Invoice.php:300
-#: CustomerAllocations.php:381 CustomerReceipt.php:947
+#: CustomerAllocations.php:381 CustomerReceipt.php:965
#: CustomerTransInquiry.php:113 CustWhereAlloc.php:115 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
-#: PaymentAllocations.php:67 Payments.php:1042 Payments.php:1047
-#: Payments.php:1063 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
+#: PaymentAllocations.php:67 Payments.php:1060 Payments.php:1065
+#: Payments.php:1081 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:236
#: PcClaimExpensesFromTab.php:396 PcReportTab.php:180 PcReportTab.php:335
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
@@ -1989,26 +1964,26 @@
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:110 CustomerReceipt.php:773
-#: DailyBankTransactions.php:36 Payments.php:756 SuppPaymentRun.php:319
+#: BankReconciliation.php:110 CustomerReceipt.php:791
+#: DailyBankTransactions.php:36 Payments.php:774 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:793
+#: BankReconciliation.php:120 CustomerReceipt.php:811
msgid "Bank Accounts have not yet been defined"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:793
+#: BankReconciliation.php:120 CustomerReceipt.php:811
msgid "You must first"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:793
-#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:811
+#: DailyBankTransactions.php:46 Payments.php:786 SuppPaymentRun.php:332
msgid "define the bank accounts"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:793
-#: DailyBankTransactions.php:46 Payments.php:768 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:811
+#: DailyBankTransactions.php:46 Payments.php:786 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
msgstr ""
@@ -2059,9 +2034,9 @@
#: BankReconciliation.php:220 BankReconciliation.php:297
#: ContractCosting.php:176 CustomerInquiry.php:223 CustomerPurchases.php:83
-#: CustomerReceipt.php:911 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
+#: CustomerReceipt.php:929 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
#: DailyBankTransactions.php:131 GLAccountReport.php:342
-#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:903
+#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:921
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:145
#: StockCounts.php:170 StockCounts.php:214 StockLocMovements.php:94
#: StockMovements.php:102 Z_CheckAllocs.php:64
@@ -2200,24 +2175,24 @@
#: PrintCustTransPortrait.php:1099 RecurringSalesOrders.php:331
#: ReorderLevel.php:300 ReverseGRN.php:393 ReverseGRN.php:394
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:193
-#: SalesGraph.php:276 SalesInquiry.php:997 SalesTopItemsInquiry.php:225
-#: SelectCreditItems.php:688 SelectCreditItems.php:1068
-#: SelectOrderItems.php:1373 SelectOrderItems.php:1541
-#: SelectOrderItems.php:1730 SelectOrderItems.php:1862 ShipmentCosting.php:149
-#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
-#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
-#: StockCounts.php:144 StockCounts.php:169 StockLocMovements.php:93
-#: StockLocTransfer.php:306 StockMovements.php:101 StockStatus.php:357
-#: StockUsageGraph.php:12 SuppCreditGRNs.php:291 SuppCreditGRNs.php:292
-#: SupplierCredit.php:318 SupplierTenderCreate.php:430
-#: SupplierTenderCreate.php:851 SupplierTenders.php:124
-#: SupplierTenders.php:327 SupplierTenders.php:531 SupplierTenders.php:534
-#: SupplierTenders.php:690 WorkOrderReceive.php:902 WOSerialNos.php:263
-#: WOSerialNos.php:269 WOSerialNos.php:303
-#: includes/InputSerialItemsFile.php:200 includes/InputSerialItems.php:128
-#: includes/InputSerialItems.php:134 includes/OutputSerialItems.php:38
-#: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49
-#: includes/PDFBOMListingPageHeader.inc:44
+#: SalesGraph.php:276 SalesInquiry.php:997 SalesTopCustomersInquiry.php:218
+#: SalesTopItemsInquiry.php:225 SelectCreditItems.php:688
+#: SelectCreditItems.php:1068 SelectOrderItems.php:1373
+#: SelectOrderItems.php:1541 SelectOrderItems.php:1730
+#: SelectOrderItems.php:1862 ShipmentCosting.php:149 ShipmentCosting.php:150
+#: Shipments.php:401 Shipments.php:403 Shipments.php:404 Shipments.php:488
+#: Shipments.php:490 SpecialOrder.php:628 StockCounts.php:144
+#: StockCounts.php:169 StockLocMovements.php:93 StockLocTransfer.php:306
+#: StockMovements.php:101 StockStatus.php:357 StockUsageGraph.php:12
+#: SuppCreditGRNs.php:291 SuppCreditGRNs.php:292 SupplierCredit.php:318
+#: SupplierTenderCreate.php:430 SupplierTenderCreate.php:851
+#: SupplierTenders.php:124 SupplierTenders.php:327 SupplierTenders.php:531
+#: SupplierTenders.php:534 SupplierTenders.php:690 TopCustomers.php:217
+#: WorkOrderReceive.php:902 WOSerialNos.php:263 WOSerialNos.php:269
+#: WOSerialNos.php:303 includes/InputSerialItemsFile.php:200
+#: includes/InputSerialItems.php:128 includes/InputSerialItems.php:134
+#: includes/OutputSerialItems.php:38 includes/OutputSerialItems.php:43
+#: includes/OutputSerialItems.php:49 includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFInventoryValnPageHeader.inc:33
@@ -2577,7 +2552,7 @@
#: BOMInquiry.php:28 BOMs.php:882 ContractBOM.php:332 ContractBOM.php:337
#: Contracts.php:759 Contracts.php:762 CounterReturns.php:1652
-#: CounterSales.php:2260 CustomerReceipt.php:1158 CustomerReceipt.php:1161
+#: CounterSales.php:2260 CustomerReceipt.php:1176 CustomerReceipt.php:1179
#: DiscountCategories.php:121 DiscountCategories.php:123
#: DiscountCategories.php:127 DiscountCategories.php:129
#: FixedAssetTransfer.php:94 InternalStockRequest.php:353 MRPDemands.php:338
@@ -2621,7 +2596,7 @@
msgstr ""
#: BOMInquiry.php:35 BOMs.php:887 ContractBOM.php:342 Contracts.php:769
-#: CounterReturns.php:1656 CounterSales.php:2266 CustomerReceipt.php:1168
+#: CounterReturns.php:1656 CounterSales.php:2266 CustomerReceipt.php:1186
#: FixedAssetTransfer.php:107 InternalStockRequest.php:364 MRPDemands.php:343
#: MRPReport.php:558 PO_Header.php:549 PO_Items.php:1173 SelectAsset.php:116
#: SelectCreditItems.php:234 SelectCreditItems.php:1012 SelectCustomer.php:375
@@ -2658,7 +2633,7 @@
#: BOMInquiry.php:108 BOMs.php:559 BOMs.php:897 ContractBOM.php:353
#: CounterReturns.php:1681 CounterSales.php:2109 CounterSales.php:2290
-#: CustomerBranches.php:407 CustomerReceipt.php:1179 GLCodesInquiry.php:26
+#: CustomerBranches.php:407 CustomerReceipt.php:1197 GLCodesInquiry.php:26
#: InternalStockRequest.php:557 InternalStockRequest.php:627
#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257
#: MRPReport.php:749 NoSalesItems.php:186 PDFOrdersInvoiced.php:331
@@ -2682,7 +2657,7 @@
#: BOMInquiry.php:111 BOMs.php:900 ConfirmDispatch_Invoice.php:293
#: ContractBOM.php:355 CounterReturns.php:1683 CounterSales.php:2111
#: CounterSales.php:2292 Credit_Invoice.php:293 GoodsReceived.php:103
-#: GoodsReceived.php:107 InternalStockRequestAuthorisation.php:91
+#: GoodsReceived.php:107 InternalStockRequestAuthorisation.php:105
#: InternalStockRequestFulfill.php:322 InternalStockRequest.php:560
#: InternalStockRequest.php:629 InventoryValuation.php:205 MRPReport.php:752
#: NoSalesItems.php:190 OffersReceived.php:109 PO_Items.php:1202
@@ -2756,7 +2731,7 @@
msgstr ""
#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:107
-#: includes/MainMenuLinksArray.php:288
+#: includes/MainMenuLinksArray.php:290
msgid "Bill Of Material Listing"
msgstr ""
@@ -3037,7 +3012,7 @@
msgid "Location"
msgstr ""
-#: BOMs.php:562 WhereUsedInquiry.php:69 includes/MainMenuLinksArray.php:313
+#: BOMs.php:562 WhereUsedInquiry.php:69 includes/MainMenuLinksArray.php:315
msgid "Work Centre"
msgstr ""
@@ -3175,8 +3150,8 @@
msgid "Are you sure you wish to delete this COGS GL posting record?"
msgstr ""
-#: COGSGLPostings.php:200 CustomerReceipt.php:1074 GLJournal.php:387
-#: GLTransInquiry.php:44 Payments.php:1064 SupplierTransInquiry.php:172
+#: COGSGLPostings.php:200 CustomerReceipt.php:1092 GLJournal.php:387
+#: GLTransInquiry.php:44 Payments.php:1082 SupplierTransInquiry.php:172
#: TaxAuthorities.php:148 TaxAuthorities.php:149
msgid "GL Account"
msgstr ""
@@ -3202,7 +3177,7 @@
msgid "Post to GL account"
msgstr ""
-#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:431
+#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:433
msgid "Company Preferences"
msgstr ""
@@ -3471,9 +3446,9 @@
#: FixedAssetItems.php:127 FixedAssetItems.php:653 GLBudgets.php:240
#: GLTags.php:68 GoodsReceived.php:257 GoodsReceived.php:263
#: GoodsReceived.php:270 GoodsReceived.php:752 ImportBankTransAnalysis.php:154
-#: ImportBankTransAnalysis.php:185 InternalStockRequestAuthorisation.php:106
+#: ImportBankTransAnalysis.php:185 InternalStockRequestAuthorisation.php:122
#: InternalStockRequestFulfill.php:361 InternalStockRequest.php:249
-#: MRPCalendar.php:315 Payments.php:915 PcAuthorizeExpenses.php:108
+#: MRPCalendar.php:315 Payments.php:933 PcAuthorizeExpenses.php:108
#: PcAuthorizeExpenses.php:293 PO_AuthoriseMyOrders.php:142
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:130
#: SecurityTokens.php:97 SelectCreditItems.php:957 SellThroughSupport.php:476
@@ -3594,17 +3569,17 @@
#: ConfirmDispatch_Invoice.php:272 Contracts.php:778 CustLoginSetup.php:32
#: CustomerAllocations.php:347 CustomerBranches.php:403
#: CustomerBranches.php:586 CustomerBranches.php:633 CustomerInquiry.php:135
-#: CustomerInquiry.php:136 CustomerPurchases.php:30 CustomerReceipt.php:949
-#: CustomerReceipt.php:1005 CustomerReceipt.php:1153 Customers.php:25
+#: CustomerInquiry.php:136 CustomerPurchases.php:30 CustomerReceipt.php:967
+#: CustomerReceipt.php:1023 CustomerReceipt.php:1171 Customers.php:25
#: Customers.php:348 CustomerTransInquiry.php:107 DeliveryDetails.php:850
#: FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:289 PDFOrderStatus.php:285
-#: PricesByCost.php:154 SalesGraph.php:185 SelectCompletedOrder.php:556
-#: SelectContract.php:145 SelectCreditItems.php:242 SelectCustomer.php:24
-#: SelectCustomer.php:210 SelectOrderItems.php:636
-#: SelectRecurringSalesOrder.php:91 SelectSalesOrder.php:854
-#: SelectSalesOrder.php:871 SellThroughSupport.php:262
-#: StockLocMovements.php:92 StockMovements.php:99
-#: includes/PDFAgedDebtorsPageHeader.inc:48
+#: PricesByCost.php:154 SalesGraph.php:185 SalesTopCustomersInquiry.php:214
+#: SelectCompletedOrder.php:556 SelectContract.php:145
+#: SelectCreditItems.php:242 SelectCustomer.php:24 SelectCustomer.php:210
+#: SelectOrderItems.php:636 SelectRecurringSalesOrder.php:91
+#: SelectSalesOrder.php:854 SelectSalesOrder.php:871
+#: SellThroughSupport.php:262 StockLocMovements.php:92 StockMovements.php:99
+#: TopCustomers.php:213 includes/PDFAgedDebtorsPageHeader.inc:48
#: includes/PDFBankingSummaryPageHeader.inc:56
#: includes/PDFCustTransListingPageHeader.inc:48
#: includes/PDFDebtorBalsPageHeader.inc:30
@@ -3628,8 +3603,8 @@
msgid "Customer Code"
msgstr ""
-#: ConfirmDispatch_Invoice.php:273 CustEDISetup.php:97 CustomerReceipt.php:258
-#: CustomerReceipt.php:1180 Customers.php:464 Customers.php:772
+#: ConfirmDispatch_Invoice.php:273 CustEDISetup.php:97 CustomerReceipt.php:276
+#: CustomerReceipt.php:1198 Customers.php:464 Customers.php:772
#: Customers.php:811 DeliveryDetails.php:851 OrderDetails.php:75
#: POReport.php:494 POReport.php:1270 SalesInquiry.php:772
#: SalesInquiry.php:782 SalesInquiry.php:806 SalesInquiry.php:950
@@ -3742,7 +3717,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:297 CounterReturns.php:672 CounterSales.php:754
-#: Credit_Invoice.php:296 CustomerReceipt.php:948 DeliveryDetails.php:875
+#: Credit_Invoice.php:296 CustomerReceipt.php:966 DeliveryDetails.php:875
#: OrderDetails.php:173 PrintCustTrans.php:897 PrintCustTrans.php:986
#: PrintCustTrans.php:1035 PrintCustTransPortrait.php:948
#: PrintCustTransPortrait.php:1046 PrintCustTransPortrait.php:1102
@@ -4637,7 +4612,7 @@
#: ConfirmDispatch_Invoice.php:1639 ConfirmDispatch_Invoice.php:1641
#: ContractBOM.php:299 CounterReturns.php:1597 CounterReturns.php:1599
-#: CounterSales.php:2064 CounterSales.php:2066 CustomerReceipt.php:562
+#: CounterSales.php:2064 CounterSales.php:2066 CustomerReceipt.php:580
#: DeliveryDetails.php:601 DeliveryDetails.php:605 DeliveryDetails.php:823
#: DeliveryDetails.php:827 GLBalanceSheet.php:22 GLJournalInquiry.php:113
#: GLProfit_Loss.php:25 GLTagProfit_Loss.php:25 GLTagProfit_Loss.php:523
@@ -4837,9 +4812,8 @@
msgstr ""
#: ContractBOM.php:272
-#, f...
[truncated message content] |
|
From: <rc...@us...> - 2014-02-10 15:09:30
|
Revision: 6568
http://sourceforge.net/p/web-erp/reponame/6568
Author: rchacon
Date: 2014-02-10 15:09:27 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Improvements in the Spanish translation of fixed assets. Standardise titles and link of fixed assets scripts.
Modified Paths:
--------------
trunk/FixedAssetCategories.php
trunk/MaintenanceTasks.php
trunk/includes/MainMenuLinksArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2014-02-08 04:35:32 UTC (rev 6567)
+++ trunk/FixedAssetCategories.php 2014-02-10 15:09:27 UTC (rev 6568)
@@ -313,7 +313,7 @@
DB_data_seek($PnLAccountsResult,0);
echo '<tr>
- <td>' . _('Profit or Loss on Disposal GL Code:') . '</td>
+ <td>' . _('Profit or Loss on Disposal GL Code') . ':</td>
<td><select name="DisposalAct" required="required" title="' . _('Select the general ledger account where the profit or loss on disposal on assets of this category should be posted to. Only profit and loss accounts can be selected') . '" >';
while ($myrow = DB_fetch_array($PnLAccountsResult)) {
if (isset($_POST['DisposalAct']) and $myrow['accountcode']==$_POST['DisposalAct']) {
Modified: trunk/MaintenanceTasks.php
===================================================================
--- trunk/MaintenanceTasks.php 2014-02-08 04:35:32 UTC (rev 6567)
+++ trunk/MaintenanceTasks.php 2014-02-10 15:09:27 UTC (rev 6568)
@@ -194,7 +194,7 @@
</tr>';
echo '<tr>
- <td>' . _('Responsible').':</td>
+ <td>' . _('Responsible') . ':</td>
<td><select required="required" name="UserResponsible">';
$UserSQL="SELECT userid FROM www_users";
$UserResult=DB_query($UserSQL,$db);
@@ -243,4 +243,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2014-02-08 04:35:32 UTC (rev 6567)
+++ trunk/includes/MainMenuLinksArray.php 2014-02-10 15:09:27 UTC (rev 6568)
@@ -400,9 +400,9 @@
'/MaintenanceUserSchedule.php',
'/MaintenanceReminders.php');
-$MenuItems['FA']['Maintenance']['Caption'] = array( _('Asset Categories Maintenance'),
+$MenuItems['FA']['Maintenance']['Caption'] = array( _('Fixed Asset Category Maintenance'),
_('Add or Maintain Asset Locations'),
- _('Maintenance Tasks'));
+ _('Fixed Asset Maintenance Tasks'));
$MenuItems['FA']['Maintenance']['URL'] = array( '/FixedAssetCategories.php',
'/FixedAssetLocations.php',
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 2014-02-08 04:35:32 UTC (rev 6567)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-02-10 15:09:27 UTC (rev 6568)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-01-01 09:44-0600\n"
+"PO-Revision-Date: 2014-02-10 08:53-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -4434,7 +4434,7 @@
#: ConfirmDispatch_Invoice.php:851
msgid "The asset number being disposed of is:"
-msgstr ""
+msgstr "El número de activo a ser eliminado es:"
#: ConfirmDispatch_Invoice.php:864 ConfirmDispatch_Invoice.php:941
#: RecurringSalesOrdersProcess.php:323
@@ -11582,7 +11582,7 @@
#: FixedAssetCategories.php:7
msgid "Fixed Asset Category Maintenance"
-msgstr "Administrar Categorías de Activos Fijos"
+msgstr "Administrar categorías de activos fijos"
#: FixedAssetCategories.php:16
msgid "Fixed Asset Categories"
@@ -11727,7 +11727,7 @@
#: FixedAssetCategories.php:287
msgid "Fixed Asset Cost GL Code"
-msgstr "Código Contable de Costo del Activo Fijo"
+msgstr "Cuenta contable del costo del activo fijo"
#: FixedAssetCategories.php:288
msgid ""
@@ -11737,7 +11737,7 @@
#: FixedAssetCategories.php:301
msgid "Profit and Loss Depreciation GL Code"
-msgstr "Código de la Cuenta de Amortización en Ganancias y Pérdidas"
+msgstr "Cuenta contable de la depreciación en el Estado de Resultados"
#: FixedAssetCategories.php:302
msgid ""
@@ -11747,7 +11747,7 @@
#: FixedAssetCategories.php:316
msgid "Profit or Loss on Disposal GL Code:"
-msgstr "Código Contable de Ganancias y Perdidas en Descarte:"
+msgstr "Código contable de la venta del activo fijo en el Estado de Resultados"
#: FixedAssetCategories.php:317
msgid ""
@@ -11758,7 +11758,8 @@
#: FixedAssetCategories.php:330
msgid "Balance Sheet Accumulated Depreciation GL Code"
-msgstr "Código Contable de la Depreciación Acumulada en el Balance "
+msgstr ""
+"Código contable de la depreciación acumulada en el Estado de Situación "
#: FixedAssetCategories.php:331
msgid ""
@@ -16348,7 +16349,7 @@
#: MaintenanceTasks.php:7
msgid "Fixed Asset Maintenance Tasks"
-msgstr ""
+msgstr "Tareas de mantenimiento de activos fijos"
#: MaintenanceTasks.php:19 MaintenanceTasks.php:45
msgid "The days before a task falls due is expected to be a postive"
@@ -16377,7 +16378,7 @@
#: MaintenanceTasks.php:96 MaintenanceUserSchedule.php:51
msgid "Last Completed"
-msgstr ""
+msgstr "Última completada"
#: MaintenanceTasks.php:97 MaintenanceUserSchedule.php:53
msgid "Person"
@@ -16398,15 +16399,15 @@
#: MaintenanceTasks.php:172
msgid "Asset to Maintain"
-msgstr ""
+msgstr "Activo a mantener"
#: MaintenanceTasks.php:187
msgid "Task Description"
-msgstr ""
+msgstr "Descripción de la tarea"
#: MaintenanceTasks.php:192
msgid "Days Before Task Due"
-msgstr ""
+msgstr "Días antes de tarea pendiente"
#: MaintenanceTasks.php:197
msgid "Responsible"
@@ -16422,7 +16423,7 @@
#: MaintenanceTasks.php:240
msgid "Enter New Task"
-msgstr ""
+msgstr "Introducir nueva tarea"
#: MaintenanceUserSchedule.php:7
msgid "My Maintenance Jobs"
@@ -43256,7 +43257,7 @@
#: includes/MainMenuLinksArray.php:403
msgid "Asset Categories Maintenance"
-msgstr "Administrar Categorías de Activos"
+msgstr "Administrar categorías de activos"
#: includes/MainMenuLinksArray.php:404
msgid "Add or Maintain Asset Locations"
@@ -43264,7 +43265,7 @@
#: includes/MainMenuLinksArray.php:405
msgid "Maintenance Tasks"
-msgstr ""
+msgstr "Tareas de mantenimiento"
#: includes/MainMenuLinksArray.php:411
msgid "Assign Cash to PC Tab"
|
|
From: <dai...@us...> - 2014-02-12 05:43:14
|
Revision: 6571
http://sourceforge.net/p/web-erp/reponame/6571
Author: daintree
Date: 2014-02-12 05:43:11 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
Andrew Galuski: WOSerialNos fix for quantity number format error;
Modified Paths:
--------------
trunk/GLTrialBalance_csv.php
trunk/WOSerialNos.php
trunk/doc/Change.log
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php 2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/GLTrialBalance_csv.php 2014-02-12 05:43:11 UTC (rev 6571)
@@ -10,10 +10,11 @@
* also need to work on authentication with username and password sent too*/
-$AllowAnyone =true;
+$AllowAnyone = true;
//Page must be called with GLTrialBalance_csv.php?CompanyName=XXXXX&FromPeriod=Y&ToPeriod=Z
$_POST['CompanyNameField'] = $_GET['CompanyName'];
+$_SESSION['DatabaseName'] = $_GET['CompanyName'];
//htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8')) .'/GLTrialBalance_csv.php?ToPeriod=' . $_GET['ToPeriod'] . '&FromPeriod=' . $_GET['FromPeriod'];
include ('includes/session.inc');
@@ -79,4 +80,4 @@
}
echo $CSV_File;
-?>
\ No newline at end of file
+?>
Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php 2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/WOSerialNos.php 2014-02-12 05:43:11 UTC (rev 6571)
@@ -184,7 +184,7 @@
prnMsg($_POST['OldReference' .$i] . ': ' , _('The new batch or serial number reference has not been entered - a reference is required'),'error');
$InputError=true;
}
- if (!is_numeric($_POST['Quantity' . $i])){
+ if (!is_numeric(filter_number_format($_POST['Quantity' . $i]))){
prnMsg(_('The quantity for the batch must be numeric'),'error');
$InputError=true;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/doc/Change.log 2014-02-12 05:43:11 UTC (rev 6571)
@@ -1,5 +1,9 @@
webERP Change Log
-14/2/2014 Exson: Fixed the Earliest date calculation when is over Friday cutoff Time in DateFunctions.inc.
+
+12/2/14 Andrew Galuski: WOSerialNos.php - added filter number format on quantity
+12/2/14 Exson: Fixed the Earliest date calculation when is over Friday cutoff Time in DateFunctions.inc.
+
+
8/2/14 Release 4.11.3
8/2/14 Phil: prevented GL posting to control accounts from Payments.php and CustomerReceipts.php where the configuration option to stop postings to these accounts is set.
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2014-02-12 05:43:11 UTC (rev 6571)
@@ -1876,7 +1876,7 @@
#: BankMatching.php:280 Payments.php:1080
msgid "Cheque No"
-msgstr ""
+msgstr "Check No"
#: BankMatching.php:281 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:457
@@ -2009,11 +2009,11 @@
#: BankReconciliation.php:209
msgid "The unpresented cheques could not be retrieved by the SQL because"
-msgstr ""
+msgstr "The unpresented checks could not be retrieved by the SQL because"
#: BankReconciliation.php:213
msgid "Add back unpresented cheques"
-msgstr ""
+msgstr "Add back unpresented checks"
#: BankReconciliation.php:219 BankReconciliation.php:296
#: CustomerAllocations.php:349 CustomerAllocations.php:379
@@ -2058,7 +2058,7 @@
#: BankReconciliation.php:268
msgid "Total of all unpresented cheques"
-msgstr ""
+msgstr "Total of all unpresented checks"
#: BankReconciliation.php:287
msgid "The uncleared deposits could not be retrieved by the SQL because"
@@ -16992,7 +16992,7 @@
#: Payments.php:23
msgid "Payment Cancelled since cheque was not printed"
-msgstr ""
+msgstr "Payment Cancelled since check was not printed"
#: Payments.php:47
msgid "A bank account must be selected to make this payment from"
@@ -17040,11 +17040,11 @@
#: Payments.php:300
msgid "Print Cheque using pre-printed stationery"
-msgstr ""
+msgstr "Print Check using pre-printed stationery"
#: Payments.php:307
msgid "Has the cheque been printed"
-msgstr ""
+msgstr "Has the check been printed"
#: Payments.php:312
msgid "Yes / Continue"
@@ -17131,7 +17131,7 @@
#: Payments.php:649
msgid "The Cheque/Voucher number has already been used"
-msgstr ""
+msgstr "The Check/Voucher number has already been used"
#: Payments.php:649 Payments.php:679
msgid "This GL analysis item could not be added"
@@ -17139,7 +17139,7 @@
#: Payments.php:679
msgid "The cheque number has already been used"
-msgstr ""
+msgstr "The check number has already been used"
#: Payments.php:731
msgid "SQL used to retrieve the bank account name was"
@@ -17197,7 +17197,7 @@
#: Payments.php:913
msgid "Cheque Number"
-msgstr ""
+msgstr "Check Number"
#: Payments.php:914
msgid "(if using pre-printed stationery)"
@@ -17235,7 +17235,7 @@
#: Payments.php:1042
msgid "Cheque/Voucher Number"
-msgstr ""
+msgstr "Check/Voucher Number"
#: Payments.php:1104
msgid "Are you sure you wish to delete this payment analysis item?"
@@ -18087,11 +18087,11 @@
#: PDFChequeListing.php:40
msgid "Enter the date from which cheques are to be listed"
-msgstr ""
+msgstr "Enter the date from which checks are to be listed"
#: PDFChequeListing.php:43
msgid "Enter the date to which cheques are to be listed"
-msgstr ""
+msgstr "Enter the date to which checks are to be listed"
#: PDFChequeListing.php:62 PDFDeliveryDifferences.php:73 PDFDIFOT.php:77
msgid "Email the report off"
@@ -18112,11 +18112,11 @@
#: PDFChequeListing.php:126
msgid "Cheque Listing"
-msgstr ""
+msgstr "Check Listing"
#: PDFChequeListing.php:127
msgid "Cheque listing from"
-msgstr ""
+msgstr "Check listing from"
#: PDFChequeListing.php:151
msgid "An error occurred getting the GL transactions"
@@ -18124,7 +18124,7 @@
#: PDFChequeListing.php:184
msgid "CHEQUES"
-msgstr ""
+msgstr "CHECKS"
#: PDFChequeListing.php:195
msgid "Payments check list"
@@ -21190,7 +21190,7 @@
#: PrintCheque.php:18 PrintCheque.php:19
msgid "Print Cheque"
-msgstr ""
+msgstr "Print Check"
#: PrintCheque.php:32
msgid "Can not get hundreds name"
@@ -21206,7 +21206,7 @@
#: PrintCheque.php:82 PrintCheque.php:96
msgid "Cheque No."
-msgstr ""
+msgstr "Check No."
#: PrintCheque.php:113
msgid "Number is out of the range of numbers that can be expressed in words"
@@ -21242,7 +21242,7 @@
#: PrintCheque.php:144
msgid "four"
-msgstr "four"
+msgstr ""
#: PrintCheque.php:145
msgid "five"
@@ -36869,7 +36869,7 @@
#: Z_ImportGLTransactions.php:184
msgid "Cheque"
-msgstr ""
+msgstr "Check"
#: Z_ImportGLTransactions.php:203
msgid "The total of the transactions must balance back to zero"
@@ -40411,7 +40411,7 @@
#: includes/MainMenuLinksArray.php:349
msgid "Cheque Payments Listing"
-msgstr ""
+msgstr "Check Payments Listing"
#: includes/MainMenuLinksArray.php:350
msgid "Daily Bank Transactions"
|
|
From: <dai...@us...> - 2014-02-14 23:06:46
|
Revision: 6572
http://sourceforge.net/p/web-erp/reponame/6572
Author: daintree
Date: 2014-02-14 23:06:44 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Andrew Galuski: WO status fix
Modified Paths:
--------------
trunk/WorkOrderStatus.php
trunk/doc/Change.log
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/Z_POSDataCreation.php
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2014-02-12 05:43:11 UTC (rev 6571)
+++ trunk/WorkOrderStatus.php 2014-02-14 23:06:44 UTC (rev 6572)
@@ -106,7 +106,8 @@
qtypu
FROM worequirements INNER JOIN stockmaster
ON worequirements.stockid=stockmaster.stockid
- WHERE wo='" . $SelectedWO . "'",
+ WHERE wo='" . $SelectedWO . "'
+ AND worequirements.parentstockid='" . $StockID . "'",
$db);
while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
@@ -134,4 +135,4 @@
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-12 05:43:11 UTC (rev 6571)
+++ trunk/doc/Change.log 2014-02-14 23:06:44 UTC (rev 6572)
@@ -1,5 +1,8 @@
webERP Change Log
+
+15/2/14 Phil: Fixed POSDataCreation script to send all current prices in the POS currency including debtorno info so the POS can now deal with customer specific prices correctly.
+15/2/14 Andrew Galuski: WorkOrderStatus.php now shows requirements for multiple parent item works orders.
12/2/14 Andrew Galuski: WOSerialNos.php - added filter number format on quantity
12/2/14 Exson: Fixed the Earliest date calculation when is over Friday cutoff Time in DateFunctions.inc.
Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php 2014-02-12 05:43:11 UTC (rev 6571)
+++ trunk/includes/LanguageSetup.php 2014-02-14 23:06:44 UTC (rev 6572)
@@ -26,7 +26,7 @@
//Check users' locale format via their language
//Then pass this information to the js for number validation purpose
-$Collect = array('US'=> array('en_US.utf8','en_GB.utf8','ja_JP.utf8','hi_IN.utf8','sw_KE.utf8','tr_TR.utf8','vi_VN.utf8','zh_CN.utf8','zh_HK.utf8','zh_TW.utf8'),
+$Collect = array('US'=> array('en_US.utf8','en_GB.utf8','ja_JP.utf8','hi_IN.utf8','mr_IN.utf8','sw_KE.utf8','tr_TR.utf8','vi_VN.utf8','zh_CN.utf8','zh_HK.utf8','zh_TW.utf8'),
'IN'=>array('en_IN.utf8'),
'EE'=>array('ar_EG.utf8','cz_CZ.utf8','fr_CA.utf8','fr_FR.utf8','hr_HR.utf8','pl_PL.utf8','ru_RU.utf8','sq_AL.utf8','sv_SE.utf8'),
'FR'=>array('ar_EG.utf8','cz_CZ.utf8','fr_CA.utf8','fr_FR.utf8','hr_HR.utf8','pl_PL.utf8','ru_RU.utf8','sq_AL.utf8','sv_SE.utf8'),
@@ -40,7 +40,6 @@
}
-
/*Since LanguagesArray requires the function _() to translate the language names - we must provide a substitute if it doesn't exist aready before we include includes/LanguagesArray.php
* */
if (!function_exists('gettext')) {
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2014-02-12 05:43:11 UTC (rev 6571)
+++ trunk/includes/LanguagesArray.php 2014-02-14 23:06:44 UTC (rev 6572)
@@ -66,6 +66,11 @@
$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['hi_IN.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['mr_IN.utf8']['LanguageName'] = _('Marathi');
+$LanguagesArray['mr_IN.utf8']['WindowsLocale'] = 'marathi';
+$LanguagesArray['mr_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['mr_IN.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['hr_HR.utf8']['LanguageName'] = 'Magyar';
$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
$LanguagesArray['hr_HR.utf8']['DecimalPoint'] = ',';
Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php 2014-02-12 05:43:11 UTC (rev 6571)
+++ trunk/includes/Z_POSDataCreation.php 2014-02-14 23:06:44 UTC (rev 6572)
@@ -25,8 +25,8 @@
}
$CurrCode = $CustomerRow['currcode'];
$SalesType = $CustomerRow['salestype'];
+
-
$FileHandle = fopen($PathPrefix . $ReportDir . '/POS.sql','w');
if ($FileHandle == false){
@@ -120,25 +120,39 @@
}
fwrite($FileHandle,"DELETE FROM stockmaster;\n");
- $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
- while ($myrow = DB_fetch_array($result)) {
- fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape (str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape ($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "');\n");
- fwrite($FileHandle,"DELETE FROM prices WHERE stockid='" . $myrow['stockid'] . "';\n");
+ $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
- $Price = GetPriceQuick ($myrow['stockid'], $POSDebtorNo, $POSBranchCode, $DefaultPriceList, $db);
- if ($Price!=0) {
- fwrite($FileHandle,"INSERT INTO prices (stockid, currabrev, typeabbrev, price) VALUES('" . $myrow['stockid'] . "', '" . $CurrCode . "', '" . $SalesType . "', '" . $Price . "');\n");
- }
+ while ($myrow = DB_fetch_array($result)) {
+ fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape (str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape ($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "');\n");
}
+ fwrite($FileHandle,"DELETE FROM prices;\n");
+ $result = DB_query("SELECT prices.stockid,
+ prices.typeabbrev,
+ prices.currabrev,
+ prices.debtorno,
+ prices.price
+ FROM prices INNER JOIN stockmaster
+ ON prices.stockid=stockmaster.stockid
+ WHERE (mbflag='B' OR mbflag='M')
+ AND discontinued=0
+ AND controlled=0
+ AND prices.branchcode=''
+ AND prices.currabrev='" . $CurrCode . "'
+ AND prices.startdate <='" . Date('Y-m-d:23.59') . "'
+ AND (prices.enddate >='" . Date('Y-m-d:23.59') . "' OR prices.enddate='0000-00-00')",$db);
+ while ($myrow = DB_fetch_array($result)) {
+
+ fwrite($FileHandle,"INSERT INTO prices VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['typeabbrev']) . "', '" . SQLite_Escape ($myrow['currabrev']) . "', '" . SQLite_Escape ($myrow['debtorno']) . "', '" . SQLite_Escape ($myrow['price']) . "', '');\n");
+ }
+
fwrite($FileHandle,"DELETE FROM debtorsmaster;\n");
$result = DB_query("SELECT debtorno, name, currcode, salestype, holdreason, paymentterms, discount, creditlimit, discountcode FROM debtorsmaster WHERE currcode='". $CurrCode . "'",$db);
while ($myrow = DB_fetch_array($result)) {
fwrite($FileHandle,"INSERT INTO debtorsmaster VALUES ('" . $myrow['debtorno'] . "', '" . SQLite_Escape ($myrow['name']) . "', '" . $myrow['currcode'] . "', '" . $myrow['salestype'] . "', '" . $myrow['holdreason'] . "', '" . SQLite_Escape ($myrow['paymentterms']) . "', '" . $myrow['discount'] . "', '" . $myrow['creditlimit'] . "', '" . $myrow['discountcode'] . "');\n");
-
}
fwrite($FileHandle,"DELETE FROM custbranch;\n");
$result = DB_query("SELECT branchcode, debtorsmaster.debtorno, brname, contactname, specialinstructions,taxgroupid FROM custbranch INNER JOIN debtorsmaster ON custbranch.debtorno=debtorsmaster.debtorno WHERE debtorsmaster.currcode='". $CurrCode . "'",$db);
@@ -195,59 +209,4 @@
}
}
-function GetPriceQuick ($StockID, $DebtorNo, $BranchCode, $DefaultPriceList,$db){
-
- $sql="SELECT prices.price, prices.debtorno, prices.branchcode, prices.enddate, prices.typeabbrev
- FROM prices INNER JOIN debtorsmaster
- ON prices.currabrev = debtorsmaster.currcode
- WHERE debtorsmaster.debtorno='" . $DebtorNo . "'
- AND (prices.typeabbrev = debtorsmaster.salestype OR prices.typeabbrev='" . $DefaultPriceList . "')
- AND prices.stockid = '" . $StockID . "'
- AND (prices.debtorno=debtorsmaster.debtorno OR prices.debtorno='')
- AND (prices.branchcode='" . $BranchCode . "' OR prices.branchcode='')
- AND prices.startdate <='" . Date('Y-m-d:23.59') . "'
- AND (prices.enddate >='" . Date('Y-m-d:23.59') . "' OR prices.enddate='0000-00-00')";
-
- $ErrMsg = _('There is a problem in retrieving the pricing information for part') . ' ' . $StockID . ' ' . _('and for Customer') . ' ' . $DebtorNo . ' ' . _('the error message returned by the SQL server was');
- $result = DB_query($sql, $db,$ErrMsg);
- if (DB_num_rows($result)==0){
- return 0;
- } else {
- $PricesArray = array();
- $RankArray = array();
- $i = 0;
- while ($myrow=DB_fetch_array($result)){
- $Prices[$i]['Price'] = $myrow['price'];
- $Prices[$i]['DebtorNo'] = $myrow['debtorno'];
- $Prices[$i]['BranchCode'] = $myrow['branchcode'];
- $Prices[$i]['EndDate'] = $myrow['enddate'];
- if ($myrow['debtorno']==$DebtorNo AND $myrow['branchcode']==$BranchCode AND $myrow['enddate']!='0000-00-00') {
- $RankArray[$i] = 1;
- } elseif ($myrow['debtorno']==$DebtorNo AND $myrow['branchcode']==$BranchCode) {
- $RankArray[$i] = 2;
- } elseif ($myrow['debtorno']==$DebtorNo AND $myrow['branchcode']=='' AND $myrow['enddate']!='0000-00-00'){
- $RankArray[$i] = 3;
- } elseif ($myrow['debtorno']==$DebtorNo AND $myrow['branchcode']=='' ){
- $RankArray[$i] = 4;
- } elseif ($myrow['debtorno']=='' AND $myrow['branchcode']=='' AND $myrow['typeabbrev']!=$DefaultPriceList AND $myrow['enddate']!='0000-00-00'){
- $RankArray[$i] = 5;
- } elseif ($myrow['debtorno']=='' AND $myrow['branchcode']=='' AND $myrow['typeabbrev']!=$DefaultPriceList){
- $RankArray[$i] = 6;
- } elseif ($myrow['debtorno']=='' AND $myrow['branchcode']=='' AND $myrow['enddate']!='0000-00-00'){
- $RankArray[$i] = 7;
- } elseif ($myrow['debtorno']=='' AND $myrow['branchcode']==''){
- $RankArray[$i] = 8;
- }
- $i++;
- }
- $LowestRank = 10;
- foreach ($RankArray as $ArrayElement=>$Ranking) {
- if ($Ranking < $LowestRank){
- $LowestRankElement = $ArrayElement;
- $LowestRank = $Ranking;
- }
- }
- return $Prices[$ArrayElement]['Price'];
- }
-}
-?>
\ No newline at end of file
+?>
|
|
From: <dai...@us...> - 2014-02-14 23:29:17
|
Revision: 6575
http://sourceforge.net/p/web-erp/reponame/6575
Author: daintree
Date: 2014-02-14 23:29:14 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Andrew Galuski: Date picker fixes
Modified Paths:
--------------
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/PO_SelectOSPurchOrder.php
trunk/doc/Change.log
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2014-02-14 23:13:15 UTC (rev 6574)
+++ trunk/AddCustomerNotes.php 2014-02-14 23:29:14 UTC (rev 6575)
@@ -203,10 +203,10 @@
echo '<tr>
<td>' . _('Contact Note'). '</td>';
if (isset($_POST['Note'])) {
- echo '<td><textarea name="Note" autofocus required rows="3" cols="32">' .$_POST['Note'] . '</textarea></td>
+ echo '<td><textarea name="Note" autofocus="autofocus" required="required" rows="3" cols="32">' .$_POST['Note'] . '</textarea></td>
</tr>';
} else {
- echo '<td><textarea name="Note" autofocus required rows="3" cols="32"></textarea></td>
+ echo '<td><textarea name="Note" autofocus="autofocus" required="required" rows="3" cols="32"></textarea></td>
</tr>';
}
echo '<tr>
@@ -221,19 +221,19 @@
echo '<tr>
<td>' . _('Date') . '</td>';
if (isset($_POST['NoteDate'])) {
- echo '<td><input type="date" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="10" maxlength="10" /></td>
+ echo '<td><input type="text" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="10" maxlength="10" /></td>
</tr>';
} else {
- echo '<td><input type="date" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" size="10" maxlength="10" /></td>
+ echo '<td><input type="text" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" size="10" maxlength="10" /></td>
</tr>';
}
echo '<tr>
<td>' . _('Priority'). '</td>';
if (isset($_POST['Priority'])) {
- echo '<td><input type="number" required min="1" name="Priority" class="number" value="' . $_POST['Priority']. '" size="1" maxlength="3" /></td>
+ echo '<td><input type="text" class="number" required="required" name="Priority" class="number" value="' . $_POST['Priority']. '" size="1" maxlength="3" /></td>
</tr>';
} else {
- echo '<td><input type=number required min="1" name="Priority" value="1" size="1" maxlength="3"/></td>
+ echo '<td><input type="text" class="number" required="required" name="Priority" value="1" size="1" maxlength="3"/></td>
</tr>';
}
echo '<tr>
@@ -250,4 +250,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2014-02-14 23:13:15 UTC (rev 6574)
+++ trunk/AddCustomerTypeNotes.php 2014-02-14 23:29:14 UTC (rev 6575)
@@ -201,7 +201,7 @@
echo '<tr>
<td>' . _('Contact Group Note').':</td>
- <td><textarea name="Note" autofocus required rows="3" cols="32">' . $_POST['Note'] . '</textarea></td>
+ <td><textarea name="Note" autofocus="autofocus" required="required" rows="3" cols="32">' . $_POST['Note'] . '</textarea></td>
</tr>
<tr>
<td>' . _('Web site').':</td>
@@ -209,11 +209,11 @@
</tr>
<tr>
<td>' . _('Date').':</td>
- <td><input type="date" required name="NoteDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" value="'. $_POST['NoteDate']. '" size="10" maxlength="10" /></td>
+ <td><input type="text" required="required" name="NoteDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" value="'. $_POST['NoteDate']. '" size="10" maxlength="10" /></td>
</tr>
<tr>
<td>' . _('Priority').':</td>
- <td><input type="number" required min="1" class="number" name="Priority" value="'. $_POST['Priority'] .'" size="1" maxlength="3" /></td>
+ <td><input type="text" class="number" name="Priority" value="'. $_POST['Priority'] .'" size="1" maxlength="3" /></td>
</tr>
</table>
<br />
@@ -226,4 +226,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2014-02-14 23:13:15 UTC (rev 6574)
+++ trunk/PO_SelectOSPurchOrder.php 2014-02-14 23:29:14 UTC (rev 6575)
@@ -64,7 +64,7 @@
if (isset($_POST['Keywords']) AND isset($_POST['StockCode'])) {
echo '<div class="page_help_text">' . _('Stock description keywords have been used in preference to the Stock code extract entered') . '.</div>';
}
- If ($_POST['Keywords']) {
+ if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-14 23:13:15 UTC (rev 6574)
+++ trunk/doc/Change.log 2014-02-14 23:29:14 UTC (rev 6575)
@@ -1,6 +1,7 @@
webERP Change Log
-
+15/2/14 Andrew Galuski: Reverse HTML5 input type="date" as this will not use the webERP javascript date picker used everywhere else - better be consistent as html5 date picker functionality varies between browsers - AddCustomerNotes.php and AddCustomerTypeNotes.php
+15/2/14 Vitaly: Fix PO_SelectOSPurchOrder.php date selection functionality
15/2/14 Phil: Fixed POSDataCreation script to send all current prices in the POS currency including debtorno info so the POS can now deal with customer specific prices correctly.
15/2/14 Andrew Galuski: WorkOrderStatus.php now shows requirements for multiple parent item works orders.
12/2/14 Andrew Galuski: WOSerialNos.php - added filter number format on quantity
|
|
From: <dai...@us...> - 2014-02-15 05:01:52
|
Revision: 6578
http://sourceforge.net/p/web-erp/reponame/6578
Author: daintree
Date: 2014-02-15 05:01:48 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
15/2/14 Phil: Stock check comparison report now shows the bin location after the item code
15/2/14 Phil: Customer statement now shows bank account number for payments based on the defined default bank account
Modified Paths:
--------------
trunk/PDFStockCheckComparison.php
trunk/PrintCustStatements.php
trunk/doc/Change.log
trunk/includes/PDFStockCheckPageHeader.inc
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2014-02-15 02:13:34 UTC (rev 6577)
+++ trunk/PDFStockCheckComparison.php 2014-02-15 05:01:48 UTC (rev 6578)
@@ -188,13 +188,17 @@
stockcheckfreeze.loccode,
locations.locationname,
stockcheckfreeze.qoh,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces,
+ bin
FROM stockcheckfreeze INNER JOIN stockmaster
ON stockcheckfreeze.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
INNER JOIN locations
ON stockcheckfreeze.loccode=locations.loccode
- INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN locstock
+ ON stockcheckfreeze.loccode=locstock.loccode
+ AND stockcheckfreeze.stockid=locstock.stockid
ORDER BY stockcheckfreeze.loccode,
stockmaster.categoryid,
stockcheckfreeze.stockid";
@@ -272,7 +276,11 @@
if ($CheckItemRow['qoh']!=0 OR DB_num_rows($Counts)>0) {
$YPos -=$line_height;
$FontSize=8;
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
+ if (mb_strlen($CheckItemRow['bin'])>0){
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin:') . $CheckItemRow['bin'], 'left');
+ } else {
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
+ }
$LeftOvers = $pdf->addTextWrap(135,$YPos,180,$FontSize,$CheckItemRow['description'], 'left');
$LeftOvers = $pdf->addTextWrap(315,$YPos,60,$FontSize,locale_number_format($CheckItemRow['qoh'],$CheckItemRow['decimalplaces']), 'right');
}
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2014-02-15 02:13:34 UTC (rev 6577)
+++ trunk/PrintCustStatements.php 2014-02-15 05:01:48 UTC (rev 6578)
@@ -49,6 +49,25 @@
$FirstStatement = True;
+
+ // check if the user has set a default bank account for invoices, if not leave it blank
+ $sql = "SELECT bankaccounts.invoice,
+ bankaccounts.bankaccountnumber,
+ bankaccounts.bankaccountcode
+ FROM bankaccounts
+ WHERE bankaccounts.invoice = '1'";
+ $result=DB_query($sql,$db,'','',false,false);
+ if (DB_error_no($db)!=1) {
+ if (DB_num_rows($result)==1){
+ $myrow = DB_fetch_array($result);
+ $DefaultBankAccountNumber = $myrow['bankaccountnumber'];
+ } else {
+ $DefaultBankAccountNumber = '';
+ }
+ } else {
+ $DefaultBankAccountNumber = '';
+ }
+
/* Do a quick tidy up to settle any transactions that should have been settled at the time of allocation but for whatever reason weren't */
$ErrMsg = _('There was a problem settling the old transactions.');
$DbgMsg = _('The SQL used to settle outstanding transactions was');
@@ -397,6 +416,11 @@
' ' . _('Amount received was').' ' . locale_number_format($StmtHeader['lastpaid'],$StmtHeader['currdecimalplaces']));
}
+
+ /* Show the bank account details */
+ $pdf->addText($Perforation-250, $Bottom_Margin+32, $FontSize, _('Please make payments to our account:') . ' ' . $DefaultBankAccountNumber);
+ $pdf->addText($Perforation-250, $Bottom_Margin+32-$line_height, $FontSize, _('Quoting your account reference') . ' ' . $StmtHeader['debtorno'] );
+
/*also show the total due in the remittance section */
if ($AgedAnalysis['balance']>0){ /*No point showing a negative balance for payment! */
$FontSize=8;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-15 02:13:34 UTC (rev 6577)
+++ trunk/doc/Change.log 2014-02-15 05:01:48 UTC (rev 6578)
@@ -1,5 +1,8 @@
webERP Change Log
+
15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
+15/2/14 Phil: Stock check comparison report now shows the bin location after the item code
+15/2/14 Phil: Customer statement now shows bank account number for payments based on the defined default bank account
15/2/14 Andrew Galuski: Reverse HTML5 input type="date" as this will not use the webERP javascript date picker used everywhere else - better be consistent as html5 date picker functionality varies between browsers - AddCustomerNotes.php and AddCustomerTypeNotes.php
15/2/14 Vitaly: Fix PO_SelectOSPurchOrder.php date selection functionality
15/2/14 Phil: Fixed POSDataCreation script to send all current prices in the POS currency including debtorno info so the POS can now deal with customer specific prices correctly.
Modified: trunk/includes/PDFStockCheckPageHeader.inc
===================================================================
--- trunk/includes/PDFStockCheckPageHeader.inc 2014-02-15 02:13:34 UTC (rev 6577)
+++ trunk/includes/PDFStockCheckPageHeader.inc 2014-02-15 05:01:48 UTC (rev 6578)
@@ -27,23 +27,15 @@
/*set up the headings */
$Xpos = $Left_Margin+1;
-/*draw vertical lines */
-$pdf->line(370, $YPos+$BoxHeight,370, $Bottom_Margin+24);
-
$LeftOvers = $pdf->addTextWrap($Xpos,$YPos,300-$Left_Margin,$FontSize,_('Item'), 'centre');
if (isset($_POST['ShowInfo']) and $_POST['ShowInfo']==true){
- /*draw vertical lines */
- $pdf->line(415, $YPos-$line_height,415, $Bottom_Margin+24);
- $pdf->line(475, $YPos-$line_height,475, $Bottom_Margin+24);
$LeftOvers = $pdf->addTextWrap(341,$YPos,60,$FontSize,_('QOH'), 'centre');
$LeftOvers = $pdf->addTextWrap(341+61,$YPos,80,$FontSize,_('Cust Ords'), 'centre');
$LeftOvers = $pdf->addTextWrap(341+61+61,$YPos,80,$FontSize,_('Available'), 'centre');
} else {
- /*draw vertical lines */
- $pdf->line(435, $YPos+$BoxHeight,435, $Bottom_Margin+24);
$LeftOvers = $pdf->addTextWrap(371,$YPos,60,$FontSize,_('Quantity'), 'centre');
$LeftOvers = $pdf->addTextWrap(341+61+61,$YPos,80,$FontSize,_('Remarks'), 'centre');
}
$FontSize=10;
$YPos -=($line_height);
-?>
\ No newline at end of file
+?>
|
|
From: <ice...@us...> - 2014-02-15 15:04:56
|
Revision: 6579
http://sourceforge.net/p/web-erp/reponame/6579
Author: icedlava
Date: 2014-02-15 15:04:53 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
StockCounts.php - Enter by Category only counts and enters 10 items maximum - allow any number that are input.
Modified Paths:
--------------
trunk/StockCounts.php
trunk/doc/Change.log
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2014-02-15 05:01:48 UTC (rev 6578)
+++ trunk/StockCounts.php 2014-02-15 15:04:53 UTC (rev 6579)
@@ -32,13 +32,13 @@
echo '<td>' . _('Entering Counts') . '</td><td> <a href="' . $RootPath . '/StockCounts.php?&Action=View">' . _('View Entered Counts') . '</a></td>';
}
echo '</tr></table><br />';
-
if ($_GET['Action'] == 'Enter'){
if (isset($_POST['EnterCounts'])){
$Added=0;
- for ($i=1;$i<=10;$i++){
+ $Counter = isset($_POST['RowCount'])?$_POST['RowCount'] : 10; // Arbitrary number of 10 hard coded as default as originally used - should there be a setting?
+ for ($i=1;$i<=$Counter;$i++){
$InputError =False; //always assume the best to start with
$Quantity = 'Qty_' . $i;
@@ -106,9 +106,9 @@
<th colspan="3">' ._('Stock Check Counts at Location') . ':<select name="Location">';
$sql = 'SELECT loccode, locationname FROM locations';
$result = DB_query($sql,$db);
-
+
while ($myrow=DB_fetch_array($result)){
-
+
if (isset($_POST['Location']) AND $myrow['loccode']==$_POST['Location']){
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
@@ -118,7 +118,7 @@
echo '</select> <input type="submit" name="EnterByCat" value="' . _('Enter By Category') . '" /><select name="StkCat" onChange="ReloadForm(EnterCountsForm.EnterByCat)" >';
echo '<option value="">' . _('Not Yet Selected') . '</option>';
-
+
while ($myrow=DB_fetch_array($CatsResult)){
if ($_POST['StkCat']==$myrow['categoryid']) {
echo '<option selected="selected" value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
@@ -127,14 +127,12 @@
}
}
echo '</select></th></tr>';
-
-
-
+
if (isset($_POST['EnterByCat'])){
-
+
$StkCatResult = DB_query("SELECT categorydescription FROM stockcategory WHERE categoryid='" . $_POST['StkCat'] . "'",$db);
$StkCatRow = DB_fetch_row($StkCatResult);
-
+
echo '<tr>
<th colspan="4">' . _('Entering Counts For Stock Category') . ': ' . $StkCatRow[0] . '</th>
</tr>
@@ -150,18 +148,18 @@
ON stockcheckfreeze.stockid=stockmaster.stockid
WHERE categoryid='" . $_POST['StkCat'] . "'
ORDER BY stockcheckfreeze.stockid",$db);
-
- $i=1;
+
+ $RowCount=1;
while ($StkRow = DB_fetch_array($StkItemsResult)) {
echo '<tr>
- <td><input type="hidden" name="StockID_' . $i . '" value="' . $StkRow['stockid'] . '" />' . $StkRow['stockid'] . '</td>
+ <td><input type="hidden" name="StockID_' . $RowCount . '" value="' . $StkRow['stockid'] . '" />' . $StkRow['stockid'] . '</td>
<td>' . $StkRow['description'] . '</td>
- <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
- <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="Qty_' . $RowCount . '" maxlength="10" size="10" /></td>
+ <td><input type="text" name="Ref_' . $RowCount . '" maxlength="20" size="20" /></td>
</tr>';
- $i++;
+ $RowCount++;
}
-
+
} else {
echo '<tr>
<th>' . _('Bar Code') . '</th>
@@ -169,22 +167,23 @@
<th>' . _('Quantity') . '</th>
<th>' . _('Reference') . '</th>
</tr>';
-
- for ($i=1;$i<=10;$i++){
-
+
+ for ($RowCount=1;$RowCount<=10;$RowCount++){
+
echo '<tr>
- <td><input type="text" name="BarCode_' . $i . '" maxlength="20" size="20" /></td>
- <td><input type="text" name="StockID_' . $i . '" maxlength="20" size="20" /></td>
- <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
- <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="BarCode_' . $RowCount . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="StockID_' . $RowCount . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="Qty_' . $RowCount . '" maxlength="10" size="10" /></td>
+ <td><input type="text" name="Ref_' . $RowCount . '" maxlength="20" size="20" /></td>
</tr>';
-
+
}
}
-
+
echo '</table>
<br />
<div class="centre">
+ <input type="hidden" name="RowCount" value="' .$RowCount . '" />
<input type="submit" name="EnterCounts" value="' . _('Enter Above Counts') . '" />
</div>';
} // there is a stock check to enter counts for
@@ -231,5 +230,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-15 05:01:48 UTC (rev 6578)
+++ trunk/doc/Change.log 2014-02-15 15:04:53 UTC (rev 6579)
@@ -1,8 +1,9 @@
webERP Change Log
-15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
+16/2/14 icedlava: StockCounts.php - Enter by Category only counts and enters 10 items maximum - fix to allow any number that are input.
+15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
15/2/14 Phil: Stock check comparison report now shows the bin location after the item code
-15/2/14 Phil: Customer statement now shows bank account number for payments based on the defined default bank account
+15/2/14 Phil: Customer statement now shows bank account number for payments based on the defined default bank account
15/2/14 Andrew Galuski: Reverse HTML5 input type="date" as this will not use the webERP javascript date picker used everywhere else - better be consistent as html5 date picker functionality varies between browsers - AddCustomerNotes.php and AddCustomerTypeNotes.php
15/2/14 Vitaly: Fix PO_SelectOSPurchOrder.php date selection functionality
15/2/14 Phil: Fixed POSDataCreation script to send all current prices in the POS currency including debtorno info so the POS can now deal with customer specific prices correctly.
|
|
From: <ice...@us...> - 2014-02-17 00:39:42
|
Revision: 6580
http://sourceforge.net/p/web-erp/reponame/6580
Author: icedlava
Date: 2014-02-17 00:39:38 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
SQL fixes for insert to bom and locstock tables - ensure column counts match values even when zero
Modified Paths:
--------------
trunk/CopyBOM.php
trunk/doc/Change.log
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2014-02-15 15:04:53 UTC (rev 6579)
+++ trunk/CopyBOM.php 2014-02-17 00:39:38 UTC (rev 6580)
@@ -121,6 +121,7 @@
$sql = "INSERT INTO bom
SELECT '".$NewStockID."' AS parent,
+ sequence,
component,
workcentreadded,
loccode,
@@ -133,7 +134,12 @@
$result = DB_query($sql, $db);
if($NewOrExisting == 'N') {
- $sql = "INSERT INTO locstock
+ $sql = "INSERT INTO locstock (
+ loccode,
+ stockid,
+ quantity,
+ reorderlevel
+ )
SELECT loccode,
'".$NewStockID."' AS stockid,
0 AS quantity,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-15 15:04:53 UTC (rev 6579)
+++ trunk/doc/Change.log 2014-02-17 00:39:38 UTC (rev 6580)
@@ -1,5 +1,6 @@
webERP Change Log
+17/2/14 icedlava: CopyBOM.php - SQL fix for insert to bom and locstock tables - ensure column counts match values even when zero.
16/2/14 icedlava: StockCounts.php - Enter by Category only counts and enters 10 items maximum - fix to allow any number that are input.
15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
15/2/14 Phil: Stock check comparison report now shows the bin location after the item code
|
|
From: <ex...@us...> - 2014-02-17 03:44:55
|
Revision: 6581
http://sourceforge.net/p/web-erp/reponame/6581
Author: exsonqu
Date: 2014-02-17 03:44:51 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Exson: Tidy up variable overwrite to if else structure in WorkOrderReceive.php scripts according Tim's comments.
Modified Paths:
--------------
trunk/WorkOrderReceive.php
trunk/doc/Change.log
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2014-02-17 00:39:38 UTC (rev 6580)
+++ trunk/WorkOrderReceive.php 2014-02-17 03:44:51 UTC (rev 6581)
@@ -508,7 +508,8 @@
$QualityText ='';
}
- $SQL = "INSERT INTO stockserialitems (stockid,
+ if(empty($_POST['ExpiryDate'])){
+ $SQL = "INSERT INTO stockserialitems (stockid,
loccode,
serialno,
quantity,
@@ -518,8 +519,7 @@
'" . $_POST['SerialNo' . $i] . "',
1,
'" . $QualityText . "')";
- // Store expiry date for perishable product
- if(!empty($_POST['ExpiryDate'])){
+ }else{// Store expiry date for perishable product
$SQL = "INSERT INTO stockserialitems(stockid,
loccode,
@@ -595,7 +595,8 @@
AND loccode = '" . $_POST['IntoLocation'] . "'
AND serialno = '" . $_POST['BatchRef' .$i] . "'";
} else {
- $SQL = "INSERT INTO stockserialitems (stockid,
+ if(empty($_POST['ExpiryDate'])){
+ $SQL = "INSERT INTO stockserialitems (stockid,
loccode,
serialno,
quantity,
@@ -605,9 +606,9 @@
'" . $_POST['BatchRef' . $i] . "',
'" . filter_number_format($_POST['Qty'.$i]) . "',
'" . $_POST['QualityText'] . "')";
- //If it's a perishable product, add expiry date
+
- if(!empty($_POST['ExpiryDate'])){
+ }else{ //If it's a perishable product, add expiry date
$SQL = "INSERT INTO stockserialitems (stockid,
loccode,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-17 00:39:38 UTC (rev 6580)
+++ trunk/doc/Change.log 2014-02-17 03:44:51 UTC (rev 6581)
@@ -1,5 +1,5 @@
webERP Change Log
-
+17/2/14 Exson: Tidy up variable overwrite to if else structure in WorkOrderReceive.php scripts according Tim's comments.
17/2/14 icedlava: CopyBOM.php - SQL fix for insert to bom and locstock tables - ensure column counts match values even when zero.
16/2/14 icedlava: StockCounts.php - Enter by Category only counts and enters 10 items maximum - fix to allow any number that are input.
15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
|
|
From: <ice...@us...> - 2014-02-19 12:16:42
|
Revision: 6585
http://sourceforge.net/p/web-erp/reponame/6585
Author: icedlava
Date: 2014-02-19 12:16:39 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
GLTrialBalance_csv.php - Remove set AllowAnyone variable and prevent TB display - temp solution.
Modified Paths:
--------------
trunk/GLTrialBalance_csv.php
trunk/doc/Change.log
Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php 2014-02-18 06:16:27 UTC (rev 6584)
+++ trunk/GLTrialBalance_csv.php 2014-02-19 12:16:39 UTC (rev 6585)
@@ -10,7 +10,7 @@
* also need to work on authentication with username and password sent too*/
-$AllowAnyone = true;
+//$AllowAnyone = true;
//Page must be called with GLTrialBalance_csv.php?CompanyName=XXXXX&FromPeriod=Y&ToPeriod=Z
$_POST['CompanyNameField'] = $_GET['CompanyName'];
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-18 06:16:27 UTC (rev 6584)
+++ trunk/doc/Change.log 2014-02-19 12:16:39 UTC (rev 6585)
@@ -1,4 +1,5 @@
webERP Change Log
+19/2/14 icedlava: GLTrialBalance_csv.php -Remove set AllowAnyone variable and prevent TB display - temp solution.
18/2/14 Exson: Remove redundant code in StockLocStatus.php and InventoryPlanning.php.
17/2/14 Exson: Tidy up variable overwrite to if else structure in WorkOrderReceive.php scripts according Tim's comments.
17/2/14 icedlava: CopyBOM.php - SQL fix for insert to bom and locstock tables - ensure column counts match values even when zero.
|
|
From: <ex...@us...> - 2014-02-24 14:32:12
|
Revision: 6588
http://sourceforge.net/p/web-erp/reponame/6588
Author: exsonqu
Date: 2014-02-24 14:32:08 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer available for PastDueDays1 and PastDueDays2 in SystemParameters.php.
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-02-22 05:58:55 UTC (rev 6587)
+++ trunk/SystemParameters.php 2014-02-24 14:32:08 UTC (rev 6588)
@@ -397,12 +397,12 @@
// PastDueDays1
echo '<tr style="outline: 1px solid"><td>' . _('First Overdue Deadline in (days)') . ':</td>
- <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[\d]+" title="'._('The input must be integer').'" name="X_PastDueDays1" value="' . $_SESSION['PastDueDays1'] . '" size="3" maxlength="3" /></td>
+ <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[-\d]+" title="'._('The input must be integer').'" name="X_PastDueDays1" value="' . $_SESSION['PastDueDays1'] . '" size="3" maxlength="3" /></td>
<td>' . _('Customer and supplier balances are displayed as overdue by this many days. This parameter is used on customer and supplier enquiry screens and aged listings') . '</td></tr>';
// PastDueDays2
echo '<tr style="outline: 1px solid"><td>' . _('Second Overdue Deadline in (days)') . ':</td>
- <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[\d]+" title="'._('The input must be integer').'" name="X_PastDueDays2" value="' . $_SESSION['PastDueDays2'] . '" size="3" maxlength="3" /></td>
+ <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[-\d]+" title="'._('The input must be integer').'" name="X_PastDueDays2" value="' . $_SESSION['PastDueDays2'] . '" size="3" maxlength="3" /></td>
<td>' . _('As above but the next level of overdue') . '</td></tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-22 05:58:55 UTC (rev 6587)
+++ trunk/doc/Change.log 2014-02-24 14:32:08 UTC (rev 6588)
@@ -1,4 +1,5 @@
webERP Change Log
+24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.
22/2/14 Exson: Fixed the wrong error messages displayed while input date data manually in MiscFunctions.js.
19/2/14 icedlava: GLTrialBalance_csv.php -Remove set AllowAnyone variable and prevent TB display - temp solution.
18/2/14 Exson: Remove redundant code in StockLocStatus.php and InventoryPlanning.php.
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2014-02-22 05:58:55 UTC (rev 6587)
+++ trunk/javascripts/MiscFunctions.js 2014-02-24 14:32:08 UTC (rev 6588)
@@ -20,7 +20,7 @@
else return true;
kC=String.fromCharCode(k);
if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
- else if ((("0123456789").indexOf(kC)>-1)) return true;
+ else if ((("0123456789-").indexOf(kC)>-1)) return true;
else return false;
}
function rLocaleNumber(){
|
|
From: <tu...@us...> - 2014-03-01 16:03:43
|
Revision: 6591
http://sourceforge.net/p/web-erp/reponame/6591
Author: turbopt
Date: 2014-03-01 16:03:37 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Correct variable spelling error. [reported in forums by serakfalcon]
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/doc/Change.log
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2014-02-28 12:54:29 UTC (rev 6590)
+++ trunk/AccountGroups.php 2014-03-01 16:03:37 UTC (rev 6591)
@@ -227,7 +227,7 @@
$GroupResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
while ($GroupRow = DB_fetch_array($GroupResult) ) {
- if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$RroupRow['groupname']) {
+ if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$GroupRow['groupname']) {
echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8'). '</option>';
} else {
echo '<option value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-02-28 12:54:29 UTC (rev 6590)
+++ trunk/doc/Change.log 2014-03-01 16:03:37 UTC (rev 6591)
@@ -1,4 +1,5 @@
webERP Change Log
+1/3/14 Paul T: Correct variable spelling error. [reported in forums by serakfalcon]
24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.
22/2/14 Exson: Fixed the wrong error messages displayed while input date data manually in MiscFunctions.js.
19/2/14 icedlava: GLTrialBalance_csv.php -Remove set AllowAnyone variable and prevent TB display - temp solution.
|
|
From: <dai...@us...> - 2014-03-02 08:41:45
|
Revision: 6592
http://sourceforge.net/p/web-erp/reponame/6592
Author: daintree
Date: 2014-03-02 08:41:40 +0000 (Sun, 02 Mar 2014)
Log Message:
-----------
make sequence in TB a number for sorting
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/BOMs.php
trunk/BankAccountUsers.php
trunk/BankMatching.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerPurchases.php
trunk/CustomerReceipt.php
trunk/Customers.php
trunk/ExchangeRateTrend.php
trunk/FixedAssetCategories.php
trunk/GLAccountInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/InternalStockRequestAuthorisation.php
trunk/InventoryPlanning.php
trunk/InventoryValuation.php
trunk/MaintenanceTasks.php
trunk/PDFGrn.php
trunk/PDFQuotation.php
trunk/PDFReceipt.php
trunk/PDFStockCheckComparison.php
trunk/PO_SelectOSPurchOrder.php
trunk/Payments.php
trunk/PriceMatrix.php
trunk/PrintCustStatements.php
trunk/ReorderLevel.php
trunk/SalesTopCustomersInquiry.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/StockAdjustments.php
trunk/StockCategories.php
trunk/StockLocStatus.php
trunk/StockTransfers.php
trunk/SuppInvGRNs.php
trunk/SuppPaymentRun.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/includes/Add_SerialItems.php
trunk/includes/CountriesArray.php
trunk/includes/CurrenciesArray.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/FreightCalculation.inc
trunk/includes/GetPrice.inc
trunk/includes/InputSerialItemsExisting.php
trunk/includes/Login.php
trunk/includes/MiscFunctions.php
trunk/includes/PDFPickingListHeader.inc
trunk/includes/PDFQuotationPageHeader.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFStockComparisonPageHeader.inc
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/Z_POSDataCreation.php
trunk/includes/htmlMimeMail.php
trunk/includes/session.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AccountGroups.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -319,7 +319,7 @@
echo '<td>' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
<td>' . $myrow['sectionname'] . '</td>
- <td>' . $myrow['sequenceintb'] . '</td>
+ <td class="number">' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AddCustomerNotes.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -250,4 +250,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AddCustomerTypeNotes.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -226,4 +226,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AgedDebtors.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -531,4 +531,4 @@
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BOMs.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -969,4 +969,4 @@
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BankAccountUsers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -229,4 +229,4 @@
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BankMatching.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -354,4 +354,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CopyBOM.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -208,4 +208,4 @@
include('includes/footer.inc');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CounterReturns.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1849,4 +1849,4 @@
}
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CounterSales.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -2452,4 +2452,4 @@
echo '</form>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Credit_Invoice.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1602,4 +1602,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerAllocations.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -631,4 +631,4 @@
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerBranches.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -991,4 +991,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerInquiry.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -554,4 +554,4 @@
echo '</table>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerPurchases.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -108,4 +108,4 @@
echo '<br /><div class="centre"><a href="SelectCustomer.php">' . _('Return to customer selection screen') . '</a></div><br />';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerReceipt.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1240,4 +1240,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Customers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1199,4 +1199,4 @@
} // end of main ifs
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/ExchangeRateTrend.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -73,4 +73,4 @@
</table>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/FixedAssetCategories.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -353,4 +353,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLAccountInquiry.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -336,4 +336,4 @@
echo '<p>' . $IntegrityReport;
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLProfit_Loss.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1296,4 +1296,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLTrialBalance.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -738,4 +738,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLTrialBalance_csv.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -80,4 +80,4 @@
}
echo $CSV_File;
-?>
+?>
\ No newline at end of file
Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InternalStockRequestAuthorisation.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -124,4 +124,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InventoryPlanning.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -456,4 +456,4 @@
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InventoryValuation.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -298,4 +298,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/MaintenanceTasks.php
===================================================================
--- trunk/MaintenanceTasks.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/MaintenanceTasks.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -243,4 +243,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFGrn.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -179,4 +179,4 @@
echo '<br /><a href="'.$RootPath.'/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFQuotation.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -273,4 +273,4 @@
$pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
-?>
+?>
\ No newline at end of file
Modified: trunk/PDFReceipt.php
===================================================================
--- trunk/PDFReceipt.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFReceipt.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -122,4 +122,4 @@
$LeftOvers = $pdf->addTextWrap(50,$YPos,300,$FontSize,'______________________________________________________________________________');
$pdf->Output('Receipt-'.$_GET['ReceiptNumber'], 'I');
-?>
+?>
\ No newline at end of file
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFStockCheckComparison.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -376,4 +376,4 @@
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PO_SelectOSPurchOrder.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -570,4 +570,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Payments.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1143,4 +1143,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PriceMatrix.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -186,4 +186,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PrintCustStatements.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -476,4 +476,4 @@
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/ReorderLevel.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -309,4 +309,4 @@
// $YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader() function
-?>
+?>
\ No newline at end of file
Modified: trunk/SalesTopCustomersInquiry.php
===================================================================
--- trunk/SalesTopCustomersInquiry.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SalesTopCustomersInquiry.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -267,4 +267,4 @@
} //end of if user hit show sales
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SelectOrderItems.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1930,4 +1930,4 @@
}#end of else not selecting a customer
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SelectProduct.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -827,4 +827,4 @@
/* end display list if there is more than one record */
include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockAdjustments.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -527,4 +527,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockCategories.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -649,4 +649,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockLocStatus.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -339,4 +339,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockTransfers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -586,4 +586,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SuppInvGRNs.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -308,4 +308,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SuppPaymentRun.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -376,4 +376,4 @@
</form>';
include ('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Suppliers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1080,4 +1080,4 @@
} // end of main ifs
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SystemParameters.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -1143,4 +1143,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/UserSettings.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -217,4 +217,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WOSerialNos.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -347,5 +347,4 @@
</form>';
include('includes/footer.inc');
-
-?>
+?>
\ No newline at end of file
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WorkOrderReceive.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -996,4 +996,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WorkOrderStatus.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -135,4 +135,4 @@
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geo_displaymap_customers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -118,4 +118,4 @@
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.inc');
?>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geo_displaymap_suppliers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -118,4 +118,4 @@
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.inc');
?>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geocode.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -144,4 +144,4 @@
}
echo '<br /><div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go back to Geocode Setup') . '</a></div>';
include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/geocode_genxml_customers.php
===================================================================
--- trunk/geocode_genxml_customers.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geocode_genxml_customers.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -39,5 +39,4 @@
// End XML file
echo '</markers>';
-
?>
\ No newline at end of file
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Add_SerialItems.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -345,4 +345,4 @@
if (isset($_GET['Delete'])){
unset($LineItem->SerialItems[$_GET['Delete']]);
}
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/CountriesArray.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -213,4 +213,4 @@
$CountriesArray['ZW'] = _('Zimbabwe');
asort($CountriesArray);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/CurrenciesArray.php
===================================================================
--- trunk/includes/CurrenciesArray.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/CurrenciesArray.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -188,4 +188,4 @@
// END: AlphabeticCode and CurrencyName data.
asort($CurrencyName);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/DefineSuppTransClass.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -514,5 +514,4 @@
$this->TaxGLCode = $TaxGLCode;
}
}
-
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/FreightCalculation.inc
===================================================================
--- trunk/includes/FreightCalculation.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/FreightCalculation.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -124,5 +124,4 @@
return array ($CalcFreightCost, $CalcBestShipper);
}
-
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/GetPrice.inc
===================================================================
--- trunk/includes/GetPrice.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/GetPrice.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -173,4 +173,4 @@
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/InputSerialItemsExisting.php
===================================================================
--- trunk/includes/InputSerialItemsExisting.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/InputSerialItemsExisting.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -67,3 +67,4 @@
}
echo '</tr></table>';
}
+?>
\ No newline at end of file
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Login.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -113,4 +113,4 @@
<div style="text-align:center"><a href="https://sourceforge.net/projects/web-erp"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/MiscFunctions.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -449,5 +449,4 @@
echo ' ... ' . _('completed');
}
-
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFPickingListHeader.inc
===================================================================
--- trunk/includes/PDFPickingListHeader.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFPickingListHeader.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -87,4 +87,4 @@
$pdf->line($FormDesign->ColumnLine4->startx, $Page_Height -$FormDesign->ColumnLine4->starty,$FormDesign->ColumnLine4->endx, $Page_Height -$FormDesign->ColumnLine4->endy);
$pdf->line($FormDesign->ColumnLine5->startx, $Page_Height -$FormDesign->ColumnLine5->starty,$FormDesign->ColumnLine5->endx, $Page_Height -$FormDesign->ColumnLine5->endy);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFQuotationPageHeader.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -112,4 +112,4 @@
$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+350);
$YPos -= (2*$line_height);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFStarter.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -182,5 +182,4 @@
$pdf->AddPage();
$pdf->cMargin = 0;
/* END Brought from class.pdf.php constructor */
-
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFStockComparisonPageHeader.inc
===================================================================
--- trunk/includes/PDFStockComparisonPageHeader.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFStockComparisonPageHeader.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -38,4 +38,4 @@
$FontSize=10;
$YPos -=(2*$line_height);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFTransPageHeader.inc
===================================================================
--- trunk/includes/PDFTransPageHeader.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFTransPageHeader.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -219,4 +219,4 @@
$YPos -= ($line_height);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc 2014-03-02 08:41:40 UTC (rev 6592)
@@ -276,4 +276,4 @@
$YPos -= ($line_height);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php 2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Z_POSDataCreation.php 2014-03-02 08:41:40 UTC (rev 6592)
@@ -122,18 +122,19 @@
fwrite($FileHandle,"DELETE FROM stockmaster;\n");
- $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
+ $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
while ($myrow = DB_fetch_array($result)) {
- fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape (str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape (...
[truncated message content] |
|
From: <dai...@us...> - 2014-03-02 08:45:23
|
Revision: 6593
http://sourceforge.net/p/web-erp/reponame/6593
Author: daintree
Date: 2014-03-02 08:45:18 +0000 (Sun, 02 Mar 2014)
Log Message:
-----------
lose trailing blank lines
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/api/api_php.php
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2014-03-02 08:41:40 UTC (rev 6592)
+++ trunk/UpgradeDatabase.php 2014-03-02 08:45:18 UTC (rev 6593)
@@ -273,4 +273,4 @@
} /*Dont do upgrade */
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/api/api_php.php
===================================================================
--- trunk/api/api_php.php 2014-03-02 08:41:40 UTC (rev 6592)
+++ trunk/api/api_php.php 2014-03-02 08:45:18 UTC (rev 6593)
@@ -61,4 +61,4 @@
include 'api_workorders.php';
include 'api_webERPsettings.php';
-?>
+?>
\ No newline at end of file
|
Thanks for helping keep SourceForge clean.
X