diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
index b051480e6b5cf05e324edfde51be511caa06ab0e..20d430d12b553c426a459a33ec4c91fe26d97e9f 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
@@ -53,6 +53,12 @@
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>getRecoupDate</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>getResourceUid</string> </key>
<value>
@@ -89,30 +95,6 @@
<dictionary/>
</value>
</item>
- <item>
- <key> <string>getStartDateRangeMax</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDateRangeMin</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDateRangeMax</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDateRangeMin</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>isDelivery</string> </key>
<value>
@@ -139,10 +121,7 @@
<string>getSourceSectionUid</string>
<string>getDestinationSectionUid</string>
<string>getResourceUid</string>
-<string>getStartDateRangeMin</string>
-<string>getStartDateRangeMax</string>
-<string>getStopDateRangeMin</string>
-<string>getStopDateRangeMax</string>
+<string>getRecoupDate</string>
<string>getSourcePaymentReference</string>
<string>getDestinationPaymentReference</string>
<string>getSourcePaymentInternalBankAccountNumber</string>
@@ -177,10 +156,7 @@ getDestinationUid\r\n
getSourceSectionUid\r\n
getDestinationSectionUid\r\n
getResourceUid\r\n
-getStartDateRangeMin\r\n
-getStartDateRangeMax\r\n
-getStopDateRangeMin\r\n
-getStopDateRangeMax\r\n
+getRecoupDate\r\n
getSourcePaymentReference\r\n
getDestinationPaymentReference\r\n
getSourcePaymentInternalBankAccountNumber\r\n
@@ -243,10 +219,7 @@ VALUES\n
<dtml-sqlvar expr="getSourceSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMax[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMax[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="getRecoupDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getSourcePaymentReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getDestinationPaymentReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSourcePaymentInternalBankAccountNumber[loop_item]" type="string" optional>,\n
@@ -315,10 +288,7 @@ VALUES\n
<dtml-sqlvar expr="getSourceSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMax[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMax[loop_item]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="getRecoupDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getSourcePaymentReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getDestinationPaymentReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSourcePaymentInternalBankAccountNumber[loop_item]" type="string" optional>,\n
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
index 65fb6726dd8ca8c305a26981cbb8c6d964eee63f..ab11f86bbef8e457e95bcd0cd082affdf455b0dd 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
@@ -107,10 +107,7 @@
`source_section_uid` BIGINT UNSIGNED default \'0\',\n
`destination_section_uid` BIGINT UNSIGNED default \'0\',\n
`resource_uid` BIGINT UNSIGNED default \'0\',\n
- `start_date_range_min` datetime default NULL,\n
- `start_date_range_max` datetime default NULL,\n
- `stop_date_range_min` datetime default NULL,\n
- `stop_date_range_max` datetime default NULL,\n
+ `recoup_date` datetime default NULL,\n
`source_payment_reference` varchar(255) default \'\',\n
`destination_payment_reference` varchar(255) default \'\',\n
`source_payment_internal_bank_account_number` varchar(255) default \'\',\n
@@ -168,10 +165,7 @@
`source_section_uid` BIGINT UNSIGNED default \'0\',\n
`destination_section_uid` BIGINT UNSIGNED default \'0\',\n
`resource_uid` BIGINT UNSIGNED default \'0\',\n
- `start_date_range_min` datetime default NULL,\n
- `start_date_range_max` datetime default NULL,\n
- `stop_date_range_min` datetime default NULL,\n
- `stop_date_range_max` datetime default NULL,\n
+ `recoup_date` datetime default NULL,\n
`source_payment_reference` varchar(255) default \'\',\n
`destination_payment_reference` varchar(255) default \'\',\n
`source_payment_internal_bank_account_number` varchar(255) default \'\',\n
diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log
index eb92edf76fcea9134882e91d7ebb81f28936a378..9501b5a702e3c358f3bccf5ebcdc641fef69bfd5 100644
--- a/bt5/erp5_banking_core/bt/change_log
+++ b/bt5/erp5_banking_core/bt/change_log
@@ -1,3 +1,6 @@
+2006-06-08 Aurel
+* put recoup date in delivery table instead of start/stop_range_min/max
+
2006-12-01 Seb
* add many more checks with the counter date when we open and close it.
diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision
index a36df4ef7e665aeef180868d3463a28b48b6106d..800607208989be000adc8de8c204c78b2ec63f3a 100644
--- a/bt5/erp5_banking_core/bt/revision
+++ b/bt5/erp5_banking_core/bt/revision
@@ -1 +1 @@
-269
\ No newline at end of file
+272
\ No newline at end of file