details: https://code.openbravo.com/erp/devel/main/rev/8cfdcbe2f1cf changeset: 19007:8cfdcbe2f1cf user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Dec 10 12:07:03 2012 +0100 summary: Fixed issue 22497: reserveStockManual is not defined correctly
details: https://code.openbravo.com/erp/devel/main/rev/0e2dc4fbb857 changeset: 19008:0e2dc4fbb857 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Wed Dec 12 11:30:34 2012 +0100 summary: fixed issue 22524: The document status is taking into account the discounts details: https://code.openbravo.com/erp/devel/main/rev/4e1a6f5afaab changeset: 19009:4e1a6f5afaab user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Dec 12 12:43:13 2012 +0100 summary: Related to Issue 22353. Removes Parameters from Parameter Window and uses fields from GLJournal Lines. details: https://code.openbravo.com/erp/devel/main/rev/888d6b7e865a changeset: 19010:888d6b7e865a user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Dec 12 19:26:20 2012 +0100 summary: Fixes Issues 22532, 22537. Checks before inserting a record in M_MatchPO if there is an existing one. Checks in query if the document status of the related M_InoutLine is Draft. details: https://code.openbravo.com/erp/devel/main/rev/0e0ca6cb8c45 changeset: 19011:0e0ca6cb8c45 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Dec 12 17:34:26 2012 +0100 summary: Fixes Issue 22538. Hide Update Actuals button in Budget Window. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml | 105 ---------- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java | 5 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java | 22 +- src-db/database/model/functions/M_INOUT_POST.xml | 61 +++-- src-db/database/model/tables/GL_JOURNALLINE.xml | 6 +- src-db/database/sourcedata/AD_COLUMN.xml | 52 ++++- src-db/database/sourcedata/AD_FIELD.xml | 38 +++- src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 5 +- src/org/openbravo/materialmgmt/ReservationUtils_data.xsql | 2 +- 12 files changed, 134 insertions(+), 168 deletions(-) diffs (truncated from 584 to 300 lines): diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue Dec 11 22:15:20 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Dec 12 17:34:26 2012 +0100 @@ -8238,7 +8238,7 @@ <!--E206BFA90CC94498B257BC65C516B9C5--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--E206BFA90CC94498B257BC65C516B9C5--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--E206BFA90CC94498B257BC65C516B9C5--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--E206BFA90CC94498B257BC65C516B9C5--> <POSITION><![CDATA[38]]></POSITION> +<!--E206BFA90CC94498B257BC65C516B9C5--> <POSITION><![CDATA[42]]></POSITION> <!--E206BFA90CC94498B257BC65C516B9C5--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--E206BFA90CC94498B257BC65C516B9C5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--E206BFA90CC94498B257BC65C516B9C5--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Tue Dec 11 22:15:20 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Dec 12 17:34:26 2012 +0100 @@ -795,7 +795,7 @@ <!--110FB2A04E69473784A8478D0BD8B3FB--> <AD_COLUMN_ID><![CDATA[E206BFA90CC94498B257BC65C516B9C5]]></AD_COLUMN_ID> <!--110FB2A04E69473784A8478D0BD8B3FB--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--110FB2A04E69473784A8478D0BD8B3FB--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--110FB2A04E69473784A8478D0BD8B3FB--> <DISPLAYLOGIC><![CDATA[@NumberOfAcctSchemas@=1 & @FIN_Payment_ID@='' & @Processed@='Y']]></DISPLAYLOGIC> +<!--110FB2A04E69473784A8478D0BD8B3FB--> <DISPLAYLOGIC><![CDATA[@NumberOfAcctSchemas@=1 & @FIN_Payment_ID@='' & @Processed@='Y' & @Open_Items@='Y']]></DISPLAYLOGIC> <!--110FB2A04E69473784A8478D0BD8B3FB--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--110FB2A04E69473784A8478D0BD8B3FB--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--110FB2A04E69473784A8478D0BD8B3FB--> <SEQNO><![CDATA[240]]></SEQNO> diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Tue Dec 11 22:15:20 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Wed Dec 12 17:34:26 2012 +0100 @@ -1,26 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> <data> -<!--173E22F30A234210BE895DBB291AE971--><AD_PROCESS_PARA> -<!--173E22F30A234210BE895DBB291AE971--> <AD_PROCESS_PARA_ID><![CDATA[173E22F30A234210BE895DBB291AE971]]></AD_PROCESS_PARA_ID> -<!--173E22F30A234210BE895DBB291AE971--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--173E22F30A234210BE895DBB291AE971--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--173E22F30A234210BE895DBB291AE971--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--173E22F30A234210BE895DBB291AE971--> <NAME><![CDATA[Payment Method]]></NAME> -<!--173E22F30A234210BE895DBB291AE971--> <DESCRIPTION><![CDATA[It is the method by which payment is expected to be made or received.]]></DESCRIPTION> -<!--173E22F30A234210BE895DBB291AE971--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--173E22F30A234210BE895DBB291AE971--> <SEQNO><![CDATA[40]]></SEQNO> -<!--173E22F30A234210BE895DBB291AE971--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> -<!--173E22F30A234210BE895DBB291AE971--> <AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID> -<!--173E22F30A234210BE895DBB291AE971--> <AD_VAL_RULE_ID><![CDATA[959ADF046AFE4F509ABC6E2F41F9DB04]]></AD_VAL_RULE_ID> -<!--173E22F30A234210BE895DBB291AE971--> <COLUMNNAME><![CDATA[fin_paymentmethod_id]]></COLUMNNAME> -<!--173E22F30A234210BE895DBB291AE971--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--173E22F30A234210BE895DBB291AE971--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> -<!--173E22F30A234210BE895DBB291AE971--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> -<!--173E22F30A234210BE895DBB291AE971--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--173E22F30A234210BE895DBB291AE971--> <DEFAULTVALUE><![CDATA[@SQL=SELECT CASE WHEN (@FIN_PAYMENTMETHOD_ID@ IS NOT NULL AND @FIN_PAYMENTMETHOD_ID@ <> COALESCE('','-1')) THEN @FIN_PAYMENTMETHOD_ID@ ELSE (CASE WHEN (TO_NUMBER(@AmtAcctDr@) - TO_NUMBER(@AmtAcctCr@) > 0) THEN fin_paymentmethod_id ELSE po_paymentmethod_id END) END FROM C_BPARTNER WHERE C_BPARTNER_ID = @C_BPARTNER_ID@]]></DEFAULTVALUE> -<!--173E22F30A234210BE895DBB291AE971--> <AD_ELEMENT_ID><![CDATA[7DC34559B411B45BE040007F0100784A]]></AD_ELEMENT_ID> -<!--173E22F30A234210BE895DBB291AE971--></AD_PROCESS_PARA> - <!--1913962D2952412B84B8CDD3BC17026F--><AD_PROCESS_PARA> <!--1913962D2952412B84B8CDD3BC17026F--> <AD_PROCESS_PARA_ID><![CDATA[1913962D2952412B84B8CDD3BC17026F]]></AD_PROCESS_PARA_ID> <!--1913962D2952412B84B8CDD3BC17026F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -42,24 +21,6 @@ <!--1913962D2952412B84B8CDD3BC17026F--> <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID> <!--1913962D2952412B84B8CDD3BC17026F--></AD_PROCESS_PARA> -<!--28734F2240554E628433520DBFA0A75A--><AD_PROCESS_PARA> -<!--28734F2240554E628433520DBFA0A75A--> <AD_PROCESS_PARA_ID><![CDATA[28734F2240554E628433520DBFA0A75A]]></AD_PROCESS_PARA_ID> -<!--28734F2240554E628433520DBFA0A75A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--28734F2240554E628433520DBFA0A75A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--28734F2240554E628433520DBFA0A75A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--28734F2240554E628433520DBFA0A75A--> <NAME><![CDATA[Date]]></NAME> -<!--28734F2240554E628433520DBFA0A75A--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--28734F2240554E628433520DBFA0A75A--> <SEQNO><![CDATA[50]]></SEQNO> -<!--28734F2240554E628433520DBFA0A75A--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> -<!--28734F2240554E628433520DBFA0A75A--> <COLUMNNAME><![CDATA[Date]]></COLUMNNAME> -<!--28734F2240554E628433520DBFA0A75A--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--28734F2240554E628433520DBFA0A75A--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> -<!--28734F2240554E628433520DBFA0A75A--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> -<!--28734F2240554E628433520DBFA0A75A--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--28734F2240554E628433520DBFA0A75A--> <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE> -<!--28734F2240554E628433520DBFA0A75A--> <AD_ELEMENT_ID><![CDATA[17ADA898A5534B858EC8BD7651492088]]></AD_ELEMENT_ID> -<!--28734F2240554E628433520DBFA0A75A--></AD_PROCESS_PARA> - <!--4F5EE1017087464EAD95F3CCA4C5AFA5--><AD_PROCESS_PARA> <!--4F5EE1017087464EAD95F3CCA4C5AFA5--> <AD_PROCESS_PARA_ID><![CDATA[4F5EE1017087464EAD95F3CCA4C5AFA5]]></AD_PROCESS_PARA_ID> <!--4F5EE1017087464EAD95F3CCA4C5AFA5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -81,28 +42,6 @@ <!--4F5EE1017087464EAD95F3CCA4C5AFA5--> <AD_ELEMENT_ID><![CDATA[208]]></AD_ELEMENT_ID> <!--4F5EE1017087464EAD95F3CCA4C5AFA5--></AD_PROCESS_PARA> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--><AD_PROCESS_PARA> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_PROCESS_PARA_ID><![CDATA[65B5C8CA308F46988BDE3E31BC1D78C8]]></AD_PROCESS_PARA_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <NAME><![CDATA[Business Partner]]></NAME> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <HELP><![CDATA[A Business Partner is anyone with whom you transact. This can include a customer, vendor, employee or any combination of these.]]></HELP> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <SEQNO><![CDATA[10]]></SEQNO> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_REFERENCE_VALUE_ID><![CDATA[138]]></AD_REFERENCE_VALUE_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_VAL_RULE_ID><![CDATA[E491153CCBEE49A1842A7CC8544929DD]]></AD_VAL_RULE_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <COLUMNNAME><![CDATA[c_bpartner_para_id]]></COLUMNNAME> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <DEFAULTVALUE><![CDATA[@C_BPARTNER_ID@]]></DEFAULTVALUE> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--> <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID> -<!--65B5C8CA308F46988BDE3E31BC1D78C8--></AD_PROCESS_PARA> - <!--6EEE4A4DB1BA476BA7929EC7FCF285F8--><AD_PROCESS_PARA> <!--6EEE4A4DB1BA476BA7929EC7FCF285F8--> <AD_PROCESS_PARA_ID><![CDATA[6EEE4A4DB1BA476BA7929EC7FCF285F8]]></AD_PROCESS_PARA_ID> <!--6EEE4A4DB1BA476BA7929EC7FCF285F8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -268,50 +207,6 @@ <!--D04309BB0DA14B5789FB76C141ED464C--> <AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID> <!--D04309BB0DA14B5789FB76C141ED464C--></AD_PROCESS_PARA> -<!--D2D748A3C65F4976B4461635A04EFA5F--><AD_PROCESS_PARA> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_PROCESS_PARA_ID><![CDATA[D2D748A3C65F4976B4461635A04EFA5F]]></AD_PROCESS_PARA_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <NAME><![CDATA[Financial Account]]></NAME> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <SEQNO><![CDATA[30]]></SEQNO> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_REFERENCE_VALUE_ID><![CDATA[DF1CEA94B3564A33AFDB37C07E1CE353]]></AD_REFERENCE_VALUE_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_VAL_RULE_ID><![CDATA[4DB5167147F24078A1FD39DC7564B48D]]></AD_VAL_RULE_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <COLUMNNAME><![CDATA[fin_financial_account_id]]></COLUMNNAME> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <DEFAULTVALUE><![CDATA[@SQL=SELECT CASE WHEN (@FIN_FINANCIAL_ACCOUNT_ID@ IS NOT NULL AND @FIN_FINANCIAL_ACCOUNT_ID@ <> COALESCE('','-1')) THEN @FIN_FINANCIAL_ACCOUNT_ID@ ELSE (CASE WHEN ((TO_NUMBER(@AmtAcctDr@) - TO_NUMBER(@AmtAcctCr@)) > 0) THEN fin_financial_account_id ELSE po_financial_account_id END) END FROM C_BPARTNER WHERE C_BPARTNER_ID = @C_BPARTNER_ID@]]></DEFAULTVALUE> -<!--D2D748A3C65F4976B4461635A04EFA5F--> <AD_ELEMENT_ID><![CDATA[7891269C840C655DE040007F010155CE]]></AD_ELEMENT_ID> -<!--D2D748A3C65F4976B4461635A04EFA5F--></AD_PROCESS_PARA> - -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--><AD_PROCESS_PARA> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_PROCESS_PARA_ID><![CDATA[DC3ADA42B2C443B79ACD6215AD5D9C31]]></AD_PROCESS_PARA_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <NAME><![CDATA[G/L Item]]></NAME> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <HELP><![CDATA[General ledger item.]]></HELP> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <SEQNO><![CDATA[20]]></SEQNO> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_REFERENCE_VALUE_ID><![CDATA[66E310A87A844A51B8BAD2884E996CD6]]></AD_REFERENCE_VALUE_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_VAL_RULE_ID><![CDATA[D035365830AF466BA81F2AB8ECC6FAE0]]></AD_VAL_RULE_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <COLUMNNAME><![CDATA[c_glitem_id]]></COLUMNNAME> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <DEFAULTVALUE><![CDATA[@C_GLItem_ID@]]></DEFAULTVALUE> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--> <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID> -<!--DC3ADA42B2C443B79ACD6215AD5D9C31--></AD_PROCESS_PARA> - <!--E2EB0EFA3CE741C1848590D270CEBE2B--><AD_PROCESS_PARA> <!--E2EB0EFA3CE741C1848590D270CEBE2B--> <AD_PROCESS_PARA_ID><![CDATA[E2EB0EFA3CE741C1848590D270CEBE2B]]></AD_PROCESS_PARA_ID> <!--E2EB0EFA3CE741C1848590D270CEBE2B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java Tue Dec 11 22:15:20 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java Wed Dec 12 17:34:26 2012 +0100 @@ -117,11 +117,6 @@ .init(conn); HashMap<String, Object> parameters = new HashMap<String, Object>(); parameters.put("GL_JournalLine_ID", journalLine.getId()); - parameters.put("cBpartnerParaId", journalLine.getBusinessPartner().getId()); - parameters.put("cGlitemId", journalLine.getGLItem().getId()); - parameters.put("finFinancialAccountId", journalLine.getFinancialAccount().getId()); - parameters.put("finPaymentmethodId", journalLine.getPaymentMethod().getId()); - parameters.put("date", dateFormat.format(date)); pb.setParams(parameters); OBError myMessage = null; // Create a Payment for the Journal line diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java Tue Dec 11 22:15:20 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java Wed Dec 12 17:34:26 2012 +0100 @@ -20,7 +20,6 @@ package org.openbravo.advpaymentmngt.process; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -28,7 +27,6 @@ import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; import org.openbravo.base.exception.OBException; -import org.openbravo.base.session.OBPropertiesProvider; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.model.common.businesspartner.BusinessPartner; @@ -49,9 +47,6 @@ protected void doExecute(ProcessBundle bundle) throws Exception { dao = new AdvPaymentMngtDao(); OBError message = null; - String dateFormatString = OBPropertiesProvider.getInstance().getOpenbravoProperties() - .getProperty("dateFormat.java"); - SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormatString); String strMessageType = ""; StringBuilder strMessageResult = new StringBuilder(); @@ -61,21 +56,14 @@ // retrieve the parameters from the bundle final String journalLineId = (String) bundle.getParams().get("GL_JournalLine_ID"); - final String bPartnerId = (String) bundle.getParams().get("cBpartnerParaId"); - final String glItemId = (String) bundle.getParams().get("cGlitemId"); - final String financialAccountId = (String) bundle.getParams().get("finFinancialAccountId"); - final String paymentMethodId = (String) bundle.getParams().get("finPaymentmethodId"); - final String strDate = (String) bundle.getParams().get("date"); // Initialize objects GLJournalLine journalLine = OBDal.getInstance().get(GLJournalLine.class, journalLineId); - FIN_FinancialAccount financialAccount = OBDal.getInstance().get(FIN_FinancialAccount.class, - financialAccountId); - FIN_PaymentMethod paymentMethod = OBDal.getInstance().get(FIN_PaymentMethod.class, - paymentMethodId); - BusinessPartner bPartner = OBDal.getInstance().get(BusinessPartner.class, bPartnerId); - GLItem glItem = OBDal.getInstance().get(GLItem.class, glItemId); - Date date = dateFormat.parse(strDate); + FIN_FinancialAccount financialAccount = journalLine.getFinancialAccount(); + FIN_PaymentMethod paymentMethod = journalLine.getPaymentMethod(); + BusinessPartner bPartner = journalLine.getBusinessPartner(); + GLItem glItem = journalLine.getGLItem(); + Date date = journalLine.getPaymentDate(); boolean isReceipt = journalLine.getDebit().subtract(journalLine.getCredit()) .compareTo(BigDecimal.ZERO) > 0; diff -r 43b65ce2ab73 -r 0e0ca6cb8c45 src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Tue Dec 11 22:15:20 2012 +0100 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Wed Dec 12 17:34:26 2012 +0100 @@ -522,29 +522,44 @@ AND sl.M_InOut_ID=Cur_InOut.M_InOut_ID ) LOOP - Ad_Sequence_Next('M_MatchPO', Cur_SLines.AD_Org_ID, v_MatchPO_ID) ; - -- The min qty. Modified by Ismael Ciordia - v_Qty:=Cur_SLines.MovementQty; - --IF (ABS(Cur_SLines.MovementQty) > ABS(Cur_SLines.QtyOrdered)) THEN - -- v_Qty := Cur_SLines.QtyOrdered; - --END IF; - v_ResultStr:='InsertMatchPO ' || v_MatchPO_ID; - INSERT - INTO M_MATCHPO - ( - M_MatchPO_ID, AD_Client_ID, AD_Org_ID, IsActive, - Created, CreatedBy, Updated, UpdatedBy, - M_InOutLine_ID, C_OrderLine_ID, M_Product_ID, DateTrx, - Qty, Processing, Processed, Posted - ) - VALUES - ( - v_MatchPO_ID, Cur_SLines.AD_Client_ID, Cur_SLines.AD_Org_ID, 'Y', - now(), v_User, now(), v_User, - Cur_SLines.M_InOutLine_ID, Cur_SLines.C_OrderLine_ID, Cur_SLines.M_Product_ID, now(), - v_Qty, 'N', 'Y', 'N' - ) - ; + + SELECT M_MATCHPO_ID + INTO v_MatchPO_ID + FROM M_MATCHPO + WHERE C_ORDERLINE_ID = Cur_SLines.C_OrderLine_ID + AND M_INOUTLINE_ID = Cur_SLines.M_InOutLine_ID; + + v_Qty:=Cur_SLines.MovementQty; + --IF (ABS(Cur_SLines.MovementQty) > ABS(Cur_SLines.QtyOrdered)) THEN + -- v_Qty := Cur_SLines.QtyOrdered; + --END IF; + + IF (v_MatchPO_ID IS NULL) THEN + Ad_Sequence_Next('M_MatchPO', Cur_SLines.AD_Org_ID, v_MatchPO_ID) ; + -- The min qty. Modified by Ismael Ciordia + v_ResultStr:='InsertMatchPO ' || v_MatchPO_ID; + INSERT + INTO M_MATCHPO + ( + M_MatchPO_ID, AD_Client_ID, AD_Org_ID, IsActive, + Created, CreatedBy, Updated, UpdatedBy, + M_InOutLine_ID, C_OrderLine_ID, M_Product_ID, DateTrx, + Qty, Processing, Processed, Posted + ) + VALUES + ( + v_MatchPO_ID, Cur_SLines.AD_Client_ID, Cur_SLines.AD_Org_ID, 'Y', + now(), v_User, now(), v_User, + Cur_SLines.M_InOutLine_ID, Cur_SLines.C_OrderLine_ID, Cur_SLines.M_Product_ID, now(), + v_Qty, 'N', 'Y', 'N' + ) + ; + ELSE + v_ResultStr:='UpdateMatchPO ' || v_MatchPO_ID; + UPDATE M_MATCHPO + SET DateTrx = now(), Qty =v_Qty, Processing = 'N', Processed = 'Y', Posted='N' + WHERE M_MATCHPO_ID = v_MatchPO_ID; + END IF; END LOOP; v_ResultStr:='MatchInv'; ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
