[Erp5-report] r17414 - in /erp5/trunk/bt5/erp5_banking_check: PortalTypeAllowedContentTypeT...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 6 13:37:18 CET 2007
Author: aurel
Date: Tue Nov 6 13:37:18 2007
New Revision: 17414
URL: http://svn.erp5.org?rev=17414&view=rev
Log:
2007-11-06 aurel
* remove checkbook movement module
* use issue date on check operation line
Modified:
erp5/trunk/bt5/erp5_banking_check/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_banking_check/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
erp5/trunk/bt5/erp5_banking_check/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view/my_destination_payment_reference.xml
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
erp5/trunk/bt5/erp5_banking_check/bt/change_log
erp5/trunk/bt5/erp5_banking_check/bt/revision
erp5/trunk/bt5/erp5_banking_check/bt/template_action_path_list
erp5/trunk/bt5/erp5_banking_check/bt/template_module_id_list
erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_hidden_content_type_list
erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_id_list
erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list
erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_workflow_chain_list
erp5/trunk/bt5/erp5_banking_check/bt/template_workflow_id_list
Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Tue Nov 6 13:37:18 2007
@@ -18,12 +18,6 @@
</portal_type>
<portal_type id="Checkbook Delivery Module">
<item>Checkbook Delivery</item>
- </portal_type>
- <portal_type id="Checkbook Movement">
- <item>Checkbook Delivery Line</item>
- </portal_type>
- <portal_type id="Checkbook Movement Module">
- <item>Checkbook Movement</item>
</portal_type>
<portal_type id="Checkbook Reception">
<item>Checkbook Reception Line</item>
Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml Tue Nov 6 13:37:18 2007
@@ -7,9 +7,6 @@
<item>Cash Delivery Line</item>
</portal_type>
<portal_type id="Checkbook Delivery">
- <item>Checkbook Delivery Line</item>
- </portal_type>
- <portal_type id="Checkbook Movement">
<item>Checkbook Delivery Line</item>
</portal_type>
<portal_type id="Checkbook Reception">
Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml Tue Nov 6 13:37:18 2007
@@ -8,10 +8,6 @@
<item>ItemAggregation</item>
</portal_type>
<portal_type id="Checkbook Delivery">
- <item>Amount</item>
- <item>Price</item>
- </portal_type>
- <portal_type id="Checkbook Movement">
<item>Amount</item>
<item>Price</item>
</portal_type>
Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Tue Nov 6 13:37:18 2007
@@ -10,10 +10,6 @@
<chain>
<type>Checkbook Delivery</type>
<workflow>checkbook_delivery_workflow, edit_workflow</workflow>
- </chain>
- <chain>
- <type>Checkbook Movement</type>
- <workflow>edit_workflow, checkbook_movement_workflow</workflow>
</chain>
<chain>
<type>Checkbook Reception</type>
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml Tue Nov 6 13:37:18 2007
@@ -127,6 +127,10 @@
reference_range_max = line.get(\'reference_range_max\',None)\n
check_amount = line.get(\'check_amount\',None)\n
quantity = int(line.get(\'quantity\',0))\n
+ if quantity not in (None, 0) and item_model.isAccountNumberEnabled() \\\n
+ and destination_payment_reference in (None,\'\'):\n
+ message = \'You must define an account\'\n
+ generate_error(line,\'destination_payment_reference\',message)\n
if destination_payment_reference not in (None,\'\'):\n
# String index contains the internal bank account reference\n
account_list = [x.getObject() for x in\n
@@ -294,12 +298,12 @@
<string>check_amount</string>
<string>int</string>
<string>quantity</string>
+ <string>message</string>
<string>append</string>
<string>$append0</string>
<string>x</string>
<string>account_list</string>
<string>len</string>
- <string>message</string>
<string>_getitem_</string>
<string>account</string>
<string>_write_</string>
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view/my_destination_payment_reference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view/my_destination_payment_reference.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view/my_destination_payment_reference.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view/my_destination_payment_reference.xml Tue Nov 6 13:37:18 2007
@@ -476,7 +476,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Account Number</string> </value>
+ <value> <string>Credit Account Number</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml Tue Nov 6 13:37:18 2007
@@ -204,6 +204,10 @@
destination_payment_value = line.getDestinationPaymentValue()\n
# Not required any more to serialize the bank account\n
#destination_payment_value.serialize()\n
+ context.log(\'context.getRelativeUrl() before getUid of destination payment\', context.getRelativeUrl())\n
+ if destination_payment_value is None:\n
+ message = Message(domain=\'ui\', message=\'There is not destination payment on line with id: $id\', mapping={\'id\': context.getId()})\n
+ raise ValueError, (message,)\n
destination_payment_uid = destination_payment_value.getUid()\n
destination_trade = line.getDestinationTrade()\n
else:\n
@@ -375,6 +379,8 @@
<string>int_to_reference</string>
<string>False</string>
<string>destination_payment_value</string>
+ <string>message</string>
+ <string>ValueError</string>
<string>destination_payment_uid</string>
<string>destination_trade</string>
<string>aggregate_list</string>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml Tue Nov 6 13:37:18 2007
@@ -126,7 +126,7 @@
\n
# Test check is valid based on date\n
transaction.Check_checkIntervalBetweenDate(resource=check_operation_line.getAggregateResourceValue(),\n
- start_date=check_operation_line.getStartDate(),\n
+ start_date=check_operation_line.getIssueDate(),\n
stop_date=check_operation_line.getStopDate(),\n
check_nb=check_operation_line.getAggregateFreeText())\n
\n
Modified: erp5/trunk/bt5/erp5_banking_check/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/change_log?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/change_log Tue Nov 6 13:37:18 2007
@@ -1,3 +1,7 @@
+2007-11-06 aurel
+* remove checkbook movement module
+* use issue date on check operation line
+
2007-04-04 aurel
* add check deposit module
Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue Nov 6 13:37:18 2007
@@ -1,1 +1,1 @@
-334
+336
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_action_path_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_action_path_list Tue Nov 6 13:37:18 2007
@@ -24,16 +24,6 @@
Checkbook Delivery | metadata
Checkbook Delivery | print_pdf
Checkbook Delivery | view
-Checkbook Movement Module | list
-Checkbook Movement Module | list_ui
-Checkbook Movement Module | print_pdf
-Checkbook Movement Module | sort_on
-Checkbook Movement Module | view
-Checkbook Movement | fastinput
-Checkbook Movement | history
-Checkbook Movement | metadata
-Checkbook Movement | print_pdf
-Checkbook Movement | view
Checkbook Reception Line | metadata
Checkbook Reception Line | print
Checkbook Reception Line | view
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_module_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_module_id_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_module_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_module_id_list Tue Nov 6 13:37:18 2007
@@ -1,7 +1,6 @@
check_deposit_module
check_payment_module
checkbook_delivery_module
-checkbook_movement_module
checkbook_reception_module
checkbook_usual_cash_transfer_module
checkbook_vault_transfer_module
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_allowed_content_type_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_allowed_content_type_list Tue Nov 6 13:37:18 2007
@@ -6,8 +6,6 @@
Check Payment | Cash Delivery Line
Checkbook Delivery Module | Checkbook Delivery
Checkbook Delivery | Checkbook Delivery Line
-Checkbook Movement Module | Checkbook Movement
-Checkbook Movement | Checkbook Delivery Line
Checkbook Reception Module | Checkbook Reception
Checkbook Reception | Checkbook Reception Line
Checkbook Usual Cash Transfer Module | Checkbook Usual Cash Transfer
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_hidden_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_hidden_content_type_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_hidden_content_type_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_hidden_content_type_list Tue Nov 6 13:37:18 2007
@@ -2,7 +2,6 @@
Check Payment | Banking Operation Line
Check Payment | Cash Delivery Line
Checkbook Delivery | Checkbook Delivery Line
-Checkbook Movement | Checkbook Delivery Line
Checkbook Reception | Checkbook Reception Line
Checkbook Usual Cash Transfer | Checkbook Delivery Line
Checkbook Vault Transfer | Checkbook Delivery Line
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_id_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_id_list Tue Nov 6 13:37:18 2007
@@ -5,8 +5,6 @@
Checkbook Delivery
Checkbook Delivery Line
Checkbook Delivery Module
-Checkbook Movement
-Checkbook Movement Module
Checkbook Reception
Checkbook Reception Line
Checkbook Reception Module
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list Tue Nov 6 13:37:18 2007
@@ -4,8 +4,6 @@
Check Payment | Price
Checkbook Delivery | Amount
Checkbook Delivery | Price
-Checkbook Movement | Amount
-Checkbook Movement | Price
Checkbook Reception | CheckbookReception
Checkbook Usual Cash Transfer | Amount
Checkbook Usual Cash Transfer | Price
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_workflow_chain_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_workflow_chain_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_workflow_chain_list Tue Nov 6 13:37:18 2007
@@ -4,8 +4,6 @@
Check Payment | edit_workflow
Checkbook Delivery | checkbook_delivery_workflow
Checkbook Delivery | edit_workflow
-Checkbook Movement | checkbook_movement_workflow
-Checkbook Movement | edit_workflow
Checkbook Reception | checkbook_reception_workflow
Checkbook Reception | edit_workflow
Checkbook Usual Cash Transfer | checkbook_usual_cash_transfer_workflow
Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_workflow_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_workflow_id_list?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_workflow_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_workflow_id_list Tue Nov 6 13:37:18 2007
@@ -1,7 +1,6 @@
check_deposit_workflow
check_payment_workflow
checkbook_delivery_workflow
-checkbook_movement_workflow
checkbook_reception_workflow
checkbook_usual_cash_transfer_workflow
checkbook_vault_transfer_workflow
More information about the Erp5-report
mailing list