[Erp5-report] r13918 - in /erp5/trunk/bt5/erp5_banking_cash: PortalTypeAllowedContentTypeTe...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 4 11:02:46 CEST 2007
Author: aurel
Date: Wed Apr 4 11:02:37 2007
New Revision: 13918
URL: http://svn.erp5.org?rev=13918&view=rev
Log:
oups check deposit must go into check bt
Modified:
erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
erp5/trunk/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
erp5/trunk/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
erp5/trunk/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/transitions/deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/bt/change_log
erp5/trunk/bt5/erp5_banking_cash/bt/revision
erp5/trunk/bt5/erp5_banking_cash/bt/template_action_path_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_module_id_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_id_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list
erp5/trunk/bt5/erp5_banking_cash/bt/template_workflow_id_list
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Wed Apr 4 11:02:37 2007
@@ -68,13 +68,6 @@
<portal_type id="Cash To Currency Sale Module">
<item>Cash To Currency Sale</item>
</portal_type>
- <portal_type id="Check Deposit">
- <item>Check Operation Line</item>
- <item>Banking Operation Line</item>
- </portal_type>
- <portal_type id="Check Deposit Module">
- <item>Check Deposit</item>
- </portal_type>
<portal_type id="Classification Survey">
<item>Incoming Classification Survey Line</item>
<item>Outgoing Classification Survey Line</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml Wed Apr 4 11:02:37 2007
@@ -22,17 +22,14 @@
<portal_type id="Cash To Currency Sale">
<item>currency_exchange_type</item>
</portal_type>
- <portal_type id="Check Deposit">
- <item>site</item>
- </portal_type>
<portal_type id="Container Cell">
<item>variation</item>
<item>cash_status</item>
<item>emission_letter</item>
</portal_type>
<portal_type id="Container Line">
+ <item>emission_letter</item>
<item>variation</item>
- <item>emission_letter</item>
<item>cash_status</item>
</portal_type>
<portal_type id="Currency Purchase">
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml Wed Apr 4 11:02:37 2007
@@ -39,9 +39,6 @@
<portal_type id="Cash To Currency Sale">
<item>Outgoing Cash To Currency Sale Line</item>
<item>Incoming Cash To Currency Sale Line</item>
- </portal_type>
- <portal_type id="Check Deposit">
- <item>Banking Operation Line</item>
</portal_type>
<portal_type id="Classification Survey">
<item>Outgoing Classification Survey Line</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml Wed Apr 4 11:02:37 2007
@@ -43,10 +43,6 @@
<item>Amount</item>
<item>Price</item>
<item>Resource</item>
- </portal_type>
- <portal_type id="Check Deposit">
- <item>Amount</item>
- <item>Price</item>
</portal_type>
<portal_type id="Container Cell">
<item>CashContainer</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Wed Apr 4 11:02:37 2007
@@ -34,10 +34,6 @@
<chain>
<type>Cash To Currency Sale</type>
<workflow>cash_to_currency_sale_workflow, edit_workflow</workflow>
- </chain>
- <chain>
- <type>Check Deposit</type>
- <workflow>check_deposit_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Classification Survey</type>
@@ -77,7 +73,7 @@
</chain>
<chain>
<type>Monetary Destruction</type>
- <workflow>edit_workflow, monetary_destruction_workflow</workflow>
+ <workflow>monetary_destruction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Monetary Issue</type>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml Wed Apr 4 11:02:37 2007
@@ -75,6 +75,12 @@
vault = transaction.getSource()\n
vaultDestination = transaction.getDestination()\n
\n
+\n
+# use of the constraint : Test source and destination\n
+vliste = transaction.checkConsistency()\n
+transaction.log(\'vliste\', vliste)\n
+if len(vliste) != 0:\n
+ raise ValidationFailed, (vliste[0].getMessage(),)\n
\n
portal_type_with_no_space = transaction.getPortalType().replace(\' \',\'\')\n
check_path_script = getattr(transaction,\'%s_checkPath\' % portal_type_with_no_space,None)\n
@@ -160,6 +166,9 @@
<string>transaction</string>
<string>vault</string>
<string>vaultDestination</string>
+ <string>vliste</string>
+ <string>len</string>
+ <string>_getitem_</string>
<string>portal_type_with_no_space</string>
<string>getattr</string>
<string>None</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/transitions/deliver_action.xml?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/transitions/deliver_action.xml Wed Apr 4 11:02:37 2007
@@ -51,7 +51,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
- <value> <string></string> </value>
+ <value> <string>validateVaultBalance</string> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/change_log?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/change_log Wed Apr 4 11:02:37 2007
@@ -1,6 +1,3 @@
-2007-04-04 aurel
-* add check deposit module
-
2006-10-19 aurel
* fix portal type list for getTotalPrice in wf script
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Wed Apr 4 11:02:37 2007
@@ -1,1 +1,1 @@
-246
+248
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_action_path_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_action_path_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident Module | list_ui
Account Incident Module | print_pdf
Account Incident Module | sort_on
@@ -100,14 +101,6 @@
Cash To Currency Sale | outgoing_fastinput
Cash To Currency Sale | print
Cash To Currency Sale | view
-Check Deposit Module | list_ui
-Check Deposit Module | sort_on
-Check Deposit Module | view
-Check Deposit | accounting_view
-Check Deposit | agents
-Check Deposit | history
-Check Deposit | metadata
-Check Deposit | view
Classification Survey Module | list
Classification Survey Module | list_ui
Classification Survey Module | sort_on
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_module_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_module_id_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_module_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_module_id_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
account_incident_module
cash_balance_regulation_module
cash_exchange_module
@@ -7,7 +8,6 @@
cash_sorting_module
cash_to_currency_purchase_module
cash_to_currency_sale_module
-check_deposit_module
classification_survey_module
counter_rendering_module
currency_purchase_module
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident Module | Account Incident
Account Incident | Banking Operation Line
Account Incident | Incoming Account Incident Line
@@ -27,9 +28,6 @@
Cash To Currency Sale Module | Cash To Currency Sale
Cash To Currency Sale | Incoming Cash To Currency Sale Line
Cash To Currency Sale | Outgoing Cash To Currency Sale Line
-Check Deposit Module | Check Deposit
-Check Deposit | Banking Operation Line
-Check Deposit | Check Operation Line
Classification Survey Module | Classification Survey
Classification Survey | Incoming Classification Survey Line
Classification Survey | Outgoing Classification Survey Line
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident | source_decision
Bank Account | site
Cash Container Item | aggregate
@@ -7,7 +8,6 @@
Cash Sorting Incident | source_decision
Cash To Currency Purchase | currency_exchange_type
Cash To Currency Sale | currency_exchange_type
-Check Deposit | site
Container Cell | cash_status
Container Cell | emission_letter
Container Cell | variation
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident | Incoming Account Incident Line
Account Incident | Outgoing Account Incident Line
Cash Balance Regulation | Incoming Cash Balance Regulation Line
@@ -17,7 +18,6 @@
Cash To Currency Purchase | Outgoing Cash To Currency Purchase Line
Cash To Currency Sale | Incoming Cash To Currency Sale Line
Cash To Currency Sale | Outgoing Cash To Currency Sale Line
-Check Deposit | Banking Operation Line
Classification Survey | Incoming Classification Survey Line
Classification Survey | Outgoing Classification Survey Line
Container Line | Container Cell
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_id_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_id_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident
Account Incident Module
Cash Balance Regulation
@@ -18,8 +19,6 @@
Cash To Currency Purchase Module
Cash To Currency Sale
Cash To Currency Sale Module
-Check Deposit
-Check Deposit Module
Classification Survey
Classification Survey Module
Container Cell
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident | Amount
Account Incident | Price
Cash Balance Regulation | Amount
@@ -25,8 +26,6 @@
Cash To Currency Sale | Price
Cash To Currency Sale | Reference
Cash To Currency Sale | Resource
-Check Deposit | Amount
-Check Deposit | Price
Container Cell | CashContainer
Container Line | CashContainer
Counter Rendering | Amount
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
Account Incident | account_incident_workflow
Account Incident | edit_workflow
Cash Balance Regulation | cash_balance_regulation_workflow
@@ -17,8 +18,6 @@
Cash To Currency Purchase | edit_workflow
Cash To Currency Sale | cash_to_currency_sale_workflow
Cash To Currency Sale | edit_workflow
-Check Deposit | check_deposit_workflow
-Check Deposit | edit_workflow
Classification Survey | classification_survey_workflow
Classification Survey | edit_workflow
Container Cell | edit_workflow
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_workflow_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_workflow_id_list?rev=13918&r1=13917&r2=13918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_workflow_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_workflow_id_list Wed Apr 4 11:02:37 2007
@@ -1,3 +1,4 @@
+
account_incident_workflow
cash_balance_regulation_workflow
cash_exchange_workflow
@@ -8,7 +9,6 @@
cash_sorting_workflow
cash_to_currency_purchase_workflow
cash_to_currency_sale_workflow
-check_deposit_workflow
classification_survey_workflow
counter_rendering_workflow
currency_purchase_workflow
More information about the Erp5-report
mailing list