details: /erp/devel/main/rev/029b1eeaade0
changeset: 8575:029b1eeaade0
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Tue Oct 19 09:56:45 2010 +0530
summary: Fixes Issue 14734: the accounting entries generated by a cash with
glitem is wrong
details: /erp/devel/main/rev/92f6a0d1457a
changeset: 8576:92f6a0d1457a
user: Anandan Narasimachari Monnin <anandan.monnin <at> openbravo.com>
date: Tue Oct 19 11:42:00 2010 +0530
summary: Fixes 14827 Post button disabled when the payment document is in
Awaiting execution status
details: /erp/devel/main/rev/47154c0fec32
changeset: 8577:47154c0fec32
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Oct 19 10:57:36 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 2 +-
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/ad_forms/DocCash.java | 7 +++----
3 files changed, 6 insertions(+), 7 deletions(-)
diffs (50 lines):
diff -r 1ee95cec6ce6 -r 47154c0fec32 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 18 12:51:26 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Oct 19 10:57:36 2010 +0000
@@ -195373,7 +195373,7 @@
<!--7C541AC0C767FDD7E040007F01016B4D-->
<AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<AD_COLUMN_ID><![CDATA[7891269C83E5655DE040007F010155CE]]></AD_COLUMN_ID>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLOGIC><![cda...@processed@='Y']]></DISPLAYLOGIC>
+<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLOGIC><![cda...@status@!'RPAE' & @proces...@='Y']]></DISPLAYLOGIC>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--7C541AC0C767FDD7E040007F01016B4D--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--7C541AC0C767FDD7E040007F01016B4D--> <SEQNO><![CDATA[220]]></SEQNO>
diff -r 1ee95cec6ce6 -r 47154c0fec32 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Oct 18 12:51:26 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 19 10:57:36 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18452]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18576]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 1ee95cec6ce6 -r 47154c0fec32
src/org/openbravo/erpCommon/ad_forms/DocCash.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocCash.java Mon Oct 18 12:51:26
2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocCash.java Tue Oct 19 10:57:36
2010 +0000
@@ -298,10 +298,9 @@
// Charge DR
// CashAsset CR
log4jDocCash.debug("********** DocCash - factAcct - account - "
- + line.getGlitemAccount(as, new BigDecimal(getAmount()),
conn).C_ValidCombination_ID);
- fact.createLine(line, line.getGlitemAccount(as, new
BigDecimal(getAmount()), conn),
- C_Currency_ID, amount.negate().toString(), "", Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+ + line.getGlitemAccount(as, amount, conn).C_ValidCombination_ID);
+ fact.createLine(line, line.getGlitemAccount(as, amount, conn),
C_Currency_ID, amount
+ .negate().toString(), "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
DocumentType, conn);
assetAmt = assetAmt.subtract(amount.negate());
} else if (CashType.equals(DocLine_Cash.CASHTYPE_DIFFERENCE)) {
// amount is pos/neg
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
