details: /erp/devel/pi/rev/6919e9e1de89
changeset: 10083:6919e9e1de89
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Jan 24 11:55:07 2011 +0100
summary: adds payment priority support in invoice matching algorithm
details: /erp/devel/pi/rev/7b0cca48bc9c
changeset: 10084:7b0cca48bc9c
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Jan 24 12:28:48 2011 +0100
summary: adds missing message. Related to issue 0015734
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 ++++++++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
| 8 +++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diffs (46 lines):
diff -r 371037e68003 -r 7b0cca48bc9c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Jan 24 11:31:18 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Jan 24 12:28:48 2011 +0100
@@ -110,6 +110,17 @@
<!--4329807E1B00477B8A87C32A2B123DFB-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--4329807E1B00477B8A87C32A2B123DFB--></AD_MESSAGE>
+<!--49C16126D1A141C398175B0632C08F95--><AD_MESSAGE>
+<!--49C16126D1A141C398175B0632C08F95-->
<AD_MESSAGE_ID><![CDATA[49C16126D1A141C398175B0632C08F95]]></AD_MESSAGE_ID>
+<!--49C16126D1A141C398175B0632C08F95-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--49C16126D1A141C398175B0632C08F95--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--49C16126D1A141C398175B0632C08F95--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--49C16126D1A141C398175B0632C08F95-->
<VALUE><![CDATA[APRM_FinancialAccountNotInNaturalTree]]></VALUE>
+<!--49C16126D1A141C398175B0632C08F95--> <MSGTEXT><![CDATA[The organization of
the financial account does not belong to the natural tree of organizations of
the payment]]></MSGTEXT>
+<!--49C16126D1A141C398175B0632C08F95--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--49C16126D1A141C398175B0632C08F95-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--49C16126D1A141C398175B0632C08F95--></AD_MESSAGE>
+
<!--53ED8846C7984389AF83AC1DE983859E--><AD_MESSAGE>
<!--53ED8846C7984389AF83AC1DE983859E-->
<AD_MESSAGE_ID><![CDATA[53ED8846C7984389AF83AC1DE983859E]]></AD_MESSAGE_ID>
<!--53ED8846C7984389AF83AC1DE983859E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 371037e68003 -r 7b0cca48bc9c
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
Mon Jan 24 11:31:18 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
Mon Jan 24 12:28:48 2011 +0100
@@ -178,6 +178,10 @@
whereClause.append(" psd.");
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
whereClause.append(".");
+ whereClause.append(FIN_PaymentSchedule.PROPERTY_FINPAYMENTPRIORITY);
+ whereClause.append(", psd.");
+
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
+ whereClause.append(".");
whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
whereClause.append(", psd.");
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
@@ -386,6 +390,10 @@
whereClause.append(" psd.");
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
whereClause.append(".");
+ whereClause.append(FIN_PaymentSchedule.PROPERTY_FINPAYMENTPRIORITY);
+ whereClause.append(", psd.");
+
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
+ whereClause.append(".");
whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
whereClause.append(", psd.");
whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
------------------------------------------------------------------------------
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
