details: /erp/stable/2.50/rev/cea20119f67c
changeset: 9297:cea20119f67c
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Thu Mar 17 09:24:59 2011 +0100
summary: Fixes issue 15759: Incorrect error message to unprocess a remittance.
details: /erp/stable/2.50/rev/11103918df2b
changeset: 9298:11103918df2b
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Thu Mar 17 17:59:27 2011 +0100
summary: Fixes issue 16362: Payment Report is not properly working: links are
not displayed.
details: /erp/stable/2.50/rev/1b165bcfba0b
changeset: 9299:1b165bcfba0b
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Fri Mar 18 09:56:53 2011 +0100
summary: Merge
diffstat:
src-db/database/model/functions/C_REMITTANCE_POST.xml | 18
++++-
src-db/database/model/tables/C_ELEMENTVALUE.xml | 4 +
src-db/database/model/triggers/C_PERIOD_TRG2.xml | 25
+++++-
src-db/database/sourcedata/AD_COLUMN.xml | 34
++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml | 13 +++
src-db/database/sourcedata/AD_FIELD.xml | 23
++++++
src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 24
+++++-
src/org/openbravo/erpCommon/ad_forms/FactLine.java | 2 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql | 7 +-
src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 10 ++-
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql | 4 +-
13 files changed, 152 insertions(+), 25 deletions(-)
diffs (truncated from 370 to 300 lines):
diff -r 437a06f270a0 -r 1b165bcfba0b
src-db/database/model/functions/C_REMITTANCE_POST.xml
--- a/src-db/database/model/functions/C_REMITTANCE_POST.xml Wed Mar 16
18:18:33 2011 +0100
+++ b/src-db/database/model/functions/C_REMITTANCE_POST.xml Fri Mar 18
09:56:53 2011 +0100
@@ -87,6 +87,8 @@
v_line NUMBER;
v_remittanceLineCount NUMBER;
FINISH_PROCESS BOOLEAN:=FALSE;
+ v_isSettlementProcessed VARCHAR(60) ;
+ v_isC_DP_ManagementProcessed VARCHAR(60) ;
BEGIN
IF(p_PInstance_ID IS NOT NULL) THEN
-- Update AD_PInstance
@@ -176,7 +178,10 @@
IF NOT FINISH_PROCESS THEN
-- Unprocessing...
UPDATE C_REMITTANCE SET Processed='N' WHERE
C_Remittance_ID=v_Record_ID;
- C_DP_MANAGEMENT_POST(NULL, v_vDPManagementID) ;
+ SELECT PROCESSED INTO v_isC_DP_ManagementProcessed FROM
C_DP_MANAGEMENT WHERE C_DP_MANAGEMENT_ID = v_vDPManagementID;
+ IF (v_isC_DP_ManagementProcessed = 'Y') THEN
+ C_DP_MANAGEMENT_POST(NULL, v_vDPManagementID) ;
+ END IF;
SELECT COUNT(*)
INTO v_Aux
FROM C_REMITTANCE r
@@ -195,15 +200,20 @@
AND DP.WITHHOLDINGAMOUNT <> '0'
)
LOOP
- SELECT POSTED, DOCUMENTNO INTO v_Posted, v_documentno_Settlement
FROM C_SETTLEMENT WHERE C_SETTLEMENT_ID=Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
+ SELECT POSTED, DOCUMENTNO, PROCESSED INTO v_Posted,
v_documentno_Settlement, v_isSettlementProcessed FROM C_SETTLEMENT WHERE
C_SETTLEMENT_ID = Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
IF (v_Posted='Y') THEN
RAISE_APPLICATION_ERROR(-20000,
'@WITHHOLDING_SETTLEMENT_POSTED@' || v_documentno_Settlement || '.');
END IF;
- C_SETTLEMENT_POST(NULL, Cur_Settlements.C_SETTLEMENT_CANCEL_ID) ;
+ IF (v_isSettlementProcessed = 'Y') THEN
+ C_SETTLEMENT_POST(NULL, Cur_Settlements.C_SETTLEMENT_CANCEL_ID) ;
+ END IF;
UPDATE C_DEBT_PAYMENT SET C_SETTLEMENT_CANCEL_ID=NULL WHERE
C_SETTLEMENT_CANCEL_ID = Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
DELETE FROM C_SETTLEMENT WHERE
C_Settlement_ID=Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
END LOOP;
- C_SETTLEMENT_POST(NULL, v_vSettlementId) ;
+ SELECT PROCESSED INTO v_isSettlementProcessed FROM C_SETTLEMENT
WHERE C_SETTLEMENT_ID = v_vSettlementId;
+ IF (v_isSettlementProcessed = 'Y') THEN
+ C_SETTLEMENT_POST(NULL, v_vSettlementId) ;
+ END IF;
UPDATE C_REMITTANCELINE
SET C_DEBT_PAYMENT_CANCELLED=NULL
WHERE C_Remittance_ID=v_Record_ID;
diff -r 437a06f270a0 -r 1b165bcfba0b
src-db/database/model/tables/C_ELEMENTVALUE.xml
--- a/src-db/database/model/tables/C_ELEMENTVALUE.xml Wed Mar 16 18:18:33
2011 +0100
+++ b/src-db/database/model/tables/C_ELEMENTVALUE.xml Fri Mar 18 09:56:53
2011 +0100
@@ -117,6 +117,10 @@
<default><![CDATA[C]]></default>
<onCreateDefault/>
</column>
+ <column name="ISALWAYSSHOWN" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="C_ELEMENTVALUE_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 437a06f270a0 -r 1b165bcfba0b
src-db/database/model/triggers/C_PERIOD_TRG2.xml
--- a/src-db/database/model/triggers/C_PERIOD_TRG2.xml Wed Mar 16 18:18:33
2011 +0100
+++ b/src-db/database/model/triggers/C_PERIOD_TRG2.xml Fri Mar 18 09:56:53
2011 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<database name="TRIGGER C_PERIOD_TRG2">
- <trigger name="C_PERIOD_TRG2" table="C_PERIOD" fires="before"
insert="true" update="true" delete="false" foreach="row">
+ <trigger name="C_PERIOD_TRG2" table="C_PERIOD" fires="before"
insert="true" update="true" delete="true" foreach="row">
<body><![CDATA[
/*************************************************************************
* The contents of this file are subject to the Compiere Public
@@ -17,7 +17,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo, S.L.U.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -36,11 +36,23 @@
IF(UPDATING) THEN
IF NOT((COALESCE(:old.StartDate, v_DateNull) <> COALESCE(:NEW.StartDate,
v_DateNull))) THEN
- RETURN;
- END IF;
- END IF;
--- UPDATE C_Period SET EndDate= ADD_MONTHS(TRUNC(StartDate, 'MM'), 1) -1;
- :new.EndDate:= ADD_MONTHS(TRUNC(:new.StartDate, 'MM'), 1) -1;
+ RETURN;
+ END IF;
+ :new.EndDate:= ADD_MONTHS(TRUNC(:new.StartDate, 'MM'), 1) -1;
+ END IF;
+
+ IF(INSERTING) THEN
+ :new.EndDate:= ADD_MONTHS(TRUNC(:new.StartDate, 'MM'), 1) -1;
+ END IF;
+
+ IF DELETING THEN
+ DELETE FROM C_PeriodControl_log
+ WHERE periodno=:old.C_Period_ID;
+
+ DELETE FROM C_PeriodControl
+ WHERE C_Period_ID=:old.C_Period_ID;
+ END IF;
+
END C_PERIOD_TRG2
]]></body>
</trigger>
diff -r 437a06f270a0 -r 1b165bcfba0b src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Mar 16 18:18:33 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Mar 18 09:56:53 2011 +0100
@@ -310971,6 +310971,40 @@
<!--9DA88EFA815811C8E040007F01002646-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--9DA88EFA815811C8E040007F01002646--></AD_COLUMN>
+<!--9E96300C46ED4928E040007F01006BD5--><AD_COLUMN>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96300C46ED4928E040007F01006BD5--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96300C46ED4928E040007F01006BD5--> <DESCRIPTION><![CDATA[A node flagged
as "Title Node", will always be displayed in the report, even if the balance is
0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION>
+<!--9E96300C46ED4928E040007F01006BD5--> <HELP><![CDATA[A node flagged as
"Title Node", will always be displayed in the report, even if the balance is 0,
and the "Show only accounts with value" is flagged.]]></HELP>
+<!--9E96300C46ED4928E040007F01006BD5-->
<COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_TABLE_ID><![CDATA[188]]></AD_TABLE_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9E96300C46ED4928E040007F01006BD5-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9E96300C46ED4928E040007F01006BD5--> <SEQNO><![CDATA[42]]></SEQNO>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <POSITION><![CDATA[30]]></POSITION>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9E96300C46ED4928E040007F01006BD5--></AD_COLUMN>
+
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C--><AD_COLUMN>
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->
<AD_COLUMN_ID><![CDATA[9F3ADE0CE0734BE2BD059AAEFCF1D51C]]></AD_COLUMN_ID>
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 437a06f270a0 -r 1b165bcfba0b src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Mar 16 18:18:33 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Mar 18 09:56:53 2011 +0100
@@ -27609,6 +27609,19 @@
<!--9D376EF8B99B40C88E4D2D2A172DE6A8-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9D376EF8B99B40C88E4D2D2A172DE6A8--></AD_ELEMENT>
+<!--9E96304962F87A34E040007F01006BDB--><AD_ELEMENT>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96304962F87A34E040007F01006BDB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96304962F87A34E040007F01006BDB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96304962F87A34E040007F01006BDB-->
<COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME>
+<!--9E96304962F87A34E040007F01006BDB--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96304962F87A34E040007F01006BDB--> <PRINTNAME><![CDATA[Title
Node]]></PRINTNAME>
+<!--9E96304962F87A34E040007F01006BDB--> <DESCRIPTION><![CDATA[A node flagged
as "Title Node", will always be displayed in the report, even if the balance is
0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION>
+<!--9E96304962F87A34E040007F01006BDB--> <HELP><![CDATA[A node flagged as
"Title Node", will always be displayed in the report, even if the balance is 0,
and the "Show only accounts with value" is flagged.]]></HELP>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96304962F87A34E040007F01006BDB--></AD_ELEMENT>
+
<!--9F815073C39E4506A1C74BB3667C6B57--><AD_ELEMENT>
<!--9F815073C39E4506A1C74BB3667C6B57-->
<AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
<!--9F815073C39E4506A1C74BB3667C6B57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 437a06f270a0 -r 1b165bcfba0b src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Mar 16 18:18:33 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 18 09:56:53 2011 +0100
@@ -204324,6 +204324,29 @@
<!--9DADE14ACAF441DEB4E2B7966FB704B1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9DADE14ACAF441DEB4E2B7966FB704B1--></AD_FIELD>
+<!--9E96355953DF74BDE040007F01006BC5--><AD_FIELD>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_FIELD_ID><![CDATA[9E96355953DF74BDE040007F01006BC5]]></AD_FIELD_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96355953DF74BDE040007F01006BC5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96355953DF74BDE040007F01006BC5--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96355953DF74BDE040007F01006BC5--> <DESCRIPTION><![CDATA[A node flagged
as "Title Node", will always be displayed in the report, even if the balance is
0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION>
+<!--9E96355953DF74BDE040007F01006BC5--> <HELP><![CDATA[A node flagged as
"Title Node", will always be displayed in the report, even if the balance is 0,
and the "Show only accounts with value" is flagged.]]></HELP>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9E96355953DF74BDE040007F01006BC5--> <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9E96355953DF74BDE040007F01006BC5-->
<DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E96355953DF74BDE040007F01006BC5--> <SEQNO><![CDATA[220]]></SEQNO>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E96355953DF74BDE040007F01006BC5-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96355953DF74BDE040007F01006BC5--></AD_FIELD>
+
<!--9EB0289791634210B266BA459E47AC31--><AD_FIELD>
<!--9EB0289791634210B266BA459E47AC31-->
<AD_FIELD_ID><![CDATA[9EB0289791634210B266BA459E47AC31]]></AD_FIELD_ID>
<!--9EB0289791634210B266BA459E47AC31-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 437a06f270a0 -r 1b165bcfba0b src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 16 18:18:33 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Mar 18 09:56:53 2011 +0100
@@ -32072,6 +32072,17 @@
<!--81AE8943B83A4BFA92ACB6BA2F7FC4A8-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--81AE8943B83A4BFA92ACB6BA2F7FC4A8--></AD_MESSAGE>
+<!--81B47DEBF9E94A369C4629562A90A2B2--><AD_MESSAGE>
+<!--81B47DEBF9E94A369C4629562A90A2B2-->
<AD_MESSAGE_ID><![CDATA[81B47DEBF9E94A369C4629562A90A2B2]]></AD_MESSAGE_ID>
+<!--81B47DEBF9E94A369C4629562A90A2B2-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--81B47DEBF9E94A369C4629562A90A2B2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--81B47DEBF9E94A369C4629562A90A2B2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--81B47DEBF9E94A369C4629562A90A2B2-->
<VALUE><![CDATA[FACT_ACCT_C_PERIOD]]></VALUE>
+<!--81B47DEBF9E94A369C4629562A90A2B2--> <MSGTEXT><![CDATA[This record cannot
be deleted because it is associated with other existing elements. Please see
Linked Items]]></MSGTEXT>
+<!--81B47DEBF9E94A369C4629562A90A2B2--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--81B47DEBF9E94A369C4629562A90A2B2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--81B47DEBF9E94A369C4629562A90A2B2--></AD_MESSAGE>
+
<!--82C113B8F4134B57A4791BAC35B03ADC--><AD_MESSAGE>
<!--82C113B8F4134B57A4791BAC35B03ADC-->
<AD_MESSAGE_ID><![CDATA[82C113B8F4134B57A4791BAC35B03ADC]]></AD_MESSAGE_ID>
<!--82C113B8F4134B57A4791BAC35B03ADC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 437a06f270a0 -r 1b165bcfba0b
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Wed Mar
16 18:18:33 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Fri Mar
18 09:56:53 2011 +0100
@@ -213,6 +213,7 @@
docLine.setCGlItemId(data[i].getField("cGlItemId"));
docLine.setPaymentAmount(data[i].getField("PaymentAmount"));
docLine.setDepositAmount(data[i].getField("DepositAmount"));
+ docLine.setAmount(data[i].getField("Amount"));
docLine.setWriteOffAmt(data[i].getField("WriteOffAmt"));
docLine.setAmount(data[i].getField("Amount"));
docLine.loadAttributes(data[i], this);
@@ -429,14 +430,25 @@
if (usedCredit.compareTo(ZERO) != 0 && generatedCredit.compareTo(ZERO) ==
0)
retValue.add(usedCredit);
sb.append(retValue);
+ FIN_Payment payment = OBDal.getInstance().get(FIN_FinaccTransaction.class,
Record_ID)
+ .getFinPayment();
// - Lines
for (int i = 0; i < p_lines.length; i++) {
- BigDecimal lineBalance = new BigDecimal(
- ((DocLine_FINFinAccTransaction) p_lines[i]).DepositAmount);
- lineBalance = lineBalance.subtract(new BigDecimal(
- ((DocLine_FINFinAccTransaction) p_lines[i]).PaymentAmount));
- retValue = retValue.subtract(lineBalance);
- sb.append("-").append(lineBalance);
+ if (payment == null) {
+ BigDecimal lineBalance = new BigDecimal(
+ ((DocLine_FINFinAccTransaction) p_lines[i]).DepositAmount);
+ lineBalance = lineBalance.subtract(new BigDecimal(
+ ((DocLine_FINFinAccTransaction) p_lines[i]).PaymentAmount));
+ retValue = retValue.subtract(lineBalance);
+ } else {
+ BigDecimal lineBalance = payment.isReceipt() ? new BigDecimal(
+ ((DocLine_FINFinAccTransaction) p_lines[i]).getAmount()) : new
BigDecimal(
+ ((DocLine_FINFinAccTransaction) p_lines[i]).getAmount()).negate();
+ BigDecimal lineWriteoff = payment.isReceipt() ? new BigDecimal(
+ ((DocLine_FINFinAccTransaction) p_lines[i]).getWriteOffAmt()) :
new BigDecimal(
+ ((DocLine_FINFinAccTransaction)
p_lines[i]).getWriteOffAmt()).negate();
+ retValue = retValue.subtract(lineBalance).subtract(lineWriteoff);
+ }
}
sb.append("]");
//
diff -r 437a06f270a0 -r 1b165bcfba0b
src/org/openbravo/erpCommon/ad_forms/FactLine.java
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine.java Wed Mar 16
18:18:33 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine.java Fri Mar 18
09:56:53 2011 +0100
@@ -885,7 +885,7 @@
}
}
if (description.length() == 0) {
- description.append(m_docVO.DocumentNo);
+ description.append((m_docVO.DocumentNo == null) ? "" :
m_docVO.DocumentNo);
if (!strC_Bpartner_ID.equals(""))
description.append(" # ").append(
AcctServerData.selectBpartnerName(connectionProvider,
strC_Bpartner_ID));
diff -r 437a06f270a0 -r 1b165bcfba0b
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Wed Mar 16 18:18:33 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Fri Mar 18 09:56:53 2011 +0100
@@ -22,7 +22,7 @@
<fo:simple-page-master master-name="first" page-height="29.7cm"
page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="2cm"
margin-right="1cm">
<fo:region-before extent="2.5cm"/>
<fo:region-after extent="1cm"/>
- <fo:region-body margin-top="2.5cm" margin-bottom="1cm"/>
+ <fo:region-body margin-top="2.5cm" margin-bottom="2cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="first" initial-page-number="xx"
id="fieldPageNo">
diff -r 437a06f270a0 -r 1b165bcfba0b
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
