Fixes bug 20141, fixes bug 22094
authorEduardo Argal Guibert <eduardo.argal@openbravo.com>
Wed, 31 Oct 2012 17:46:30 +0100
changeset 18397 7f3004ab5086
parent 18396 878fdd8a63ba
child 18398 002fe38a059b
Fixes bug 20141, fixes bug 22094
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Wed Oct 31 17:45:28 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Wed Oct 31 17:46:30 2012 +0100
@@ -195,6 +195,17 @@
 
   public List<FIN_PaymentScheduleDetail> getFilteredScheduledPaymentDetails(
       Organization organization, BusinessPartner businessPartner, Currency currency,
+      Date dueDateFrom, Date dueDateTo, Date transactionDateFrom, Date transactionDateTo,
+      String strTransactionType, String strDocumentNo, FIN_PaymentMethod paymentMethod,
+      List<FIN_PaymentScheduleDetail> selectedScheduledPaymentDetails, boolean isReceipt,
+      String strAmountFrom, String strAmountTo) {
+    return getFilteredScheduledPaymentDetails(organization, businessPartner, currency, dueDateFrom,
+        dueDateTo, null, null, transactionDateFrom, transactionDateTo, strTransactionType, "",
+        paymentMethod, selectedScheduledPaymentDetails, isReceipt, strAmountFrom, strAmountTo);
+  }
+
+  public List<FIN_PaymentScheduleDetail> getFilteredScheduledPaymentDetails(
+      Organization organization, BusinessPartner businessPartner, Currency currency,
       Date dueDateFrom, Date dueDateTo, Date expectedDateFrom, Date expectedDateTo,
       Date transactionDateFrom, Date transactionDateTo, String strTransactionType,
       String strDocumentNo, FIN_PaymentMethod paymentMethod,
--- a/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml	Wed Oct 31 17:45:28 2012 +0100
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml	Wed Oct 31 17:46:30 2012 +0100
@@ -37,9 +37,9 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="DUEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
+      <column name="DUEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
         <default/>
-        <onCreateDefault/>
+        <onCreateDefault><![CDATA[NOW()]]></onCreateDefault>
       </column>
       <column name="FIN_PAYMENTMETHOD_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
         <default/>