details: /erp/stable/2.50/rev/3f3ccc3292c9
changeset: 9181:3f3ccc3292c9
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Feb 01 19:06:20 2011 +0100
summary: Backport APRM + core 3.0
Posting of Bank Statements.
Payment Priorities database model.
Advanced Matching Algorithm database model.
diffstat:
src-db/database/model/tables/C_INVOICE.xml |
7 +
src-db/database/model/tables/C_ORDER.xml |
7 +
src-db/database/model/tables/FIN_BANKSTATEMENT.xml |
4 +
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml |
6 +
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml |
20 +
src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml |
2 +-
src-db/database/model/tables/FIN_PAYMENT.xml |
6 +
src-db/database/model/tables/FIN_PAYMENT_PRIORITY.xml |
69 +
src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml |
12 +
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml |
2 +-
src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml |
2 +-
src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml |
2 +-
src-db/database/sourcedata/AD_CALLOUT.xml |
10 +
src-db/database/sourcedata/AD_COLUMN.xml |
969 +++++++++-
src-db/database/sourcedata/AD_ELEMENT.xml |
119 +-
src-db/database/sourcedata/AD_FIELD.xml |
323 +++-
src-db/database/sourcedata/AD_MESSAGE.xml |
23 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml |
48 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml |
50 +
src-db/database/sourcedata/AD_PROCESS.xml |
20 +
src-db/database/sourcedata/AD_PROCESS_PARA.xml |
41 +
src-db/database/sourcedata/AD_TAB.xml |
26 +
src-db/database/sourcedata/AD_TABLE.xml |
27 +-
src-db/database/sourcedata/AD_WINDOW.xml |
15 +
src/org/openbravo/erpCommon/ad_actionButton/Posted.java |
2 +-
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java |
166 +
src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java |
2 +
src/org/openbravo/erpCommon/ad_forms/AcctServer.java |
4 +
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java |
242 ++
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatementTemplate.java |
53 +
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransactionTemplate.java |
2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java |
9 +
src/org/openbravo/erpCommon/ad_forms/DocFINPaymentTemplate.java |
4 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java |
8 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliationTemplate.java |
2 +-
src/org/openbravo/erpCommon/ad_process/UpdatePaymentPlan.java |
104 +
36 files changed, 2380 insertions(+), 28 deletions(-)
diffs (truncated from 3265 to 300 lines):
diff -r 4d149e0e9671 -r 3f3ccc3292c9 src-db/database/model/tables/C_INVOICE.xml
--- a/src-db/database/model/tables/C_INVOICE.xml Mon Jan 31 13:10:07
2011 +0100
+++ b/src-db/database/model/tables/C_INVOICE.xml Tue Feb 01 19:06:20
2011 +0100
@@ -241,6 +241,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="FIN_PAYMENT_PRIORITY_ID" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="C_BPARTNER_LOCATION"
name="C_BPLOCATION_CINVOICE">
<reference local="C_BPARTNER_LOCATION_ID"
foreign="C_BPARTNER_LOCATION_ID"/>
</foreign-key>
@@ -298,6 +302,9 @@
<foreign-key foreignTable="AD_USER" name="C_INVOICE_SALESREP">
<reference local="SALESREP_ID" foreign="AD_USER_ID"/>
</foreign-key>
+ <foreign-key foreignTable="FIN_PAYMENT_PRIORITY"
name="FIN_INVOICE_PAYMENT_PRIORITY">
+ <reference local="FIN_PAYMENT_PRIORITY_ID"
foreign="FIN_PAYMENT_PRIORITY_ID"/>
+ </foreign-key>
<index name="C_INVOICE_BPARTNER" unique="false">
<index-column name="C_BPARTNER_ID"/>
</index>
diff -r 4d149e0e9671 -r 3f3ccc3292c9 src-db/database/model/tables/C_ORDER.xml
--- a/src-db/database/model/tables/C_ORDER.xml Mon Jan 31 13:10:07 2011 +0100
+++ b/src-db/database/model/tables/C_ORDER.xml Tue Feb 01 19:06:20 2011 +0100
@@ -273,6 +273,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="FIN_PAYMENT_PRIORITY_ID" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER">
<reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
</foreign-key>
@@ -348,6 +352,9 @@
<foreign-key foreignTable="AD_USER" name="C_ORDER_SALESREP">
<reference local="SALESREP_ID" foreign="AD_USER_ID"/>
</foreign-key>
+ <foreign-key foreignTable="FIN_PAYMENT_PRIORITY"
name="FIN_ORDER_PAYMENT_PRIORITY">
+ <reference local="FIN_PAYMENT_PRIORITY_ID"
foreign="FIN_PAYMENT_PRIORITY_ID"/>
+ </foreign-key>
<index name="C_ORDER_BPARTNER" unique="false">
<index-column name="C_BPARTNER_ID"/>
</index>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_BANKSTATEMENT.xml
--- a/src-db/database/model/tables/FIN_BANKSTATEMENT.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/tables/FIN_BANKSTATEMENT.xml Tue Feb 01
19:06:20 2011 +0100
@@ -77,6 +77,10 @@
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
+ <column name="POSTED" primaryKey="false" required="true" type="VARCHAR"
size="60" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_BANKSTAT_ADCLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
--- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Tue Feb 01
19:06:20 2011 +0100
@@ -117,6 +117,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="CREATEDBYALGORITHM" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_TRANSACTION">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -150,5 +154,7 @@
<unique name="FIN_FINACC_TRANSACTION_UN">
<unique-column name="FIN_PAYMENT_ID"/>
</unique>
+ <check name="FIN_TRANS_CREATE_ALGORITHM_CHK"><![CDATA[CREATEDBYALGORITHM
IN ('Y', 'N')]]></check>
+ <check name="FIN_TRANS_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Mon Jan
31 13:10:07 2011 +0100
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Tue Feb
01 19:06:20 2011 +0100
@@ -93,12 +93,27 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="FIN_ASSET_ACCT" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="FIN_TRANSITORY_ACCT" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ENABLEBANKSTATEMENT" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_FINACC_ACCT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="FIN_FINACC_ACCT_AD_ORG">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <foreign-key foreignTable="C_VALIDCOMBINATION"
name="FIN_FINACC_ACCT_ASSET">
+ <reference local="FIN_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+ </foreign-key>
<foreign-key foreignTable="C_VALIDCOMBINATION"
name="FIN_FINACC_ACCT_BANKFEE">
<reference local="FIN_BANKFEE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
</foreign-key>
@@ -141,6 +156,9 @@
<foreign-key foreignTable="C_VALIDCOMBINATION"
name="FIN_FINACC_ACCT_REVALLOSS">
<reference local="FIN_BANKREVALUATIONLOSS_ACCT"
foreign="C_VALIDCOMBINATION_ID"/>
</foreign-key>
+ <foreign-key foreignTable="C_VALIDCOMBINATION"
name="FIN_FINACC_ACCT_TRANSITORY">
+ <reference local="FIN_TRANSITORY_ACCT"
foreign="C_VALIDCOMBINATION_ID"/>
+ </foreign-key>
<foreign-key foreignTable="C_VALIDCOMBINATION"
name="FIN_FINACC_ACCT_WITHDRAWAL">
<reference local="FIN_WITHDRAWAL_ACCT"
foreign="C_VALIDCOMBINATION_ID"/>
</foreign-key>
@@ -148,6 +166,8 @@
<unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
<unique-column name="C_ACCTSCHEMA_ID"/>
</unique>
+ <check
name="FIN_FINACC_ACCT_BSCONFIG_CHECK"><![CDATA[(((ENABLEBANKSTATEMENT = 'Y')
AND (FIN_TRANSITORY_ACCT IS NOT NULL)) AND (FIN_ASSET_ACCT IS NOT NULL)) OR
(ENABLEBANKSTATEMENT <> 'Y')]]></check>
+ <check
name="FIN_FINACC_ACCT_ENABLEBS_CHECK"><![CDATA[ENABLEBANKSTATEMENT IN ('Y',
'N')]]></check>
<check name="FIN_FINACC_ACCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml
--- a/src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml Tue Feb 01
19:06:20 2011 +0100
@@ -37,7 +37,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="255" autoIncrement="false">
+ <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="2000" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_PAYMENT.xml
--- a/src-db/database/model/tables/FIN_PAYMENT.xml Mon Jan 31 13:10:07
2011 +0100
+++ b/src-db/database/model/tables/FIN_PAYMENT.xml Tue Feb 01 19:06:20
2011 +0100
@@ -125,6 +125,10 @@
<default><![CDATA[0]]></default>
<onCreateDefault/>
</column>
+ <column name="CREATEDBYALGORITHM" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_PAYMENTS">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -155,5 +159,7 @@
<foreign-key foreignTable="C_PROJECT" name="FIN_PAYMENT_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
+ <check name="FIN_PAYMENT_CREATE_ALGORIT_CHK"><![CDATA[CREATEDBYALGORITHM
IN ('Y', 'N')]]></check>
+ <check name="FIN_PAYMENT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_PAYMENT_PRIORITY.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/FIN_PAYMENT_PRIORITY.xml Tue Feb 01
19:06:20 2011 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+ <database name="TABLE FIN_PAYMENT_PRIORITY">
+ <table name="FIN_PAYMENT_PRIORITY" primaryKey="FIN_PAYMENT_PRIORITY_KEY">
+ <column name="FIN_PAYMENT_PRIORITY_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="PRIORITY" primaryKey="false" required="true"
type="DECIMAL" size="10,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="NAME" primaryKey="false" required="true" type="NVARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="255" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="COLOR" primaryKey="false" required="false" type="VARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <foreign-key foreignTable="AD_CLIENT" name="FIN_PAYMENT_PRIORITY_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="FIN_PAYMENT_PRIORITY_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <unique name="FIN_PAYMENT_PRIORITY_UN">
+ <unique-column name="AD_CLIENT_ID"/>
+ <unique-column name="PRIORITY"/>
+ </unique>
+ <check name="FIN_PAYPRIORITY_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ <check name="FIN_PAYPRIORITY_DEFAULT_CHK"><![CDATA[ISDEFAULT IN ('Y',
'N')]]></check>
+ </table>
+ </database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml
--- a/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml Tue Feb 01
19:06:20 2011 +0100
@@ -65,6 +65,14 @@
<default><![CDATA[Y]]></default>
<onCreateDefault/>
</column>
+ <column name="FIN_PAYMENT_PRIORITY_ID" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATE_PAYMENT_PLAN" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_PAYMENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -83,5 +91,9 @@
<foreign-key foreignTable="FIN_PAYMENTMETHOD"
name="FIN_PAYMENTMETHOD_PAYMENT_SCH">
<reference local="FIN_PAYMENTMETHOD_ID"
foreign="FIN_PAYMENTMETHOD_ID"/>
</foreign-key>
+ <foreign-key foreignTable="FIN_PAYMENT_PRIORITY"
name="FIN_PAYSCHED_PAYPRIORITY">
+ <reference local="FIN_PAYMENT_PRIORITY_ID"
foreign="FIN_PAYMENT_PRIORITY_ID"/>
+ </foreign-key>
+ <check name="FIN_PAYSCHED_UPP_CHK"><![CDATA[UPDATE_PAYMENT_PLAN IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Tue Feb 01
19:06:20 2011 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<database name="VIEW FIN_PAYMENT_DETAIL_V">
- <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT
psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id,
psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated,
psd.updatedby, psi.fin_payment_sched_inv_v_id, pso.fin_payment_sched_ord_v_id,
i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno,
pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate,
COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected,
pso.expected) AS expected, psd.amount AS paidamt, p.c_bpartner_id,
p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id,
p.paymentdate, gli.name AS glitemname
+ <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT
psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id,
psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated,
psd.updatedby, psi.fin_payment_sched_inv_v_id, pso.fin_payment_sched_ord_v_id,
i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno,
pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate,
COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected,
pso.expected) AS expected, psd.amount AS paidamt, p.c_bpartner_id,
p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id,
p.paymentdate, gli.name AS glitemname, pd.writeoffamt
FROM fin_payment p, fin_payment_detail pd
JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
LEFT JOIN fin_payment_sched_inv_v psi ON psd.fin_payment_schedule_invoice =
psi.fin_payment_sched_inv_v_id
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml Tue Feb 01
19:06:20 2011 +0100
@@ -6,6 +6,6 @@
LEFT JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
WHERE ps.c_invoice_id IS NOT NULL AND psd.fin_payment_schedule_invoice =
ps.fin_payment_schedule_id) AS lastpayment, (SELECT count(*) AS count
FROM fin_payment_detail pd, fin_payment_scheduledetail psd
-WHERE pd.fin_payment_detail_id = psd.fin_payment_detail_id AND ps.c_invoice_id
IS NOT NULL AND psd.fin_payment_schedule_invoice = ps.fin_payment_schedule_id)
AS numberofpayments
+WHERE pd.fin_payment_detail_id = psd.fin_payment_detail_id AND ps.c_invoice_id
IS NOT NULL AND psd.fin_payment_schedule_invoice = ps.fin_payment_schedule_id)
AS numberofpayments, ps.fin_payment_priority_id, ps.update_payment_plan
FROM fin_payment_schedule ps]]></view>
</database>
diff -r 4d149e0e9671 -r 3f3ccc3292c9
src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml Mon Jan 31
13:10:07 2011 +0100
+++ b/src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml Tue Feb 01
19:06:20 2011 +0100
@@ -6,6 +6,6 @@
LEFT JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
WHERE ps.c_order_id IS NOT NULL AND psd.fin_payment_schedule_order =
ps.fin_payment_schedule_id) AS lastpayment, (SELECT count(*) AS count
FROM fin_payment_detail pd, fin_payment_scheduledetail psd
-WHERE pd.fin_payment_detail_id = psd.fin_payment_detail_id AND ps.c_order_id
IS NOT NULL AND psd.fin_payment_schedule_order = ps.fin_payment_schedule_id) AS
numberofpayments
+WHERE pd.fin_payment_detail_id = psd.fin_payment_detail_id AND ps.c_order_id
IS NOT NULL AND psd.fin_payment_schedule_order = ps.fin_payment_schedule_id) AS
numberofpayments, ps.fin_payment_priority_id, ps.update_payment_plan
------------------------------------------------------------------------------
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
