details: /erp/devel/pi/rev/d5c316dcb1b4
changeset: 8375:d5c316dcb1b4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 06 11:50:40 2010 +0200
summary: Fixes bug 0014429: Error navigating from the posting of a debt
cancelation
details: /erp/devel/pi/rev/5096d95183bb
changeset: 8376:5096d95183bb
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 06 22:47:31 2010 +0200
summary: Fixes bug 0014424: Wrong GL Posting when there is a payment with...
details: /erp/devel/pi/rev/c4e1d6413fdb
changeset: 8377:c4e1d6413fdb
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 06 22:55:31 2010 +0200
summary: Fixes order of fields for bank statement line
details: /erp/devel/pi/rev/e2967abd014d
changeset: 8378:e2967abd014d
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Sep 07 00:41:58 2010 +0200
summary: Fixes possible null pointer
details: /erp/devel/pi/rev/a3b2606f5f53
changeset: 8379:a3b2606f5f53
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Sep 07 01:45:04 2010 +0200
summary: Fixes order of amount fields in bank statement line tab
details: /erp/devel/pi/rev/258145201fc8
changeset: 8380:258145201fc8
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Sep 07 16:32:55 2010 +0200
summary: Fixes bug 0014099: Some fields have to be hidden when APRM module is
installed
details: /erp/devel/pi/rev/d72940496e1e
changeset: 8381:d72940496e1e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Sep 09 00:09:00 2010 +0200
summary: Removed not needed new BigDecimal and replaced by ZERO
details: /erp/devel/pi/rev/73cfbe5bea5f
changeset: 8382:73cfbe5bea5f
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 13 10:52:20 2010 +0200
summary: Fixes bug 0014523: Some dictionary tables are not flag to be
accounted by default
details: /erp/devel/pi/rev/632a52a68689
changeset: 8383:632a52a68689
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 13 13:47:28 2010 +0200
summary: Fixes posting of payments when credit is used
details: /erp/devel/pi/rev/f2501cc0ea52
changeset: 8384:f2501cc0ea52
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 13 13:47:45 2010 +0200
summary: Fixes posting of transactions when credit is used
details: /erp/devel/pi/rev/fd0228396881
changeset: 8385:fd0228396881
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Sep 13 14:12:38 2010 +0200
summary: Fixes bug 0014465: Wrong account used when posting a payment
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 15 +-
src-db/database/sourcedata/AD_TABLE.xml | 6 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 58 +-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 175
++++++---
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 40
++-
src/org/openbravo/erpCommon/ad_reports/ReportAcctRedirectUtility.java | 17 +-
6 files changed, 198 insertions(+), 113 deletions(-)
diffs (truncated from 692 to 300 lines):
diff -r 21a760272789 -r fd0228396881 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 13 16:48:43 2010 +0530
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 13 14:12:38 2010 +0200
@@ -198926,14 +198926,14 @@
<!--82B7B2BAEDF94980E040007F010008E7-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--82B7B2BAEDF94980E040007F010008E7-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--82B7B2BAEDF94980E040007F010008E7--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--82B7B2BAEDF94980E040007F010008E7--> <SEQNO><![CDATA[100]]></SEQNO>
-<!--82B7B2BAEDF94980E040007F010008E7--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--82B7B2BAEDF94980E040007F010008E7--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--82B7B2BAEDF94980E040007F010008E7--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--82B7B2BAEDF94980E040007F010008E7-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--82B7B2BAEDF94980E040007F010008E7-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--82B7B2BAEDF94980E040007F010008E7-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--82B7B2BAEDF94980E040007F010008E7-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--82B7B2BAEDF94980E040007F010008E7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDF94980E040007F010008E7-->
<GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--82B7B2BAEDF94980E040007F010008E7-->
<GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
<!--82B7B2BAEDF94980E040007F010008E7--></AD_FIELD>
<!--82B7B2BAEDFA4980E040007F010008E7--><AD_FIELD>
@@ -198971,17 +198971,18 @@
<!--82B7B2BAEDFB4980E040007F010008E7-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<AD_TAB_ID><![CDATA[7F5E8E4C55914138A358F5087B532B59]]></AD_TAB_ID>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<AD_COLUMN_ID><![CDATA[8189F49FFEC66E56E040007F01003E83]]></AD_COLUMN_ID>
+<!--82B7B2BAEDFB4980E040007F010008E7-->
<AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--82B7B2BAEDFB4980E040007F010008E7--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--82B7B2BAEDFB4980E040007F010008E7--> <SEQNO><![CDATA[110]]></SEQNO>
-<!--82B7B2BAEDFB4980E040007F010008E7--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--82B7B2BAEDFB4980E040007F010008E7--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--82B7B2BAEDFB4980E040007F010008E7--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--82B7B2BAEDFB4980E040007F010008E7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDFB4980E040007F010008E7-->
<GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--82B7B2BAEDFB4980E040007F010008E7-->
<GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
<!--82B7B2BAEDFB4980E040007F010008E7--></AD_FIELD>
<!--82B7B2BAEDFC4980E040007F010008E7--><AD_FIELD>
@@ -203733,7 +203734,7 @@
<!--C92612B656AC11DEBB69837DC96AB39A-->
<AD_FIELD_ID><![CDATA[C92612B656AC11DEBB69837DC96AB39A]]></AD_FIELD_ID>
<!--C92612B656AC11DEBB69837DC96AB39A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--C92612B656AC11DEBB69837DC96AB39A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C92612B656AC11DEBB69837DC96AB39A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C92612B656AC11DEBB69837DC96AB39A--> <ISACTIVE><![CDATA[N]]></ISACTIVE>
<!--C92612B656AC11DEBB69837DC96AB39A--> <NAME><![CDATA[Tax]]></NAME>
<!--C92612B656AC11DEBB69837DC96AB39A--> <DESCRIPTION><![CDATA[The percentage
of money requested by the government for this specified product or
transaction.]]></DESCRIPTION>
<!--C92612B656AC11DEBB69837DC96AB39A--> <HELP><![CDATA[The Tax indicates the
type of tax for this document line.]]></HELP>
diff -r 21a760272789 -r fd0228396881 src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Mon Sep 13 16:48:43 2010 +0530
+++ b/src-db/database/sourcedata/AD_TABLE.xml Mon Sep 13 14:12:38 2010 +0200
@@ -10219,7 +10219,7 @@
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
-<!--4D8C3B3C31D1410DA046140C9F024D17-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--4D8C3B3C31D1410DA046140C9F024D17-->
<ISDEFAULTACCT><![CDATA[Y]]></ISDEFAULTACCT>
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<AD_PACKAGE_ID><![CDATA[5A3ED54AB1E64B84E040007F01006125]]></AD_PACKAGE_ID>
<!--4D8C3B3C31D1410DA046140C9F024D17-->
<ACCTDATE_COLUMN_ID><![CDATA[7DC34559B416B45BE040007F0100784A]]></ACCTDATE_COLUMN_ID>
@@ -10858,7 +10858,7 @@
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
-<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<ISDEFAULTACCT><![CDATA[Y]]></ISDEFAULTACCT>
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<AD_PACKAGE_ID><![CDATA[5A3ED54AB1E64B84E040007F01006125]]></AD_PACKAGE_ID>
<!--B1B7075C46934F0A9FD4C4D0F1457B42-->
<ACCTDATE_COLUMN_ID><![CDATA[8189F49FFEE26E56E040007F01003E83]]></ACCTDATE_COLUMN_ID>
@@ -11121,7 +11121,7 @@
<!--D1A97202E832470285C9B1EB026D54E2-->
<IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
<!--D1A97202E832470285C9B1EB026D54E2-->
<ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
<!--D1A97202E832470285C9B1EB026D54E2-->
<PO_WINDOW_ID><![CDATA[6F8F913FA60F4CBD93DC1D3AA696E76E]]></PO_WINDOW_ID>
-<!--D1A97202E832470285C9B1EB026D54E2-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--D1A97202E832470285C9B1EB026D54E2-->
<ISDEFAULTACCT><![CDATA[Y]]></ISDEFAULTACCT>
<!--D1A97202E832470285C9B1EB026D54E2-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--D1A97202E832470285C9B1EB026D54E2-->
<AD_PACKAGE_ID><![CDATA[5A3ED54AB1E64B84E040007F01006125]]></AD_PACKAGE_ID>
<!--D1A97202E832470285C9B1EB026D54E2-->
<ACCTDATE_COLUMN_ID><![CDATA[7891269C83DB655DE040007F010155CE]]></ACCTDATE_COLUMN_ID>
diff -r 21a760272789 -r fd0228396881
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Sep 13
16:48:43 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Sep 13
14:12:38 2010 +0200
@@ -262,7 +262,7 @@
/**
* Cosntructor
- *
+ *
* @param m_AD_Client_ID
* Client ID of these Documents
* @param connectionProvider
@@ -339,7 +339,7 @@
/**
* Factory - Create Posting document
- *
+ *
* @param AD_Table_ID
* Table ID of Documents
* @param AD_Client_ID
@@ -661,7 +661,7 @@
/**
* Post Commit. Save Facts & Document
- *
+ *
* @param status
* status
* @return Posting Status
@@ -707,7 +707,7 @@
/**
* Save to Disk - set posted flag
- *
+ *
* @param con
* connection
* @param strUser
@@ -925,7 +925,7 @@
/**
* Posting logic for Accounting Schema index
- *
+ *
* @param index
* Accounting Schema index
* @return posting status/error code
@@ -1005,7 +1005,7 @@
/**
* Is the Source Document Balanced
- *
+ *
* @return true if (source) balanced
*/
public boolean isBalanced() {
@@ -1013,7 +1013,7 @@
if (MultiCurrency)
return true;
//
- boolean retValue = (getBalance().compareTo(new BigDecimal("0.00")) == 0);
+ boolean retValue = (getBalance().compareTo(ZERO) == 0);
if (retValue) {
if (log4j.isDebugEnabled())
log4j.debug("AcctServer - isBalanced - " + DocumentNo);
@@ -1024,7 +1024,7 @@
/**
* Is Document convertible to currency and Conversion Type
- *
+ *
* @param acctSchema
* accounting schema
* @return true, if convertable to accounting currency
@@ -1084,7 +1084,7 @@
/**
* Get the Amount (loaded in loadDocumentDetails)
- *
+ *
* @param AmtType
* see AMTTYPE_*
* @return Amount
@@ -1097,7 +1097,7 @@
/**
* Get Amount with index 0
- *
+ *
* @return Amount (primary document amount)
*/
public String getAmount() {
@@ -1106,7 +1106,7 @@
/**
* Convert an amount
- *
+ *
* @param CurFrom_ID
* The C_Currency_ID FROM
* @param CurTo_ID
@@ -1165,7 +1165,7 @@
/**
* Is Period Open
- *
+ *
* @return true if period is open
*/
public boolean isPeriodOpen() {
@@ -1211,7 +1211,7 @@
/**
* Matching
- *
+ *
* <pre>
* Derive Invoice-Receipt Match from PO-Invoice and PO-Receipt
* Purchase Order (20)
@@ -1225,10 +1225,10 @@
* (b) Creates Indirects
* - Invoice1 - Receipt2 (5)
* (Not imlemented)
- *
- *
+ *
+ *
* </pre>
- *
+ *
* @return number of records created
*/
public int match(VariablesSecureApp vars, ConnectionProvider conn,
Connection con) {
@@ -1283,7 +1283,7 @@
/**
* Create MatchInv record
- *
+ *
* @param AD_Client_ID
* Client
* @param AD_Org_ID
@@ -1321,7 +1321,7 @@
/**
* Get the account for Accounting Schema
- *
+ *
* @param AcctType
* see ACCTTYPE_*
* @param as
@@ -1463,7 +1463,7 @@
/**
* Get the account for Accounting Schema
- *
+ *
* @param cBPartnerId
* business partner id
* @param as
@@ -1480,6 +1480,7 @@
whereClause.append(" as cusa ");
whereClause.append(" where cusa.businessPartner.id = '" + cBPartnerId +
"'");
whereClause.append(" and cusa.accountingSchema.id = '" +
as.m_C_AcctSchema_ID + "'");
+ whereClause.append(" and (cusa.status is null or cusa.status = 'DE')");
final OBQuery<CustomerAccounts> obqParameters =
OBDal.getInstance().createQuery(
CustomerAccounts.class, whereClause.toString());
@@ -1495,9 +1496,10 @@
} else {
final StringBuilder whereClause = new StringBuilder();
- whereClause.append(" as cusa ");
- whereClause.append(" where cusa.businessPartner.id = '" + cBPartnerId +
"'");
- whereClause.append(" and cusa.accountingSchema.id = '" +
as.m_C_AcctSchema_ID + "'");
+ whereClause.append(" as vena ");
+ whereClause.append(" where vena.businessPartner.id = '" + cBPartnerId +
"'");
+ whereClause.append(" and vena.accountingSchema.id = '" +
as.m_C_AcctSchema_ID + "'");
+ whereClause.append(" and (vena.status is null or vena.status = 'DE')");
final OBQuery<VendorAccounts> obqParameters =
OBDal.getInstance().createQuery(
VendorAccounts.class, whereClause.toString());
@@ -1580,16 +1582,16 @@
Account account = null;
String strvalidCombination = "";
try {
- if (use.equals("INT"))
+ if ("INT".equals(use))
strvalidCombination = bIsReceipt ? financialAccountAccounting
.getInTransitPaymentAccountIN().getId() :
financialAccountAccounting
.getFINOutIntransitAcct().getId();
- else if (use.equals("DEP"))
+ else if ("DEP".equals(use))
strvalidCombination =
financialAccountAccounting.getDepositAccount().getId();
- else if (use.equals("CLE"))
+ else if ("CLE".equals(use))
strvalidCombination = bIsReceipt ?
financialAccountAccounting.getClearedPaymentAccount()
.getId() :
financialAccountAccounting.getClearedPaymentAccountOUT().getId();
- else if (use.equals("WIT"))
+ else if ("WIT".equals(use))
strvalidCombination =
financialAccountAccounting.getWithdrawalAccount().getId();
else
return null;
@@ -1615,14 +1617,14 @@
/**
* Get Source Currency Balance - subtracts line (and tax) amounts from total
- no rounding
- *
+ *
* @return positive amount, if total header is bigger than lines
*/
public abstract BigDecimal getBalance();
/**
* Create Facts (the accounting logic)
- *
+ *
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
