details: /erp/devel/pi/rev/26d7079c342c
changeset: 6976:26d7079c342c
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon Apr 12 14:12:19 2010 +0530
summary: Review comments of Tax Posting as an Expenses has updated.
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 2 ++
src-db/database/sourcedata/AD_ELEMENT.xml | 2 ++
src-db/database/sourcedata/AD_FIELD.xml | 2 ++
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 4 ++--
4 files changed, 8 insertions(+), 2 deletions(-)
diffs (50 lines):
diff -r 299a742a8ee4 -r 26d7079c342c src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Apr 12 12:47:59 2010 +0530
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Apr 12 14:12:19 2010 +0530
@@ -283920,6 +283920,8 @@
<!--A40F17F48EC444B2A1825C2E3D9AF7CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A40F17F48EC444B2A1825C2E3D9AF7CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A40F17F48EC444B2A1825C2E3D9AF7CE-->
<NAME><![CDATA[Istaxdeductable]]></NAME>
+<!--A40F17F48EC444B2A1825C2E3D9AF7CE--> <DESCRIPTION><![CDATA[If active, this
rate will behave as a tax deductible rate, no matter if the organization where
used is tax deductible or not.]]></DESCRIPTION>
+<!--A40F17F48EC444B2A1825C2E3D9AF7CE--> <HELP><![CDATA[If active, this rate
will behave as a tax deductible rate, no matter if the organization where used
is tax deductible or not.]]></HELP>
<!--A40F17F48EC444B2A1825C2E3D9AF7CE-->
<COLUMNNAME><![CDATA[IsTaxDeductable]]></COLUMNNAME>
<!--A40F17F48EC444B2A1825C2E3D9AF7CE-->
<AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
<!--A40F17F48EC444B2A1825C2E3D9AF7CE-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
diff -r 299a742a8ee4 -r 26d7079c342c src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Apr 12 12:47:59 2010 +0530
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Apr 12 14:12:19 2010 +0530
@@ -22020,6 +22020,8 @@
<!--33D4F4DEADD74C48A55C08A9DCEB41B2-->
<COLUMNNAME><![CDATA[Istaxdeductable]]></COLUMNNAME>
<!--33D4F4DEADD74C48A55C08A9DCEB41B2--> <NAME><![CDATA[Tax
Deductible]]></NAME>
<!--33D4F4DEADD74C48A55C08A9DCEB41B2--> <PRINTNAME><![CDATA[Tax
Deductible]]></PRINTNAME>
+<!--33D4F4DEADD74C48A55C08A9DCEB41B2--> <DESCRIPTION><![CDATA[If active, this
rate will behave as a tax deductible rate, no matter if the organization where
used is tax deductible or not.]]></DESCRIPTION>
+<!--33D4F4DEADD74C48A55C08A9DCEB41B2--> <HELP><![CDATA[If active, this rate
will behave as a tax deductible rate, no matter if the organization where used
is tax deductible or not.]]></HELP>
<!--33D4F4DEADD74C48A55C08A9DCEB41B2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--33D4F4DEADD74C48A55C08A9DCEB41B2--></AD_ELEMENT>
diff -r 299a742a8ee4 -r 26d7079c342c src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Apr 12 12:47:59 2010 +0530
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Apr 12 14:12:19 2010 +0530
@@ -200579,6 +200579,8 @@
<!--D62155602ABA49F69FF81B0CA89D13A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--D62155602ABA49F69FF81B0CA89D13A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D62155602ABA49F69FF81B0CA89D13A7--> <NAME><![CDATA[Tax
Deductible]]></NAME>
+<!--D62155602ABA49F69FF81B0CA89D13A7--> <DESCRIPTION><![CDATA[If active, this
rate will behave as a tax deductible rate, no matter if the organization where
used is tax deductible or not.]]></DESCRIPTION>
+<!--D62155602ABA49F69FF81B0CA89D13A7--> <HELP><![CDATA[If active, this rate
will behave as a tax deductible rate, no matter if the organization where used
is tax deductible or not.]]></HELP>
<!--D62155602ABA49F69FF81B0CA89D13A7-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--D62155602ABA49F69FF81B0CA89D13A7--> <AD_TAB_ID><![CDATA[174]]></AD_TAB_ID>
<!--D62155602ABA49F69FF81B0CA89D13A7-->
<AD_COLUMN_ID><![CDATA[A40F17F48EC444B2A1825C2E3D9AF7CE]]></AD_COLUMN_ID>
diff -r 299a742a8ee4 -r 26d7079c342c
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Mon Apr 12
12:47:59 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Mon Apr 12
14:12:19 2010 +0530
@@ -129,8 +129,8 @@
|| ("Y".equals(data[i].orgtaxundeductable));
if ("Y".equals(data[i].orgtaxundeductable)) {
/*
- * override isTaxUndeductable flag if any tax line level override for
intracommunity public
- * organization
+ * If any tax line level has tax deductable flag then override
isTaxUndeductable flag for
+ * intracommunity non tax deductible organization
*/
if ("Y".equals(data[i].istaxdeductable)) {
isTaxUndeductable = false;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
