details: https://code.openbravo.com/erp/devel/pi/rev/f70a7e72efe6
changeset: 28045:f70a7e72efe6
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Nov 25 15:34:21 2015 +0100
summary: Fixed bug 28557: Manual Cash VAT Settlement (Core)
This changeset contains only the Manual Cash VAT Settlement stuff related to
core.
The rest of this feature can be found in Cash VAT Module 1.0.100 (or higher).
Added column C_INVOICETAX_CASHVAT.ISMANUALSETTLEMENT to control whether the
line is created by a Manual Cash VAT Settlement.
View C_INVOICETAX_CASHVAT_V modified to get records linked to a payment or not
(as for the new records comming from a Manual Cash VAT Settlement)
Deprecated method createFactCashVAT() to remove useless parameter cCurrencyID
and adapted to get always the invoice's currency instead.
diffstat:
src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml | 5 +
src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml | 2 +-
src-db/database/sourcedata/AD_COLUMN.xml | 74
+++++++++-
src-db/database/sourcedata/AD_ELEMENT.xml | 14 +
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 2 +-
src/org/openbravo/erpCommon/utility/CashVATUtil.java | 27 ++-
8 files changed, 113 insertions(+), 15 deletions(-)
diffs (245 lines):
diff -r 25035930f7ce -r f70a7e72efe6
src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml
--- a/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml Wed Nov 25
14:09:50 2015 +0000
+++ b/src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml Wed Nov 25
15:34:21 2015 +0100
@@ -53,6 +53,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ISMANUALSETTLEMENT" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="C_INVOICETAXCASHVAT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -69,5 +73,6 @@
<index-column name="C_INVOICETAX_ID"/>
</index>
<check name="C_INVOICETAXCASHVAT_ACTIVE_CH"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ <check name="C_INVOICETAXCVAT_MANUALSET_CH"><![CDATA[ISMANUALSETTLEMENT
IN ('Y', 'N')]]></check>
</table>
</database>
diff -r 25035930f7ce -r f70a7e72efe6
src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
--- a/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml Wed Nov 25
14:09:50 2015 +0000
+++ b/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml Wed Nov 25
15:34:21 2015 +0100
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<database name="VIEW C_INVOICETAX_CASHVAT_V">
- <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT
itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, fpd.ad_client_id,
fpd.ad_org_id, fpd.created, fpd.createdby, fpd.updated, fpd.updatedby,
fpd.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt,
fpsd.iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt,
fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount,
fp.c_currency_id, itcv.c_invoicetax_id FROM c_invoicetax_cashvat itcv LEFT JOIN
fin_payment_detail fpd ON fpd.fin_payment_detail_id =
itcv.fin_payment_detail_id JOIN fin_payment fp ON fp.fin_payment_id =
fpd.fin_payment_id LEFT JOIN fin_payment_scheduledetail fpsd ON
fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id]]></view>
+ <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT
itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id,
itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby,
itcv.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt,
fpsd.iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt,
fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount,
fp.c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM
c_invoicetax_cashvat itcv LEFT JOIN fin_payment_detail fpd ON
fpd.fin_payment_detail_id = itcv.fin_payment_detail_id LEFT JOIN fin_payment fp
ON fp.fin_payment_id = fpd.fin_payment_id LEFT JOIN fin_payment_scheduledetail
fpsd ON fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id]]></view>
</database>
diff -r 25035930f7ce -r f70a7e72efe6 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 25 14:09:50 2015 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 25 15:34:21 2015 +0100
@@ -225530,8 +225530,8 @@
<!--06CB31A81592457ABC9AE986D7D775B2--> <ISPARENT><![CDATA[Y]]></ISPARENT>
<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--06CB31A81592457ABC9AE986D7D775B2--> <SEQNO><![CDATA[210]]></SEQNO>
+<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--06CB31A81592457ABC9AE986D7D775B2--> <SEQNO><![CDATA[100]]></SEQNO>
<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--06CB31A81592457ABC9AE986D7D775B2-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
@@ -230143,6 +230143,40 @@
<!--1B1EC3E0DE05493E9815E38124AA620F-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--1B1EC3E0DE05493E9815E38124AA620F--></AD_COLUMN>
+<!--1B5424C481FA4F39B23086449C459FF0--><AD_COLUMN>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_COLUMN_ID><![CDATA[1B5424C481FA4F39B23086449C459FF0]]></AD_COLUMN_ID>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B5424C481FA4F39B23086449C459FF0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B5424C481FA4F39B23086449C459FF0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<NAME><![CDATA[IsManualSettlement]]></NAME>
+<!--1B5424C481FA4F39B23086449C459FF0--> <DESCRIPTION><![CDATA[Manual Cash VAT
Settlement]]></DESCRIPTION>
+<!--1B5424C481FA4F39B23086449C459FF0--> <HELP><![CDATA[Indicates whether this
line has been created from a Manual Cash VAT Settlement]]></HELP>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<COLUMNNAME><![CDATA[IsManualSettlement]]></COLUMNNAME>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_TABLE_ID><![CDATA[B7ABE839A5F64A39ADCEE86817AA272F]]></AD_TABLE_ID>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--1B5424C481FA4F39B23086449C459FF0--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--1B5424C481FA4F39B23086449C459FF0--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1B5424C481FA4F39B23086449C459FF0--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_ELEMENT_ID><![CDATA[3AF306FC33E84C1DACCFB7B2CC67D74B]]></AD_ELEMENT_ID>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1B5424C481FA4F39B23086449C459FF0--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1B5424C481FA4F39B23086449C459FF0-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1B5424C481FA4F39B23086449C459FF0--></AD_COLUMN>
+
<!--1B5BAA2A8E6C49D9859945239CB55414--><AD_COLUMN>
<!--1B5BAA2A8E6C49D9859945239CB55414-->
<AD_COLUMN_ID><![CDATA[1B5BAA2A8E6C49D9859945239CB55414]]></AD_COLUMN_ID>
<!--1B5BAA2A8E6C49D9859945239CB55414-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -301627,7 +301661,7 @@
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--9ACB466C69F848F4AE2DB1393D780160--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--9ACB466C69F848F4AE2DB1393D780160--> <SEQNO><![CDATA[210]]></SEQNO>
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--9ACB466C69F848F4AE2DB1393D780160-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
@@ -336909,6 +336943,40 @@
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B--></AD_COLUMN>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--><AD_COLUMN>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_COLUMN_ID><![CDATA[E9C75CC455C44F1A9D39878102D1DDE5]]></AD_COLUMN_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<NAME><![CDATA[IsManualSettlement]]></NAME>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <DESCRIPTION><![CDATA[Manual Cash VAT
Settlement]]></DESCRIPTION>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <HELP><![CDATA[Indicates whether this
line has been created from a Manual Cash VAT Settlement]]></HELP>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<COLUMNNAME><![CDATA[IsManualSettlement]]></COLUMNNAME>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_TABLE_ID><![CDATA[468BC822115146B8B67E82F671F570B3]]></AD_TABLE_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <SEQNO><![CDATA[230]]></SEQNO>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_ELEMENT_ID><![CDATA[3AF306FC33E84C1DACCFB7B2CC67D74B]]></AD_ELEMENT_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E9C75CC455C44F1A9D39878102D1DDE5-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E9C75CC455C44F1A9D39878102D1DDE5--></AD_COLUMN>
+
<!--E9CCD5D97AE84D0282E334ABC72D6E2B--><AD_COLUMN>
<!--E9CCD5D97AE84D0282E334ABC72D6E2B-->
<AD_COLUMN_ID><![CDATA[E9CCD5D97AE84D0282E334ABC72D6E2B]]></AD_COLUMN_ID>
<!--E9CCD5D97AE84D0282E334ABC72D6E2B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 25035930f7ce -r f70a7e72efe6 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 25 14:09:50 2015 +0000
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 25 15:34:21 2015 +0100
@@ -22299,6 +22299,20 @@
<!--3AC492F79F7E4D9E94311B00AE6BA15A--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--3AC492F79F7E4D9E94311B00AE6BA15A--></AD_ELEMENT>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--><AD_ELEMENT>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B-->
<AD_ELEMENT_ID><![CDATA[3AF306FC33E84C1DACCFB7B2CC67D74B]]></AD_ELEMENT_ID>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B-->
<COLUMNNAME><![CDATA[IsManualSettlement]]></COLUMNNAME>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <NAME><![CDATA[Manual
Settlement]]></NAME>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <PRINTNAME><![CDATA[Manual
Settlement]]></PRINTNAME>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <DESCRIPTION><![CDATA[Manual Cash VAT
Settlement]]></DESCRIPTION>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <HELP><![CDATA[Indicates whether this
line has been created from a Manual Cash VAT Settlement]]></HELP>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3AF306FC33E84C1DACCFB7B2CC67D74B--></AD_ELEMENT>
+
<!--3B584D993CCF41B698DBE642AFC21AE4--><AD_ELEMENT>
<!--3B584D993CCF41B698DBE642AFC21AE4-->
<AD_ELEMENT_ID><![CDATA[3B584D993CCF41B698DBE642AFC21AE4]]></AD_ELEMENT_ID>
<!--3B584D993CCF41B698DBE642AFC21AE4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 25035930f7ce -r f70a7e72efe6
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Wed Nov
25 14:09:50 2015 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Wed Nov
25 15:34:21 2015 +0100
@@ -560,7 +560,7 @@
// Cash VAT
SeqNo = CashVATUtil.createFactCashVAT(as, conn, fact,
Fact_Acct_Group_ID, line,
- invoice, DocumentType, C_Currency_ID, SeqNo);
+ invoice, DocumentType, SeqNo);
}
if (isPrepayment) {
// To force opposite posting isReceipt is opposite as well. this
is required when
diff -r 25035930f7ce -r f70a7e72efe6
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Wed Nov 25
14:09:50 2015 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Wed Nov 25
15:34:21 2015 +0100
@@ -399,7 +399,7 @@
fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo), conn).toString();
// Cash VAT
SeqNo = CashVATUtil.createFactCashVAT(as, conn, fact,
Fact_Acct_Group_ID, line,
- invoice, DocumentType, C_Currency_ID, SeqNo);
+ invoice, DocumentType, SeqNo);
if (!isPrepayment) {
if (line.getDoubtFulDebtAmount().signum() != 0) {
BigDecimal doubtFulDebtAmount =
convertAmount(line.getDoubtFulDebtAmount(),
diff -r 25035930f7ce -r f70a7e72efe6
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Wed Nov
25 14:09:50 2015 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Wed Nov
25 15:34:21 2015 +0100
@@ -892,7 +892,7 @@
// Cash VAT
SeqNo = CashVATUtil.createFactCashVAT(as, conn, fact,
Fact_Acct_Group_ID, line, invoice,
- DocumentType, C_Currency_ID, SeqNo);
+ DocumentType, SeqNo);
}
if (isPrepayment) {
// To force opposite posting isReceipt is opposite as well. this is
required when
diff -r 25035930f7ce -r f70a7e72efe6
src/org/openbravo/erpCommon/utility/CashVATUtil.java
--- a/src/org/openbravo/erpCommon/utility/CashVATUtil.java Wed Nov 25
14:09:50 2015 +0000
+++ b/src/org/openbravo/erpCommon/utility/CashVATUtil.java Wed Nov 25
15:34:21 2015 +0100
@@ -442,13 +442,24 @@
}
/**
+ * @deprecated use
+ * {@link #createFactCashVAT(AcctSchema, ConnectionProvider,
Fact, String, DocLineCashVATReady_PaymentTransactionReconciliation, Invoice,
String, String)}
+ * instead
+ */
+ public static String createFactCashVAT(AcctSchema as, ConnectionProvider
conn, Fact fact,
+ String Fact_Acct_Group_ID,
DocLineCashVATReady_PaymentTransactionReconciliation line,
+ Invoice invoice, final String documentType, final String cCurrencyID,
final String SeqNo) {
+ return createFactCashVAT(as, conn, fact, Fact_Acct_Group_ID, line,
invoice, documentType, SeqNo);
+ }
+
+ /**
* Create the accounting fact lines related to Cash VAT for payments,
transactions and
* reconciliations that come from a cash VAT invoice
*
*/
public static String createFactCashVAT(AcctSchema as, ConnectionProvider
conn, Fact fact,
String Fact_Acct_Group_ID,
DocLineCashVATReady_PaymentTransactionReconciliation line,
- Invoice invoice, final String documentType, final String cCurrencyID,
final String SeqNo) {
+ Invoice invoice, final String documentType, final String SeqNo) {
try {
if (invoice.isCashVAT() && !line.getInvoiceTaxCashVAT_V().isEmpty()) {
FactLine factLine2 = null;
@@ -513,13 +524,13 @@
conn), invoice.getCurrency().getId(), "",
taxAmt.toString(),
Fact_Acct_Group_ID, nextSeqNo(factLine1.m_SeqNo),
documentType, conn);
} else {
- final FactLine factLine1 = fact.createLine(line,
- m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit_Trans, as,
conn), cCurrencyID, "",
- taxAmountConverted, Fact_Acct_Group_ID,
nextSeqNo(SeqNo), documentType, conn);
- factLine2 = fact.createLine(line,
- m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit, as, conn),
cCurrencyID,
- taxAmt.toString(), "", Fact_Acct_Group_ID,
nextSeqNo(factLine1.m_SeqNo),
- documentType, conn);
+ final FactLine factLine1 = fact.createLine(line,
m_tax.getAccount(
+ DocTax.ACCTTYPE_TaxCredit_Trans, as, conn),
invoice.getCurrency().getId(),
+ "", taxAmountConverted, Fact_Acct_Group_ID,
nextSeqNo(SeqNo), documentType,
+ conn);
+ factLine2 = fact.createLine(line,
m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit, as,
+ conn), invoice.getCurrency().getId(), taxAmt.toString(),
"",
+ Fact_Acct_Group_ID, nextSeqNo(factLine1.m_SeqNo),
documentType, conn);
}
}
// APC
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
