Skip to content

erp5
erp5
Commit b8ec6d31 authored by Aurel's avatar Aurel
Browse files
Options

move cash transfer to usual cash transfer 

use cash sorting for cash classification


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6951 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 64de5703
Hide whitespace changes
Inline Side-by-side
Showing with 1399 additions and 646 deletions
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer%20Module.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting%20Module.xml
View file @ b8ec6d31
...@@ -83,7 +83,7 @@ be a problem).</string> </value> ...@@ -83,7 +83,7 @@ be a problem).</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Cash Transfer Module</string> </value> <value> <string>Cash Sorting Module</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting.xml
View file @ b8ec6d31
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>_roles</string> </key> <key> <string>_roles</string> </key>
<value> <value>
...@@ -64,11 +70,11 @@ ...@@ -64,11 +70,11 @@
</item> </item>
<item> <item>
<key> <string>content_meta_type</string> </key> <key> <string>content_meta_type</string> </key>
<value> <string>BAOBAB Cash Delivery</string> </value> <value> <string>ERP5Banking Cash Delivery</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>An order...</string> </value> <value> <string>This document represent the result from a sort of cash</string> </value>
</item> </item>
<item> <item>
<key> <string>factory</string> </key> <key> <string>factory</string> </key>
...@@ -94,7 +100,7 @@ ...@@ -94,7 +100,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Cash Classification</string> </value> <value> <string>Cash Sorting</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line.xml
View file @ b8ec6d31
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Une ligne tarifaire.</string> </value> <value> <string>This line represent a supply of cash which have to be sort</string> </value>
</item> </item>
<item> <item>
<key> <string>factory</string> </key> <key> <string>factory</string> </key>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Incoming Cash Classification Line</string> </value> <value> <string>Incoming Cash Sorting Line</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.ERP5Type</string>
<string>ERP5TypeInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_actions</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>_aliases</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_roles</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>base_category_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>order_line_icon.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5Banking Cash Delivery Cell</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Une ligne tarifaire.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addCashDeliveryCell</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple>
<string>delivery_movement</string>
<string>order_movement</string>
</tuple>
</value>
</item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Outgoing Cash Sorting Cell</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line.xml
View file @ b8ec6d31
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Une ligne tarifaire.</string> </value> <value> <string>Thie represent a result line from a sort of cash</string> </value>
</item> </item>
<item> <item>
<key> <string>factory</string> </key> <key> <string>factory</string> </key>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Outgoing Cash Classification Line</string> </value> <value> <string>Outgoing Cash Sorting Line</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification%20Module.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module.xml
View file @ b8ec6d31
...@@ -36,18 +36,16 @@ ...@@ -36,18 +36,16 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>_roles</string> </key> <key> <string>_roles</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>allowed_content_types</string> </key> <key> <string>allowed_content_types</string> </key>
<value> <value>
...@@ -81,6 +79,12 @@ be a problem).</string> </value> ...@@ -81,6 +79,12 @@ be a problem).</string> </value>
<key> <string>filter_content_types</string> </key> <key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
</item> </item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>hidden_content_type_list</string> </key> <key> <string>hidden_content_type_list</string> </key>
<value> <value>
...@@ -89,7 +93,7 @@ be a problem).</string> </value> ...@@ -89,7 +93,7 @@ be a problem).</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Cash Classification Module</string> </value> <value> <string>Usual Cash Transfer Module</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer.xml → bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer.xml
View file @ b8ec6d31
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Mouvement intercaisse : ce module permet de transf\xe9rer des fonds entre deux caisses. Il n\xe9cessite toujours deux utilisateurs : l\'un initie et l\'autre valide.</string> </value> <value> <string>A Usual Cash Transfer represent a transfer of banknotes or coin between the usual cash and a counter</string> </value>
</item> </item>
<item> <item>
<key> <string>factory</string> </key> <key> <string>factory</string> </key>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Cash Transfer</string> </value> <value> <string>Usual Cash Transfer</string> </value>
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject_action.xml deleted 100644 → 0
View file @ 64de5703
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Transitions</string>
<string>TransitionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Return into Error</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=reject_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>reject</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Cash Classification is rejected when controller considers that input information is not consistent</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>reject_action</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Reject Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/rejected.xml deleted 100644 → 0
View file @ 64de5703
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Worklists</string>
<string>WorklistDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Invalid Cash Classifications (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification&simulation_assigned=1&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Invalid Cash Classification</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rejected</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Classification</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_assigned</string> </key>
<value>
<tuple>
<string>1</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>draft</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow.xml
View file @ b8ec6d31
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>cash_classification_workflow</string> </value> <value> <string>cash_sorting_workflow</string> </value>
</item> </item>
<item> <item>
<key> <string>initial_state</string> </key> <key> <string>initial_state</string> </key>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Cash Classification Workflow</string> </value> <value> <string>Cash Sorting Workflow</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts/validateBalance.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml
View file @ b8ec6d31
...@@ -71,24 +71,23 @@ from Products.ERP5Type.Message import Message\n ...@@ -71,24 +71,23 @@ from Products.ERP5Type.Message import Message\n
\n \n
# Purchase Transaction .\n # Purchase Transaction .\n
transaction = state_change.object\n transaction = state_change.object\n
vault = transaction.getSource()\n
\n
# Get inventory\n # Get inventory\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=[\'Incoming Cash Classification Line\', \'Outgoing Cash Classification Line\'])\n vault = transaction.getSource()\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Incoming Cash Sorting Line\')\n
\n \n
# Get price and total_price.\n # Get price and total_price.\n
price = transaction.getSourceTotalAssetPrice()\n price = transaction.getSourceTotalAssetPrice()\n
site_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Classification Line\')\n input_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Sorting Line\')\n
external_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Classification Line\')\n output_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Sorting Line\')\n
\n \n
if price != (site_cash + external_cash):\n if input_cash != output_cash :\n
msg = Message(domain="ui", message="Amount is different from cash details.")\n msg=Message(domain="ui", message="Incoming cash amount is different from outgoing cash amount.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
elif resource == 2:\n elif price != output_cash :\n
msg = Message(domain="ui", message="No Resource.")\n msg=Message(domain=\'ui\',message=\'Amount differs from cash total.\')\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
elif resource == 1:\n elif resource != 0 :\n
msg = Message(domain="ui", message="Insufficient Balance.")\n msg=Message(domain=\'ui\',message=\'Insufficient Balance.\')\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
</string> </value> </string> </value>
</item> </item>
...@@ -98,15 +97,9 @@ elif resource == 1:\n ...@@ -98,15 +97,9 @@ elif resource == 1:\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_workflow/cash_classification_workflow/scripts/validateBalance</string> </value> <value> <string>Script (Python):/BCEAO/portal_workflow/cash_exchange_workflow/scripts/validateBalance</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
...@@ -152,8 +145,8 @@ elif resource == 1:\n ...@@ -152,8 +145,8 @@ elif resource == 1:\n
<string>vault</string> <string>vault</string>
<string>resource</string> <string>resource</string>
<string>price</string> <string>price</string>
<string>site_cash</string> <string>input_cash</string>
<string>external_cash</string> <string>output_cash</string>
<string>msg</string> <string>msg</string>
</tuple> </tuple>
</value> </value>
...@@ -182,25 +175,4 @@ elif resource == 1:\n ...@@ -182,25 +175,4 @@ elif resource == 1:\n
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/cancelled.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/cancelled.xml
View file @ b8ec6d31
...@@ -71,27 +71,29 @@ ...@@ -71,27 +71,29 @@
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>Modify portal content</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple/> <tuple>
<string>Manager</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/confirmed.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/confirmed.xml
View file @ b8ec6d31
...@@ -40,19 +40,25 @@ ...@@ -40,19 +40,25 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Confirmed</string> </value> <value> <string>Waiting for validation</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>deliver</string> <string>deliver</string>
<string>deliver_action</string> <string>deliver_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
...@@ -76,10 +82,10 @@ ...@@ -76,10 +82,10 @@
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -87,7 +93,6 @@ ...@@ -87,7 +93,6 @@
<key> <string>Modify portal content</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
...@@ -96,10 +101,10 @@ ...@@ -96,10 +101,10 @@
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/delivered.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.States</string>
<string>StateDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>delivered</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Delivered</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/draft.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/draft.xml
View file @ b8ec6d31
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
...@@ -48,11 +48,17 @@ ...@@ -48,11 +48,17 @@
<tuple> <tuple>
<string>cancel</string> <string>cancel</string>
<string>cancel_action</string> <string>cancel_action</string>
<string>confirm</string> <string>order</string>
<string>confirm_action</string> <string>order_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
...@@ -76,10 +82,8 @@ ...@@ -76,10 +82,8 @@
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -89,7 +93,6 @@ ...@@ -89,7 +93,6 @@
<tuple> <tuple>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -97,10 +100,8 @@ ...@@ -97,10 +100,8 @@
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/delivered.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/ordered.xml
View file @ b8ec6d31
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>delivered</string> </value> <value> <string>ordered</string> </value>
</item> </item>
<item> <item>
<key> <string>permission_roles</string> </key> <key> <string>permission_roles</string> </key>
...@@ -40,10 +40,21 @@ ...@@ -40,10 +40,21 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Delivered</string> </value> <value> <string>Sent to vault</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>confirm</string>
<string>confirm_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value> <value>
<tuple/> <tuple/>
</value> </value>
...@@ -71,10 +82,9 @@ ...@@ -71,10 +82,9 @@
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -88,10 +98,9 @@ ...@@ -88,10 +98,9 @@
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel.xml
View file @ b8ec6d31
...@@ -91,7 +91,8 @@ ...@@ -91,7 +91,8 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string> <string>Assignor</string>
<string>Owner</string> <string>DestinationAssignee</string>
<string>DestinationAssignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel_action.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel_action.xml
View file @ b8ec6d31
...@@ -91,7 +91,8 @@ ...@@ -91,7 +91,8 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string> <string>Assignor</string>
<string>Owner</string> <string>DestinationAssignee</string>
<string>DestinationAssignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm.xml
View file @ b8ec6d31
...@@ -89,9 +89,8 @@ ...@@ -89,9 +89,8 @@
<key> <string>roles</string> </key> <key> <string>roles</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>DestinationAssignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm_action.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm_action.xml
View file @ b8ec6d31
...@@ -60,11 +60,11 @@ ...@@ -60,11 +60,11 @@
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
<value> <string>validateBalance</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Confirm Action</string> </value> <value> <string>Send To Validation</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -89,9 +89,8 @@ ...@@ -89,9 +89,8 @@
<key> <string>roles</string> </key> <key> <string>roles</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>DestinationAssignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver.xml
View file @ b8ec6d31
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<value> <value>
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>DestinationAssignee</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver_action.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver_action.xml
View file @ b8ec6d31
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Deliver</string> </value> <value> <string>Validate</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Deliver Action</string> </value> <value> <string>Validate</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<value> <value>
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>DestinationAssignee</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Transitions</string>
<string>TransitionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>order</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>ordered</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Order</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order_action.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Transitions</string>
<string>TransitionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Send To Vault</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>order</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>order_action</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string>validateBalance</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Send To Vault</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/actor.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml
View file @ b8ec6d31
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Auteur</string> </value>
</item> </item>
<item> <item>
<key> <string>for_catalog</string> </key> <key> <string>for_catalog</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/portal_type.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml
View file @ b8ec6d31
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</item> </item>
<item> <item>
<key> <string>default_value</string> </key> <key> <string>default_value</string> </key>
<value> <string></string> </value> <value> <string>Cash Sorting</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/simulation_assigned.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/simulation_assigned.xml
View file @ b8ec6d31
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</item> </item>
<item> <item>
<key> <string>default_value</string> </key> <key> <string>default_value</string> </key>
<value> <string>0</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/confirmed.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml
View file @ b8ec6d31
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Cash Classifications to Validate (%(count)s)</string> </value> <value> <string>Cash Sorting To Validate (%(count)s)</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classification&reset=1 Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Cash Sorting&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Cash Classifications to Validate</string> </value> <value> <string>Cash Sorting To Validate</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -80,7 +80,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica ...@@ -80,7 +80,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica
<value> <value>
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>DestinationAssignee</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica ...@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<tuple> <tuple>
<string>Cash Classification</string> <string>Cash Sorting</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/draft.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml
View file @ b8ec6d31
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Drafts to Validate (%(count)s)</string> </value> <value> <string>Draft To Validate (%(count)s)</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification&reset=1 Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Cash Sorting&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Drafts to Validate</string> </value> <value> <string>Draft to validate</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification ...@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<tuple> <tuple>
<string>Cash Classification</string> <string>Cash Sorting</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Worklists</string>
<string>WorklistDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Cash Sorting To Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewSearchResultList?cash_sorting_state=ordered&portal_type=Cash Sorting&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Cash Sorting To Validate</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ordered</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>DestinationAssignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Sorting</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>ordered</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow.xml
View file @ b8ec6d31
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>cash_transfer_workflow</string> </value> <value> <string>usual_cash_transfer_workflow</string> </value>
</item> </item>
<item> <item>
<key> <string>initial_state</string> </key> <key> <string>initial_state</string> </key>
......
bt5/erp5_banking_cash/bt/change_log
View file @ b8ec6d31
2006-04-26 aurel
* add outgoing cash sorting cell
2006-04-24 aurel
* use cash sorting instead of cash classification
2006-04-06 aurel 2006-04-06 aurel
* remove accounting event for cash classification * remove accounting event for cash classification
......
bt5/erp5_banking_cash/bt/template_action_path_list
View file @ b8ec6d31
Cash Classification Module | list_ui Cash Sorting Module | list
Cash Classification Module | sort_on Cash Sorting Module | list_ui
Cash Classification Module | view Cash Sorting Module | sort_on
Cash Classification | external Cash Sorting Module | view
Cash Classification | fastinputIn Cash Sorting | history
Cash Classification | fastinputOut Cash Sorting | incoming_fastinput
Cash Classification | history Cash Sorting | incoming_line_view
Cash Classification | list Cash Sorting | metadata
Cash Classification | metadata Cash Sorting | outgoing_fastinput
Cash Classification | print Cash Sorting | outgoing_line_list
Cash Classification | source Cash Sorting | view
Cash Classification | view Incoming Cash Sorting Line | metadata
Cash Transfer Module | list_ui Incoming Cash Sorting Line | view
Cash Transfer Module | sort_on Outgoing Cash Sorting Cell | metadata
Cash Transfer Module | view Outgoing Cash Sorting Cell | view
Cash Transfer | fastinput Outgoing Cash Sorting Line | metadata
Cash Transfer | history Outgoing Cash Sorting Line | view
Cash Transfer | metadata Usual Cash Transfer Module | list_ui
Cash Transfer | print Usual Cash Transfer Module | sort_on
Cash Transfer | view Usual Cash Transfer Module | view
Incoming Cash Classification Line | list Usual Cash Transfer | fastinput
Incoming Cash Classification Line | metadata Usual Cash Transfer | history
Incoming Cash Classification Line | print Usual Cash Transfer | metadata
Incoming Cash Classification Line | view Usual Cash Transfer | print
Outgoing Cash Classification Line | list Usual Cash Transfer | view
Outgoing Cash Classification Line | metadata \ No newline at end of file
Outgoing Cash Classification Line | print
Outgoing Cash Classification Line | view
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_module_id_list
View file @ b8ec6d31
cash_classification_module cash_sorting_module
cash_transfer_module usual_cash_transfer_module
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
View file @ b8ec6d31
Cash Classification Module | Cash Classification Cash Sorting Module | Cash Sorting
Cash Classification | Incoming Cash Classification Line Cash Sorting | Incoming Cash Sorting Line
Cash Classification | Outgoing Cash Classification Line Cash Sorting | Outgoing Cash Sorting Line
Cash Transfer Module | Cash Transfer Incoming Cash Sorting Line | Cash Delivery Cell
Cash Transfer | Cash Delivery Line Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell
Incoming Cash Classification Line | Cash Delivery Cell Usual Cash Transfer Module | Usual Cash Transfer
Outgoing Cash Classification Line | Cash Delivery Cell Usual Cash Transfer | Cash Delivery Line
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_base_category_list
View file @ b8ec6d31
Outgoing Cash Sorting Cell | variation
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list
View file @ b8ec6d31
Cash Classification | Incoming Cash Classification Line Cash Sorting | Incoming Cash Sorting Line
Cash Classification | Outgoing Cash Classification Line Cash Sorting | Outgoing Cash Sorting Line
Cash Transfer | Cash Delivery Line Incoming Cash Sorting Line | Cash Delivery Cell
Incoming Cash Classification Line | Cash Delivery Cell Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell
Outgoing Cash Classification Line | Cash Delivery Cell Usual Cash Transfer | Cash Delivery Line
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_id_list
View file @ b8ec6d31
Cash Classification Cash Sorting
Cash Classification Module Cash Sorting Module
Cash Transfer Incoming Cash Sorting Line
Cash Transfer Module Outgoing Cash Sorting Cell
Incoming Cash Classification Line Outgoing Cash Sorting Line
Outgoing Cash Classification Line Usual Cash Transfer
\ No newline at end of file Usual Cash Transfer Module
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list
View file @ b8ec6d31
Cash Classification | Price Cash Sorting | Price
Cash Transfer | Amount Incoming Cash Sorting Line | CashDeliveryLine
Cash Transfer | Price Outgoing Cash Sorting Cell | CashDeliveryLine
Incoming Cash Classification Line | CashDeliveryLine Outgoing Cash Sorting Line | CashDeliveryLine
Outgoing Cash Classification Line | CashDeliveryLine Usual Cash Transfer | Amount
\ No newline at end of file Usual Cash Transfer | Price
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list
View file @ b8ec6d31
Cash Classification | cash_classification_workflow Cash Sorting | cash_sorting_workflow
Cash Classification | edit_workflow Cash Sorting | edit_workflow
Cash Transfer | cash_transfer_workflow Usual Cash Transfer | edit_workflow
Cash Transfer | edit_workflow Usual Cash Transfer | usual_cash_transfer_workflow
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_workflow_id_list
View file @ b8ec6d31
cash_classification_workflow cash_sorting_workflow
cash_transfer_workflow usual_cash_transfer_workflow
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/list_ui.xml
View file @ b8ec6d31
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>list_ui</string> </value> <value> <string>list_ui</string> </value>
</item> </item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
<value> <value>
......
bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/sort_on.xml
View file @ b8ec6d31
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>sort_on</string> </value> <value> <string>sort_on</string> </value>
</item> </item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
<value> <value>
......
bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_report.xml
View file @ b8ec6d31
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>vault_report</string> </value> <value> <string>vault_report</string> </value>
</item> </item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
<value> <value>
......
bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/view.xml
View file @ b8ec6d31
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>view</string> </value> <value> <string>view</string> </value>
</item> </item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
<value> <value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject.xml → bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/aggregate.xml
View file @ b8ec6d31
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.DCWorkflow.Transitions</string> <string>Products.ERP5Type.Document.BaseCategory</string>
<string>TransitionDefinition</string> <string>BaseCategory</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
...@@ -19,61 +19,79 @@ ...@@ -19,61 +19,79 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_count</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>_mt_index</string> </key>
<value> <string>workflow</string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>_owner</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>_tree</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>acquisition_portal_type</string> </key>
<value> <string></string> </value> <value> <string>python: []</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>categories</string> </key>
<value> <string></string> </value> <value>
<tuple>
<string>aggregate</string>
</tuple>
</value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>category_type</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <tuple>
<string>sub_variation</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>description</string> </key>
<value> <string>reject</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>id</string> </key>
<value> <string>draft</string> </value> <value> <string>aggregate</string> </value>
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>portal_type</string> </key>
<value> <string></string> </value> <value> <string>Base Category</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Reject</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>uid</string> </key>
<value> <int>2</int> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>var_exprs</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -83,60 +101,48 @@ ...@@ -83,60 +101,48 @@
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.DCWorkflow.Guard</string> <string>BTrees.Length</string>
<string>Guard</string> <string>Length</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle> <int>0</int> </pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Persistence</string> <string>BTrees.OOBTree</string>
<string>PersistentMapping</string> <string>OOBTree</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <none/>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>simulation_assigned</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.CMFCore.Expression</string> <string>BTrees.OOBTree</string>
<string>Expression</string> <string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
...@@ -144,8 +150,10 @@ ...@@ -144,8 +150,10 @@
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>_container</string> </key>
<value> <string>python:1</string> </value> <value>
<dictionary/>
</value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml
View file @ b8ec6d31
...@@ -42,24 +42,6 @@ ...@@ -42,24 +42,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>parent</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: [\'Category\', \'Base Category\']</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>vault_type</string> </value> <value> <string>vault_type</string> </value>
......
bt5/erp5_banking_core/ModuleTemplateItem/account_module.xml
View file @ b8ec6d31
...@@ -172,6 +172,9 @@ ...@@ -172,6 +172,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -244,10 +247,6 @@ ...@@ -244,10 +247,6 @@
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -316,10 +315,6 @@ ...@@ -316,10 +315,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -542,10 +537,6 @@ ...@@ -542,10 +537,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -713,10 +704,6 @@ ...@@ -713,10 +704,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml
View file @ b8ec6d31
...@@ -166,6 +166,9 @@ ...@@ -166,6 +166,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -237,9 +240,6 @@ ...@@ -237,9 +240,6 @@
<permission> <permission>
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -308,9 +308,6 @@ ...@@ -308,9 +308,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -531,10 +528,6 @@ ...@@ -531,10 +528,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -701,9 +694,6 @@ ...@@ -701,9 +694,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml
View file @ b8ec6d31
...@@ -173,6 +173,9 @@ ...@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -245,10 +248,6 @@ ...@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -317,10 +316,6 @@ ...@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -543,10 +538,6 @@ ...@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -715,10 +706,6 @@ ...@@ -715,10 +706,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml
View file @ b8ec6d31
...@@ -173,6 +173,9 @@ ...@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -245,10 +248,6 @@ ...@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -317,10 +316,6 @@ ...@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -543,10 +538,6 @@ ...@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -715,10 +706,6 @@ ...@@ -715,10 +706,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml
View file @ b8ec6d31
...@@ -173,6 +173,9 @@ ...@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -245,10 +248,6 @@ ...@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -317,10 +316,6 @@ ...@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -543,10 +538,6 @@ ...@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -715,10 +706,6 @@ ...@@ -715,10 +706,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml
View file @ b8ec6d31
...@@ -172,6 +172,9 @@ ...@@ -172,6 +172,9 @@
<name>Add ERP5Form Tools</name> <name>Add ERP5Form Tools</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission> <permission>
<name>Add ERP5SyncML Tools</name> <name>Add ERP5SyncML Tools</name>
<role>Manager</role> <role>Manager</role>
...@@ -244,10 +247,6 @@ ...@@ -244,10 +247,6 @@
<name>Add Plugin Registrys</name> <name>Add Plugin Registrys</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Python Scripts</name> <name>Add Python Scripts</name>
<role>Manager</role> <role>Manager</role>
...@@ -316,10 +315,6 @@ ...@@ -316,10 +315,6 @@
<name>Add ZODB Mount Points</name> <name>Add ZODB Mount Points</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
...@@ -542,10 +537,6 @@ ...@@ -542,10 +537,6 @@
<name>Manage Transient Object Container</name> <name>Manage Transient Object Container</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>Manage Vocabulary</name> <name>Manage Vocabulary</name>
<role>Manager</role> <role>Manager</role>
...@@ -713,10 +704,6 @@ ...@@ -713,10 +704,6 @@
<name>WebDAV access</name> <name>WebDAV access</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission> <permission>
<name>ZopeProfiler: manage</name> <name>ZopeProfiler: manage</name>
<role>Manager</role> <role>Manager</role>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml
View file @ b8ec6d31
...@@ -84,14 +84,10 @@ if site is None:\n ...@@ -84,14 +84,10 @@ if site is None:\n
site = site_list[0]\n site = site_list[0]\n
\n \n
# get only the office, not need of vault\n # get only the office, not need of vault\n
if not \'siege\' in site:\n context.log(\'Baobab_checkCounterDateOpen\', \'get site for vault %s\' %(site))\n
# XXX must change the way it get the vault\n site = context.Baobab_getVaultSite(site)\n
site = site.split(\'/\')[3:4]\n
else:\n
site = \'siege\'\n
\n
\n \n
kw = {"portal_type" : \'Counter Date\', "delivery.start_date" : str(date), "site_id" : site, "simulation_state" : "open"}\n kw = {"portal_type" : \'Counter Date\', "delivery.start_date" : str(date), "site_id" : site.getId(), "simulation_state" : "open"}\n
#context.log(\'Baobab_checkCounterDateOpen\', \'kw = %s\' %(kw,))\n #context.log(\'Baobab_checkCounterDateOpen\', \'kw = %s\' %(kw,))\n
counter_date_list = [x.getObject() for x in context.portal_catalog(**kw)]\n counter_date_list = [x.getObject() for x in context.portal_catalog(**kw)]\n
#context.log(\'Baobab_checkCounterDateOpen\', \'counter_date_list = %s, requete = %s\' %(counter_date_list, context.portal_catalog(src__=1, **kw)))\n #context.log(\'Baobab_checkCounterDateOpen\', \'counter_date_list = %s, requete = %s\' %(counter_date_list, context.portal_catalog(src__=1, **kw)))\n
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">bfINCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># get all operations related to ths site\n
# as source\n
kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : date, \'simulation_state\' : \'confirmed\'}\n
# as destination\n
kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : date, \'simulation_state\' : \'confirmed\'}\n
operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n
operation_list_object = [x.getObject() for x in operation_list]\n
\n
return operation_list_object\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>site_uid, date, simulation_state=[]</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>site_uid</string>
<string>date</string>
<string>simulation_state</string>
<string>kwd_source</string>
<string>kwd_destination</string>
<string>list</string>
<string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
<string>operation_list</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>x</string>
<string>operation_list_object</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<list/>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Baobab_getRemainingOperationList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.xml 0 → 100644
View file @ b8ec6d31
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">bfINCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import Message\n
site = vault\n
if same_type(site, \'\'):\n
site = context.restrictedTraverse(\'portal_categories/site/%s\' %(site,))\n
\n
context.log(\'site\', site)\n
while True:\n
if not hasattr(site, \'getVaultTypeList\'):\n
msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n
raise ValidationFailed, (msg,)\n
if \'site\' in site.getVaultTypeList():\n
break\n
site = site.getParentValue()\n
return site\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/Baobab_getVaultSite</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>vault</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>vault</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>site</string>
<string>same_type</string>
<string>_getattr_</string>
<string>context</string>
<string>True</string>
<string>hasattr</string>
<string>msg</string>
<string>ValidationFailed</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Baobab_getVaultSite</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml
View file @ b8ec6d31
...@@ -66,8 +66,36 @@ ...@@ -66,8 +66,36 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return context.getMovementList(portal_type=portal_type)\n <value> <string encoding="cdata"><![CDATA[
</string> </value>
# return context.getMovementList(portal_type=portal_type)\n
# here we suppose we have only two level of portal type\n
if not same_type(portal_type, []):\n
return context.getMovementList(portal_type=portal_type)\n
if len(portal_type) > 2 or len(portal_type) == 0:\n
# use catalog\n
return context.getMovementList(portal_type=portal_type)\n
\n
line_list = context.objectValues(portal_type=portal_type[0])\n
invert = 0\n
if len(line_list) == 0:\n
# try with the second portal type\n
line_list = context.objectValues(portal_type=portal_type[1])\n
invert = 1\n
if len(line_list) == 0:\n
return []\n
cell_list = []\n
for line in line_list:\n
if invert:\n
cell_type = portal_type[0]\n
else:\n
cell_type = portal_type[1]\n
cell_list.extend(list(line.objectValues(portal_type=cell_type)))\n
\n
return cell_list\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -87,7 +115,7 @@ ...@@ -87,7 +115,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>portal_type=None, *argv, **kw</string> </value> <value> <string>portal_type=[], *argv, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -116,8 +144,18 @@ ...@@ -116,8 +144,18 @@
<string>portal_type</string> <string>portal_type</string>
<string>argv</string> <string>argv</string>
<string>kw</string> <string>kw</string>
<string>same_type</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>len</string>
<string>_getitem_</string>
<string>line_list</string>
<string>invert</string>
<string>cell_list</string>
<string>_getiter_</string>
<string>line</string>
<string>cell_type</string>
<string>list</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -130,7 +168,7 @@ ...@@ -130,7 +168,7 @@
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<none/> <list/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml
View file @ b8ec6d31
...@@ -99,8 +99,8 @@ def l_split(line) :\n ...@@ -99,8 +99,8 @@ def l_split(line) :\n
new_e_list.append(e)\n new_e_list.append(e)\n
return new_e_list\n return new_e_list\n
\n \n
def create_category(cat) :\n def create_category(cat, vault_type=None) :\n
\n context.log(\'create_category\',cat)\n
cat_list = lowerCase(cat).split(\'/\')\n cat_list = lowerCase(cat).split(\'/\')\n
cat_len = len(cat_list)\n cat_len = len(cat_list)\n
\n \n
...@@ -116,21 +116,30 @@ def create_category(cat) :\n ...@@ -116,21 +116,30 @@ def create_category(cat) :\n
\n \n
if relative_category is None :\n if relative_category is None :\n
relative_category = create_category(lowerCase(\'/\'.join(cat_list[:-1])))\n relative_category = create_category(lowerCase(\'/\'.join(cat_list[:-1])))\n
if vault_type is not None:\n
relative_category.setVaultType(vault_type)\n
\n \n
cat = relative_category.get(lowerCase(cat_list[-1]))\n cat = relative_category.get(lowerCase(cat_list[-1]))\n
if cat is not None :\n if cat is not None :\n
return cat\n return cat\n
else :\n else :\n
return relative_category.newContent(portal_type = \'Category\',\n new_cat = relative_category.newContent(portal_type = \'Category\',\n
id = lowerCase(cat_list[-1]),\n id = lowerCase(cat_list[-1]),\n
title = upperCase(cat_list[-1]))\n title = upperCase(cat_list[-1]))\n
if vault_type is not None:\n
new_cat.setVaultType(vault_type)\n
return new_cat\n
\n \n
def generate_vault_dict() :\n def generate_vault_dict() :\n
c_list = context.portal_categories.vault_type.getCategoryChildValueList()\n c_list = context.portal_categories.vault_type.getCategoryChildValueList()\n
# function to sort category by title\n
def sortCategory(a, b):\n
return cmp(a.getRelativeUrl(), b.getRelativeUrl())\n
vault_dict = {}\n vault_dict = {}\n
for c in c_list :\n c_list.sort(sortCategory)\n
for c in c_list:\n
code = c.getProperty(\'codification\')\n code = c.getProperty(\'codification\')\n
if code is not None :\n if code is not None and not vault_dict.has_key(code):\n
vault_dict[code]=c.getRelativeUrl()\n vault_dict[code]=c.getRelativeUrl()\n
return vault_dict\n return vault_dict\n
\n \n
...@@ -176,37 +185,89 @@ elif import_type == \'assign_codification\' :\n ...@@ -176,37 +185,89 @@ elif import_type == \'assign_codification\' :\n
\n \n
elif import_type == \'assign_vault_type\' :\n elif import_type == \'assign_vault_type\' :\n
vault_type_dict = generate_vault_dict()\n vault_type_dict = generate_vault_dict()\n
context.log(\'vault_type_dict\', vault_type_dict)\n
vault_type_list = vault_type_dict.keys()\n vault_type_list = vault_type_dict.keys()\n
for e_list in line_list :\n for e_list in line_list :\n
if len(e_list) == 2 and e_list[1] in vault_type_list :\n if len(e_list) == 2 and e_list[1] in vault_type_list :\n
category = context.portal_categories.getCategoryValue(lowerCase(e_list[0]))\n category = context.portal_categories.getCategoryValue(lowerCase(e_list[0]))\n
category.setCategoryList([vault_type_dict[e_list[1]]])\n category.setCategoryList([vault_type_dict[e_list[1]]])\n
print \'set %s to %s\' % ([vault_type_dict[e_list[1]]], category)\n print \'set %s to %s for e_list %s\' % ([vault_type_dict[e_list[1]]], category, e_list)\n
\n
\n \n
elif import_type == \'create_subvaults\' :\n elif import_type == \'create_subvaults\' :\n
#Encaisse des Billets Restitues par Tiers a Detruire# seulemnt sur sites disposant de tri tiers\n #Encaisse des Billets Restitues par Tiers a Detruire# seulemnt sur sites disposant de tri tiers\n
#Encaisse des Billets Recus pour Ventilation# seulement sur sites principaux\n #Encaisse des Billets Recus pour Ventilation# seulement sur sites principaux\n
subvault_dict = {}\n subvault_dict = {}\n
for e_list in line_list :\n for e_list in line_list :\n
context.log(\'e_list\', e_list)\n
if len(e_list) == 3 :\n if len(e_list) == 3 :\n
vault = lowerCase(e_list[0])\n vault = lowerCase(e_list[0]) # ex : Vault_Type/Site/caveau/Auxiliaire\n
subvault = upperCase(e_list[1])\n subvault = upperCase(e_list[1]) # ex : Encaisse des Devises\n
subvault_code = upperCase(e_list[2])\n subvault_code = upperCase(e_list[2]) # ex : D\n
counter_string_list = [] # the list of counters, like [\'guichet_1,entrant\',...]\n
one_way_counter_list = (\'gros_paiement\',\'gros_versement\')\n
two_way_counter_list = (\'banque_interne\',\'operations_diverses\')\n
counter_list = one_way_counter_list + two_way_counter_list\n
max_counter = 3 # we may not have always the same number of counters\n
counter_name = vault.split(\'/\')[-1]\n
# add as many counters as required\n
if counter_name in counter_list:\n
if counter_name in one_way_counter_list:\n
max_counter=2\n
for i in range(1,max_counter+1):\n
# if counter_name in two_way_counter_list:\n
# counter_string_list.append(\'guichet_%s/entrante\' % i)\n
# counter_string_list.append(\'guichet_%s/sortante\' % i)\n
# else:\n
counter_string_list.append(\'guichet_%s\' % i)\n
else:\n
counter_string_list = [\'\']\n
\n
context.log(\'counter_string_list\',counter_string_list)\n
if not subvault_dict.has_key(vault) :\n if not subvault_dict.has_key(vault) :\n
subvault_dict[vault] = []\n subvault_dict[vault] = []\n
subvault_dict[vault].append([subvault, subvault_code])\n for counter_string in counter_string_list:\n
if subvault == \'Encaisse des Devises\' :\n context.log(\'counter_string\', counter_string)\n
for c in context.currency.objectValues() :\n if counter_string != \'\':\n
if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n counter_subvault = \'%s/%s\' % (counter_string,subvault)\n
subvault_dict[vault].append([\'%s/%s\' % (subvault, c.getTitle()), None])\n else:\n
if subvault == \'Encaisse des Billets Recus pour Ventilation\' :\n counter_subvault = subvault\n
for c in context.portal_categories.site.agence.principale.objectIds() :\n context.log(\'counter_subvault\', counter_subvault)\n
subvault_dict[vault].append([\'%s/%s\' % (subvault, upperCase(c)), None])\n subvault_dict[vault].append([counter_subvault, subvault_code])\n
if subvault == \'Encaisse des Devises\' :\n
for c in context.currency_module.objectValues() :\n
if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n
if counter_name in two_way_counter_list:\n
context.log(\'add encaisse des billets et monnaies E/S\',counter_subvault)\n
subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "entrante"), None])\n
subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "sortante"), None])\n
else:\n
context.log(\'add encaisse des billets et monnaies\',counter_subvault)\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, c.getTitle()), None])\n
if subvault == \'Encaisse des Billets Recus pour Ventilation\' :\n
for c in context.portal_categories.site.agence.principale.objectIds() :\n
if counter_name in two_way_counter_list:\n
context.log(\'add ventilation E/S\', counter_subvault)\n
subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, upperCase(c), "entrante"), None])\n
subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, upperCase(c), "sortante"), None])\n
else:\n
context.log(\'add ventilation\', counter_subvault)\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, upperCase(c)), None])\n
\n
# subvault_dict looks like this :\n
#subvault_dict : {\'vault_type/site/surface/operations_diverses\': [[\'Encaisse des Devises\', \'D\'], [\'Encaisse des Devises/Francs Suisses\', None], \n
# [\'Encaisse des Billets et Monnaies\', \'A\']]}\n
\n
\n
\n \n
vault_type_list = subvault_dict.keys()\n vault_type_list = subvault_dict.keys()\n
context.log("vault_type_list", vault_type_list)\n
context.log("vault_type_dict :",subvault_dict)\n
\n \n
# parse the for site category tree and add sub categories if required\n
for c in context.portal_categories.site.getCategoryChildValueList() :\n for c in context.portal_categories.site.getCategoryChildValueList() :\n
for vault_type in vault_type_list :\n for vault_type in vault_type_list :\n
context.log("c = %s, vault_type = %s" %(c, vault_type), "c.getvaultType = %s" %(c.getVaultType()))\n
if context.portal_categories.isMemberOf(c, vault_type, strict=1) :\n if context.portal_categories.isMemberOf(c, vault_type, strict=1) :\n
print c.getRelativeUrl(), \'is\', vault_type\n print c.getRelativeUrl(), \'is\', vault_type\n
for subvault_data in subvault_dict[vault_type] :\n for subvault_data in subvault_dict[vault_type] :\n
...@@ -221,14 +282,22 @@ elif import_type == \'create_subvaults\' :\n ...@@ -221,14 +282,22 @@ elif import_type == \'create_subvaults\' :\n
pass\n pass\n
else :\n else :\n
print \' creating\', subvault_path\n print \' creating\', subvault_path\n
new_category_obj = create_category(\'%s/%s\' % (c.getRelativeUrl(), subvault_path))\n if \'guichet\' in subvault_path:\n
if subvault_code not in (None, \'\'):\n subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
new_category_obj.setCodification(subvault_code)\n else:\n
subcat_vault_type = \'/\'.join(vault_type.split(\'/\')[1:]) \n
new_category_obj = create_category(cat = \'%s/%s\' % (c.getRelativeUrl(), subvault_path), vault_type = subcat_vault_type)\n
else :\n else :\n
print \' creating\', subvault_path\n print \' creating\', subvault_path\n
new_category_obj = create_category(\'%s/%s\' % (c.getRelativeUrl(), subvault_path))\n if \'guichet\' in subvault_path:\n
if subvault_code not in (None, \'\'):\n subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
new_category_obj.setCodification(subvault_code)\n else:\n
subcat_vault_type = \'/\'.join(vault_type.split(\'/\')[1:])\n
new_category_obj = create_category(cat = \'%s/%s\' % (c.getRelativeUrl(), subvault_path), vault_type = subcat_vault_type)\n
# set codification\n
if subvault_code not in (None, \'\'):\n
new_category_obj.setCodification(subvault_code)\n
\n
print\n print\n
break\n break\n
else : print c.getRelativeUrl(), \'not here\'\n else : print c.getRelativeUrl(), \'not here\'\n
...@@ -251,6 +320,12 @@ return printed\n ...@@ -251,6 +320,12 @@ return printed\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/ImportCsvToCategories</string> </value> <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/ImportCsvToCategories</string> </value>
...@@ -297,13 +372,13 @@ return printed\n ...@@ -297,13 +372,13 @@ return printed\n
<string>upperCase</string> <string>upperCase</string>
<string>l_clean</string> <string>l_clean</string>
<string>l_split</string> <string>l_split</string>
<string>None</string>
<string>create_category</string> <string>create_category</string>
<string>generate_vault_dict</string> <string>generate_vault_dict</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>request</string> <string>request</string>
<string>getattr</string> <string>getattr</string>
<string>None</string>
<string>import_type</string> <string>import_type</string>
<string>line_list</string> <string>line_list</string>
<string>append</string> <string>append</string>
...@@ -322,11 +397,22 @@ return printed\n ...@@ -322,11 +397,22 @@ return printed\n
<string>vault</string> <string>vault</string>
<string>subvault</string> <string>subvault</string>
<string>subvault_code</string> <string>subvault_code</string>
<string>counter_string_list</string>
<string>one_way_counter_list</string>
<string>two_way_counter_list</string>
<string>counter_list</string>
<string>max_counter</string>
<string>counter_name</string>
<string>range</string>
<string>i</string>
<string>_write_</string> <string>_write_</string>
<string>counter_string</string>
<string>counter_subvault</string>
<string>c</string> <string>c</string>
<string>vault_type</string> <string>vault_type</string>
<string>subvault_data</string> <string>subvault_data</string>
<string>subvault_path</string> <string>subvault_path</string>
<string>subcat_vault_type</string>
<string>new_category_obj</string> <string>new_category_obj</string>
</tuple> </tuple>
</value> </value>
...@@ -359,4 +445,25 @@ return printed\n ...@@ -359,4 +445,25 @@ return printed\n
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml
View file @ b8ec6d31
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<value> <string># put all counter in closing state for the given site\n <value> <string># put all counter in closing state for the given site\n
transaction = state_change.object\n transaction = state_change.object\n
\n \n
site = transaction.getSourceValue()\n site = transaction.getSiteValue()\n
while True:\n while True:\n
if not hasattr(site, \'getVaultTypeList\'):\n if not hasattr(site, \'getVaultTypeList\'):\n
msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml
View file @ b8ec6d31
...@@ -71,14 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n ...@@ -71,14 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n from Products.ERP5Type.Message import Message\n
\n \n
transaction = state_change.object\n transaction = state_change.object\n
site = transaction.getSourceValue()\n \n
while True:\n site = transaction.Baobab_getVaultSite(vault=transaction.getSourceValue())\n
if not hasattr(site, \'getVaultTypeList\'):\n
msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n
raise ValidationFailed, (msg,)\n
if \'site\' in site.getVaultTypeList():\n
break\n
site = site.getParentValue()\n
\n \n
# get the current counter date\n # get the current counter date\n
kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n
...@@ -91,13 +85,17 @@ else:\n ...@@ -91,13 +85,17 @@ else:\n
current_date = date_list[0].getStartDate()\n current_date = date_list[0].getStartDate()\n
\n \n
site_uid = transaction.getSiteUid()\n site_uid = transaction.getSiteUid()\n
\n
# get all operations related to this counter\n # get all operations related to this counter\n
# as source\n # # as source\n
kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n # kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n
# as destination\n # # as destination\n
kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n # kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n
operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n # operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n
operation_list_object = [x.getObject() for x in operation_list]\n # operation_list_object = [x.getObject() for x in operation_list]\n
\n
operation_list_object = transaction.Baobab_getRemainingOperationList(site_uid=site_uid, date=current_date, simulation_state=[\'confirmed\',])\n
\n
context.log(\'counter_workflow, cancelRemainingOperation\', \'operation list = %s\' %(operation_list_object,))\n context.log(\'counter_workflow, cancelRemainingOperation\', \'operation list = %s\' %(operation_list_object,))\n
\n \n
for operation in operation_list_object:\n for operation in operation_list_object:\n
...@@ -165,9 +163,6 @@ for operation in operation_list_object:\n ...@@ -165,9 +163,6 @@ for operation in operation_list_object:\n
<string>_getattr_</string> <string>_getattr_</string>
<string>transaction</string> <string>transaction</string>
<string>site</string> <string>site</string>
<string>True</string>
<string>hasattr</string>
<string>msg</string>
<string>kwd</string> <string>kwd</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
...@@ -179,12 +174,9 @@ for operation in operation_list_object:\n ...@@ -179,12 +174,9 @@ for operation in operation_list_object:\n
<string>None</string> <string>None</string>
<string>current_date</string> <string>current_date</string>
<string>len</string> <string>len</string>
<string>msg</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>site_uid</string> <string>site_uid</string>
<string>kwd_source</string>
<string>kwd_destination</string>
<string>list</string>
<string>operation_list</string>
<string>operation_list_object</string> <string>operation_list_object</string>
<string>operation</string> <string>operation</string>
</tuple> </tuple>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml
View file @ b8ec6d31
...@@ -71,7 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n ...@@ -71,7 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n from Products.ERP5Type.Message import Message\n
\n \n
transaction = state_change.object\n transaction = state_change.object\n
site = transaction.getSourceValue()\n site = transaction.getSiteValue()\n
\n
while True:\n while True:\n
if not hasattr(site, \'getVaultTypeList\'):\n if not hasattr(site, \'getVaultTypeList\'):\n
msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n
...@@ -80,11 +81,11 @@ while True:\n ...@@ -80,11 +81,11 @@ while True:\n
break\n break\n
site = site.getParentValue()\n site = site.getParentValue()\n
\n \n
kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n kwd = {\'portal_type\' : \'Counter Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n
date_list = [x.getObject() for x in context.portal_catalog(**kwd)]\n date_list = [x.getObject() for x in context.portal_catalog(**kwd)]\n
\n \n
if len(date_list) == 0:\n if len(date_list) == 0:\n
msg = Message(domain=\'ui\', message="Accounting date is not opened.")\n msg = Message(domain=\'ui\', message="Counter date is not opened.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
</string> </value> </string> </value>
</item> </item>
......
bt5/erp5_banking_core/bt/template_portal_type_roles_list
View file @ b8ec6d31
Account
Account Module
Checkbook Module
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7