details: https://code.openbravo.com/erp/devel/main/rev/c7a189353e46 changeset: 13699:c7a189353e46 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Sep 27 14:14:31 2011 +0000 summary: Update AD_MODULE version to 3.0MP3
details: https://code.openbravo.com/erp/devel/main/rev/36fbd0e92534 changeset: 13700:36fbd0e92534 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Sep 27 14:14:32 2011 +0000 summary: Added tag 3.0MP3 for changeset c7a189353e46 details: https://code.openbravo.com/erp/devel/main/rev/196ac8270322 changeset: 13701:196ac8270322 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Sep 27 14:14:33 2011 +0000 summary: Added signature for changeset 36fbd0e92534 details: https://code.openbravo.com/erp/devel/main/rev/a75fd0bbc465 changeset: 13702:a75fd0bbc465 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 29 10:30:45 2011 +0000 summary: dummy: for 3.0MP3 merge details: https://code.openbravo.com/erp/devel/main/rev/b646c328b889 changeset: 13703:b646c328b889 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 29 10:37:32 2011 +0000 summary: Merge temporary branch for 3.0MP3 diffstat: .hgignore | 1 + .hgsigs | 1 + .hgtags | 1 + src-db/database/model/triggers/FIN_FINACC_TRANSACTION_TRG.xml | 78 - src-db/database/model/triggers/FIN_PAYMENT_TRG.xml | 81 - src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 623 +-------- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 12 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 304 ++-- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 206 ++- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 207 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 252 +-- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 18 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 45 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINReconciliation.java | 15 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 159 ++- src/org/openbravo/erpCommon/ad_forms/FactLine.java | 141 +- 16 files changed, 888 insertions(+), 1256 deletions(-) diffs (truncated from 2934 to 300 lines): diff -r 743aa5959962 -r b646c328b889 .hgignore --- a/.hgignore Tue Sep 27 11:42:17 2011 +0200 +++ b/.hgignore Thu Sep 29 10:37:32 2011 +0000 @@ -38,6 +38,7 @@ *.bak *.swp + Thumbs.db sources diff -r 743aa5959962 -r b646c328b889 .hgsigs --- a/.hgsigs Tue Sep 27 11:42:17 2011 +0200 +++ b/.hgsigs Thu Sep 29 10:37:32 2011 +0000 @@ -40,3 +40,4 @@ 73cf94540eee261735546af235c022b6629c60b4 0 iEYEABECAAYFAk5km6QACgkQCX/oGf+2qkMg+QCfSxJaCXo3RB98Em77DE2wTgMdIrsAn3lvr6yVFui+ZIn81ELLNg6+hjTY de6ba33247c6a6fe40c8091880ca88371e62f9e5 0 iEYEABECAAYFAk5uEmIACgkQCX/oGf+2qkMqYwCeOiBUc3Bbsscvh17YA3xEium84OsAoNuBTpQKw5uNm0oE7YgIYfxislr9 1337fbe9577f700323ed7dca2830832d4c767c24 0 iEYEABECAAYFAk58b5AACgkQCX/oGf+2qkOhuwCfcZb9pTthMp2BXE6xcKVquD27R7MAnidzwSvbx4rJK2XvWht0B35hELV4 +36fbd0e92534c9261754d500e9ef0d1a45744b59 0 iEYEABECAAYFAk6B2kgACgkQCX/oGf+2qkPXrwCghp9G3HStth7Hc4vevflmiJsaL/sAoLKnTFUyu4ZX8mlLusps5zAiWNjT diff -r 743aa5959962 -r b646c328b889 .hgtags --- a/.hgtags Tue Sep 27 11:42:17 2011 +0200 +++ b/.hgtags Thu Sep 29 10:37:32 2011 +0000 @@ -51,3 +51,4 @@ 7ab6e81dcecb181d85885103d32f2f6ccac8b0a1 3.0MP2.1 d08117cade69fcc9ac91619661a6b5071db6af16 3.0MP2.2 74d95de540d0f428ab9c53303fa45ac6c192885c 3.0MP2.3 +c7a189353e46e28e320809a2e8aaaaac8c6f67e2 3.0MP3 diff -r 743aa5959962 -r b646c328b889 src-db/database/model/triggers/FIN_FINACC_TRANSACTION_TRG.xml --- a/src-db/database/model/triggers/FIN_FINACC_TRANSACTION_TRG.xml Tue Sep 27 11:42:17 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -<?xml version="1.0"?> - <database name="TRIGGER FIN_FINACC_TRANSACTION_TRG"> - <trigger name="FIN_FINACC_TRANSACTION_TRG" table="FIN_FINACC_TRANSACTION" fires="after" insert="true" update="true" delete="false" foreach="row"> - <body><![CDATA[ - -/************************************************************************ -* The contents of this file are subject to the Openbravo Public License -* Version 1.0 (the "License"), being the Mozilla Public License -* Version 1.1 with a permitted attribution clause; you may not use this -* file except in compliance with the License. You may obtain a copy of -* the License at http://www.openbravo.com/legal/license.html -* Software distributed under the License is distributed on an "AS IS" -* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -* License for the specific language governing rights and limitations -* under the License. -* The Original Code is Openbravo ERP. -* The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2011 Openbravo SLU -* All Rights Reserved. -* Contributor(s): ______________________________________. -*************************************************************************/ - -v_Count NUMBER:=0; - -BEGIN - - IF AD_isTriggerEnabled()='N' THEN RETURN; - END IF; - - IF (UPDATING) THEN - IF(:OLD.FOREIGN_CURRENCY_ID <> :NEW.FOREIGN_CURRENCY_ID - OR :OLD.FOREIGN_CONVERT_RATE <> :NEW.FOREIGN_CONVERT_RATE - OR :OLD.FOREIGN_AMOUNT <> :NEW.FOREIGN_AMOUNT) THEN - IF(:NEW.FOREIGN_CURRENCY_ID IS NULL) THEN - DELETE FROM C_CONVERSION_RATE_DOCUMENT WHERE APRM_FINACC_TRANSACTION_V_ID = :NEW.FIN_FINACC_TRANSACTION_ID; - ELSE - SELECT COUNT(*) INTO v_Count - FROM C_CONVERSION_RATE_DOCUMENT - WHERE C_CURRENCY_ID = :NEW.FOREIGN_CURRENCY_ID - AND C_CURRENCY_ID_TO = :NEW.C_CURRENCY_ID - AND APRM_FINACC_TRANSACTION_V_ID = :NEW.FIN_FINACC_TRANSACTION_ID; - - IF(V_Count = 0) THEN - INSERT INTO C_CONVERSION_RATE_DOCUMENT( - C_CONVERSION_RATE_DOCUMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, - CREATED, CREATEDBY, UPDATED, UPDATEDBY, C_CURRENCY_ID, C_CURRENCY_ID_TO, - C_INVOICE_ID, FIN_PAYMENT_ID, APRM_FINACC_TRANSACTION_V_ID, RATE, - FOREIGN_AMOUNT) - VALUES (get_uuid(), :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.ISACTIVE, - now(), :NEW.UPDATEDBY, now(), :NEW.UPDATEDBY, :NEW.FOREIGN_CURRENCY_ID, :NEW.C_CURRENCY_ID, - NULL, NULL, :new.FIN_FINACC_TRANSACTION_ID, :NEW.FOREIGN_CONVERT_RATE, - :NEW.FOREIGN_AMOUNT); - ELSE - UPDATE C_CONVERSION_RATE_DOCUMENT SET RATE = :NEW.FOREIGN_CONVERT_RATE, FOREIGN_AMOUNT = :NEW.FOREIGN_AMOUNT - WHERE C_CURRENCY_ID = :NEW.C_CURRENCY_ID - AND C_CURRENCY_ID_TO = :NEW.FOREIGN_CURRENCY_ID - AND APRM_FINACC_TRANSACTION_V_ID = :NEW.FIN_FINACC_TRANSACTION_ID; - END IF; - END IF; - END IF; - END IF; - IF(INSERTING) THEN - IF(:NEW.FOREIGN_CONVERT_RATE <> 1) THEN - INSERT INTO c_conversion_rate_document( - c_conversion_rate_document_id, ad_client_id, ad_org_id, isactive, - created, createdby, updated, updatedby, c_currency_id, c_currency_id_to, - c_invoice_id, fin_payment_id, aprm_finacc_transaction_v_id, rate, - foreign_amount) - VALUES (get_uuid(), :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.ISACTIVE, - now(), :NEW.UPDATEDBY, now(), :NEW.UPDATEDBY, :NEW.FOREIGN_CURRENCY_ID, :NEW.C_CURRENCY_ID, - NULL, NULL, :NEW.FIN_FINACC_TRANSACTION_ID, :NEW.FOREIGN_CONVERT_RATE, - :NEW.FOREIGN_AMOUNT); - END IF; - END IF; - END FIN_FINACC_TRANSACTION_TRG -]]></body> - </trigger> - </database> diff -r 743aa5959962 -r b646c328b889 src-db/database/model/triggers/FIN_PAYMENT_TRG.xml --- a/src-db/database/model/triggers/FIN_PAYMENT_TRG.xml Tue Sep 27 11:42:17 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -<?xml version="1.0"?> - <database name="TRIGGER FIN_PAYMENT_TRG"> - <trigger name="FIN_PAYMENT_TRG" table="FIN_PAYMENT" fires="after" insert="true" update="true" delete="true" foreach="row"> - <body><![CDATA[ - -/************************************************************************ -* The contents of this file are subject to the Openbravo Public License -* Version 1.0 (the "License"), being the Mozilla Public License -* Version 1.1 with a permitted attribution clause; you may not use this -* file except in compliance with the License. You may obtain a copy of -* the License at http://www.openbravo.com/legal/license.html -* Software distributed under the License is distributed on an "AS IS" -* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -* License for the specific language governing rights and limitations -* under the License. -* The Original Code is Openbravo ERP. -* The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2011 Openbravo SLU -* All Rights Reserved. -* Contributor(s): ______________________________________. -*************************************************************************/ - -v_DateNull DATE := TO_DATE('01-01-1900','DD-MM-YYYY'); -v_C_CURRENCY_ID FIN_FINANCIAL_ACCOUNT.C_CURRENCY_ID%TYPE; -v_Count NUMBER:=0; - -BEGIN - - IF AD_isTriggerEnabled()='N' THEN RETURN; - END IF; - - IF (UPDATING OR INSERTING) THEN - SELECT C_CURRENCY_ID INTO v_C_CURRENCY_ID - FROM FIN_FINANCIAL_ACCOUNT - WHERE FIN_FINANCIAL_ACCOUNT_ID = :NEW.FIN_FINANCIAL_ACCOUNT_ID; - END IF; - - IF (UPDATING) THEN - IF(:OLD.FINACC_TXN_CONVERT_RATE <> :NEW.FINACC_TXN_CONVERT_RATE AND :OLD.AMOUNT <> :NEW.AMOUNT) THEN - - SELECT COUNT(*) INTO v_Count - FROM C_CONVERSION_RATE_DOCUMENT - WHERE C_CURRENCY_ID = :NEW.C_CURRENCY_ID - AND C_CURRENCY_ID_TO = v_C_CURRENCY_ID - AND FIN_PAYMENT_ID = :NEW.FIN_PAYMENT_ID; - - IF(V_Count = 0) THEN - INSERT INTO C_CONVERSION_RATE_DOCUMENT( - C_CONVERSION_RATE_DOCUMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, - CREATED, CREATEDBY, UPDATED, UPDATEDBY, C_CURRENCY_ID, C_CURRENCY_ID_TO, - C_INVOICE_ID, FIN_PAYMENT_ID, APRM_FINACC_TRANSACTION_V_ID, RATE, - FOREIGN_AMOUNT) - VALUES (get_uuid(), :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.ISACTIVE, - now(), :NEW.UPDATEDBY, now(), :NEW.UPDATEDBY, :NEW.C_CURRENCY_ID, v_C_CURRENCY_ID, - NULL, :NEW.FIN_PAYMENT_ID, NULL, :NEW.FINACC_TXN_CONVERT_RATE, - :NEW.AMOUNT*:NEW.FINACC_TXN_CONVERT_RATE); - ELSE - UPDATE C_CONVERSION_RATE_DOCUMENT SET RATE = :NEW.FINACC_TXN_CONVERT_RATE, FOREIGN_AMOUNT = :NEW.AMOUNT*:NEW.FINACC_TXN_CONVERT_RATE - WHERE C_CURRENCY_ID = :NEW.C_CURRENCY_ID - AND C_CURRENCY_ID_TO = v_C_CURRENCY_ID - AND FIN_PAYMENT_ID = :NEW.FIN_PAYMENT_ID; - END IF; - END IF; - END IF; - IF(INSERTING) THEN - IF(:NEW.FINACC_TXN_CONVERT_RATE <> 1) THEN - INSERT INTO c_conversion_rate_document( - c_conversion_rate_document_id, ad_client_id, ad_org_id, isactive, - created, createdby, updated, updatedby, c_currency_id, c_currency_id_to, - c_invoice_id, fin_payment_id, aprm_finacc_transaction_v_id, rate, - foreign_amount) - VALUES (get_uuid(), :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.ISACTIVE, - now(), :NEW.UPDATEDBY, now(), :NEW.UPDATEDBY, :NEW.C_CURRENCY_ID, v_C_CURRENCY_ID, - NULL, :NEW.FIN_PAYMENT_ID, NULL, :NEW.FINACC_TXN_CONVERT_RATE, - :NEW.AMOUNT*:NEW.FINACC_TXN_CONVERT_RATE); - END IF; - END IF; -END FIN_PAYMENT_TRG -]]></body> - </trigger> - </database> diff -r 743aa5959962 -r b646c328b889 src/org/openbravo/erpCommon/ad_forms/AcctServer.java --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Tue Sep 27 11:42:17 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Sep 29 10:37:32 2011 +0000 @@ -18,7 +18,6 @@ import java.io.IOException; import java.math.BigDecimal; -import java.math.MathContext; import java.sql.Connection; import java.sql.SQLException; import java.text.SimpleDateFormat; @@ -57,7 +56,6 @@ import org.openbravo.model.financialmgmt.accounting.coa.AcctSchemaTable; import org.openbravo.model.financialmgmt.gl.GLItem; import org.openbravo.model.financialmgmt.gl.GLItemAccounts; -import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; import org.openbravo.model.financialmgmt.payment.FIN_Payment; @@ -120,9 +118,6 @@ public String[] Amounts = new String[4]; - // Conversion Rate precision. defaulted to 6 as it is stated in Format.xml - int conversionRatePrecision = 6; - public DocLine[] p_lines = new DocLine[0]; public DocLine_Payment[] m_debt_payments = new DocLine_Payment[0]; @@ -169,22 +164,6 @@ /** Document Status */ public static final String STATUS_BackgroundDisabled = "d"; - /** Table IDs for document level conversion rates */ - public static final String TABLEID_Invoice = "318"; - public static final String TABLEID_Payment = "D1A97202E832470285C9B1EB026D54E2"; - public static final String TABLEID_Transaction = "4D8C3B3C31D1410DA046140C9F024D17"; - public static final String TABLEID_Reconciliation = "B1B7075C46934F0A9FD4C4D0F1457B42"; - - @Deprecated - // Use TABLEID_Invoice instead - public static final String EXCHANGE_DOCTYPE_Invoice = "318"; - @Deprecated - // Use TABLEID_Payment instead - public static final String EXCHANGE_DOCTYPE_Payment = "D1A97202E832470285C9B1EB026D54E2"; - @Deprecated - // Use TABLEID_Transaction instead - public static final String EXCHANGE_DOCTYPE_Transaction = "4D8C3B3C31D1410DA046140C9F024D17"; - OBError messageResult = null; String strMessage = null; @@ -297,6 +276,11 @@ /** GL Accounts */ public static final String ACCTTYPE_PPVOffset = "60"; + /** Document Types for document level conversion rates */ + public static final String EXCHANGE_DOCTYPE_Invoice = "318"; + public static final String EXCHANGE_DOCTYPE_Payment = "D1A97202E832470285C9B1EB026D54E2"; + public static final String EXCHANGE_DOCTYPE_Transaction = "4D8C3B3C31D1410DA046140C9F024D17"; + // Reference (to find SalesRegion from BPartner) public String BP_C_SalesRegion_ID = ""; // set in FactLine @@ -672,8 +656,6 @@ log4j.warn("AcctServer - post - Error loading document"); return false; } - // Set Currency precision - conversionRatePrecision = getConversionRatePrecision(vars); if (data == null || data.length == 0) return false; // if (log4j.isDebugEnabled()) @@ -1031,12 +1013,10 @@ return Status; Status = STATUS_PostPrepared; - // Distinguish multi-currency Documents - MultiCurrency = m_fact[index].isMulticurrencyDocument(); // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - Before balanceSource"); // balanceSource - if (!MultiCurrency && !m_fact[index].isSourceBalanced()) + if (!m_fact[index].isSourceBalanced() && !MultiCurrency) m_fact[index].balanceSource(conn); // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - After balanceSource"); @@ -1044,7 +1024,7 @@ // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - Before isSegmentBalanced"); // balanceSegments - if (!MultiCurrency && !m_fact[index].isSegmentBalanced(conn)) + if (!m_fact[index].isSegmentBalanced(conn) && !MultiCurrency) m_fact[index].balanceSegments(conn); // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - After isSegmentBalanced"); @@ -1100,7 +1080,7 @@ * * @param acctSchema * accounting schema - * @return true, if convertible to accounting currency + * @return true, if convertable to accounting currency */ public boolean isConvertible(AcctSchema acctSchema, ConnectionProvider conn) throws ServletException { @@ -1139,7 +1119,7 @@ ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
