details: /erp/devel/pi/rev/c77f025195cf
changeset: 10025:c77f025195cf
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Jan 20 10:44:32 2011 +0100
summary: Fixes bug 0015443
details: /erp/devel/pi/rev/f9164f050998
changeset: 10026:f9164f050998
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Jan 21 12:46:11 2011 +0100
summary: Fixes issue 0015722: to post a payment, the project dimension is not
translated to fact_acct
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 3
+--
src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql | 10
+++++-----
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 9
+++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
diffs (65 lines):
diff -r b87973fdca8a -r f9164f050998 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 21 12:31:22 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 21 12:46:11 2011 +0100
@@ -256671,10 +256671,9 @@
<!--1002100117--> <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
<!--1002100117--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
<!--1002100117--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--1002100117--> <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
<!--1002100117--> <ISKEY><![CDATA[N]]></ISKEY>
<!--1002100117--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--1002100117--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1002100117--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1002100117--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--1002100117--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1002100117--> <SEQNO><![CDATA[43]]></SEQNO>
diff -r b87973fdca8a -r f9164f050998
src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql
Fri Jan 21 12:31:22 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql
Fri Jan 21 12:46:11 2011 +0100
@@ -26,13 +26,13 @@
<Sql>
<![CDATA[
select C_invoice.C_invoice_ID, C_invoice.DocumentNo,
- C_InvoiceTax.C_InvoiceTax_ID, C_invoice.TaxDate,
+ C_InvoiceTax.C_InvoiceTax_ID, coalesce(C_invoice.TaxDate,
C_invoice.DateAcct) as TaxDate,
case when C_Invoice.C_Currency_ID = (select c_currency_id from
c_taxpayment where c_taxpayment_id = ? ) then C_InvoiceTax.TaxAmt else
C_Currency_Convert(C_InvoiceTax.TaxAmt ,C_Invoice.C_Currency_ID,
(select c_currency_id from c_taxpayment where c_taxpayment_id = ? ),
- c_invoice.TaxDate, 'S', c_invoice.ad_client_id, c_invoice.ad_org_id)
end as TaxAmt,
+ coalesce(C_invoice.TaxDate, C_invoice.DateAcct), 'S',
c_invoice.ad_client_id, c_invoice.ad_org_id) end as TaxAmt,
case when C_Invoice.C_Currency_ID = (select c_currency_id from
c_taxpayment where c_taxpayment_id = ? ) then C_InvoiceTax.TaxBaseAmt else
C_Currency_Convert(C_InvoiceTax.TaxBaseAmt ,C_Invoice.C_Currency_ID,
(select c_currency_id from c_taxpayment where c_taxpayment_id = ? ),
- c_invoice.TaxDate, 'S', c_invoice.ad_client_id, c_invoice.ad_org_id)
end as TaxBaseAmt,
+ coalesce(C_invoice.TaxDate, C_invoice.DateAcct), 'S',
c_invoice.ad_client_id, c_invoice.ad_org_id) end as TaxBaseAmt,
C_Tax.C_Tax_ID, C_Tax.IsTaxExempt ,C_Tax.IsTaxUndeductable,
C_Tax.IsNoVat, C_DocType.DocBaseType
from C_Invoice,
C_TaxRegister_Type_Lines,
@@ -59,8 +59,8 @@
<Parameter name="taxPaymentID"/>
<Parameter name="taxPaymentID"/>
<Parameter name="parTaxRegType_id" optional="true" after="and
1=1"><![CDATA[ and C_TaxRegister_Type.C_TaxRegister_Type_ID= ? ]]></Parameter>
- <Parameter name="parDateFrom" optional="true" after="and
1=1"><![CDATA[ and C_Invoice.TaxDate >= to_date(?) ]]></Parameter>
- <Parameter name="parDateTo" optional="true" after="and 1=1"><![CDATA[
and C_Invoice.TaxDate < to_date(?)]]></Parameter>
+ <Parameter name="parDateFrom" optional="true" after="and
1=1"><![CDATA[ and coalesce(C_invoice.TaxDate, C_invoice.DateAcct) >=
to_date(?) ]]></Parameter>
+ <Parameter name="parDateTo" optional="true" after="and 1=1"><![CDATA[
and coalesce(C_invoice.TaxDate, C_invoice.DateAcct) < to_date(?)]]></Parameter>
<Parameter name="adUserOrg" type="replace" optional="true" after="and
C_Invoice.AD_Org_ID IN (" text="'1'"/>
</SqlMethod>
<SqlMethod name="set" type="constant" return="multiple">
diff -r b87973fdca8a -r f9164f050998
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Fri Jan 21
12:31:22 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Fri Jan 21
12:46:11 2011 +0100
@@ -357,6 +357,15 @@
FieldProviderFactory.setField(data[0], "Posted", payment.getPosted());
FieldProviderFactory.setField(data[0], "Processed", payment.isProcessed()
? "Y" : "N");
FieldProviderFactory.setField(data[0], "Processing",
payment.isProcessNow() ? "Y" : "N");
+ FieldProviderFactory.setField(data[0], "C_Project_ID",
payment.getProject() != null ? payment
+ .getProject().getId() : "");
+ FieldProviderFactory.setField(data[0], "C_Campaign_ID",
+ payment.getSalesCampaign() != null ?
payment.getSalesCampaign().getId() : "");
+ FieldProviderFactory.setField(data[0], "C_Activity_ID",
payment.getActivity() != null ? payment
+ .getActivity().getId() : "");
+ // This lines can be uncommented when User1 and User2 are implemented
+ // FieldProviderFactory.setField(data[0], "User1_ID",
payment.getStDimension().getId());
+ // FieldProviderFactory.setField(data[0], "User2_ID",
payment.getNdDimension().getId());
setObjectFieldProvider(data);
}
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
