Commit b8ec6d31 authored by Aurel's avatar Aurel

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
......@@ -83,7 +83,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Cash Transfer Module</string> </value>
<value> <string>Cash Sorting Module</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
......@@ -36,6 +36,12 @@
<none/>
</value>
</item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_roles</string> </key>
<value>
......@@ -64,11 +70,11 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>BAOBAB Cash Delivery</string> </value>
<value> <string>ERP5Banking Cash Delivery</string> </value>
</item>
<item>
<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>
<key> <string>factory</string> </key>
......@@ -94,7 +100,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Cash Classification</string> </value>
<value> <string>Cash Sorting</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
......@@ -68,7 +68,7 @@
</item>
<item>
<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>
<key> <string>factory</string> </key>
......@@ -94,7 +94,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Incoming Cash Classification Line</string> </value>
<value> <string>Incoming Cash Sorting Line</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
<?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>
......@@ -68,7 +68,7 @@
</item>
<item>
<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>
<key> <string>factory</string> </key>
......@@ -94,7 +94,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Outgoing Cash Classification Line</string> </value>
<value> <string>Outgoing Cash Sorting Line</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
......@@ -36,18 +36,16 @@
<none/>
</value>
</item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary/>
</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>
......@@ -81,6 +79,12 @@ be a problem).</string> </value>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
......@@ -89,7 +93,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Cash Classification Module</string> </value>
<value> <string>Usual Cash Transfer Module</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
......@@ -68,7 +68,7 @@
</item>
<item>
<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>
<key> <string>factory</string> </key>
......@@ -94,7 +94,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Cash Transfer</string> </value>
<value> <string>Usual Cash Transfer</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
<?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>
<?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>
......@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>cash_classification_workflow</string> </value>
<value> <string>cash_sorting_workflow</string> </value>
</item>
<item>
<key> <string>initial_state</string> </key>
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Cash Classification Workflow</string> </value>
<value> <string>Cash Sorting Workflow</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -71,24 +71,23 @@ from Products.ERP5Type.Message import Message\n
\n
# Purchase Transaction .\n
transaction = state_change.object\n
vault = transaction.getSource()\n
\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
# Get price and total_price.\n
price = transaction.getSourceTotalAssetPrice()\n
site_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Classification Line\')\n
external_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Classification Line\')\n
input_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Sorting Line\')\n
output_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Sorting Line\')\n
\n
if price != (site_cash + external_cash):\n
msg = Message(domain="ui", message="Amount is different from cash details.")\n
if input_cash != output_cash :\n
msg=Message(domain="ui", message="Incoming cash amount is different from outgoing cash amount.")\n
raise ValidationFailed, (msg,)\n
elif resource == 2:\n
msg = Message(domain="ui", message="No Resource.")\n
elif price != output_cash :\n
msg=Message(domain=\'ui\',message=\'Amount differs from cash total.\')\n
raise ValidationFailed, (msg,)\n
elif resource == 1:\n
msg = Message(domain="ui", message="Insufficient Balance.")\n
elif resource != 0 :\n
msg=Message(domain=\'ui\',message=\'Insufficient Balance.\')\n
raise ValidationFailed, (msg,)\n
</string> </value>
</item>
......@@ -98,15 +97,9 @@ elif resource == 1:\n
<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_workflow/cash_classification_workflow/scripts/validateBalance</string> </value>
<value> <string>Script (Python):/BCEAO/portal_workflow/cash_exchange_workflow/scripts/validateBalance</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
......@@ -152,8 +145,8 @@ elif resource == 1:\n
<string>vault</string>
<string>resource</string>
<string>price</string>
<string>site_cash</string>
<string>external_cash</string>
<string>input_cash</string>
<string>output_cash</string>
<string>msg</string>
</tuple>
</value>
......@@ -182,25 +175,4 @@ elif resource == 1:\n
</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>
......@@ -71,27 +71,29 @@
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple/>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
......@@ -40,19 +40,25 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Confirmed</string> </value>
<value> <string>Waiting for validation</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>deliver</string>
<string>deliver_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
......@@ -76,10 +82,10 @@
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -87,7 +93,6 @@
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Manager</string>
</tuple>
</value>
......@@ -96,10 +101,10 @@
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
<?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>
......@@ -26,7 +26,7 @@
</item>
<item>
<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>
<key> <string>id</string> </key>
......@@ -48,11 +48,17 @@
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>confirm</string>
<string>confirm_action</string>
<string>order</string>
<string>order_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
......@@ -76,10 +82,8 @@
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -89,7 +93,6 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -97,10 +100,8 @@
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
......@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>delivered</string> </value>
<value> <string>ordered</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
......@@ -40,10 +40,21 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Sent to vault</string> </value>
</item>
<item>
<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>
<tuple/>
</value>
......@@ -71,10 +82,9 @@
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -88,10 +98,9 @@
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
......@@ -91,7 +91,8 @@
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Owner</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
</tuple>
</value>
</item>
......
......@@ -91,7 +91,8 @@
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Owner</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
</tuple>
</value>
</item>
......
......@@ -89,9 +89,8 @@
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
<string>DestinationAssignor</string>
</tuple>
</value>
</item>
......
......@@ -60,11 +60,11 @@
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string>validateBalance</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Confirm Action</string> </value>
<value> <string>Send To Validation</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......@@ -89,9 +89,8 @@
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
<string>DestinationAssignor</string>
</tuple>
</value>
</item>
......
......@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Deliver</string> </value>
<value> <string>Validate</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Deliver Action</string> </value>
<value> <string>Validate</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......@@ -90,7 +90,7 @@
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
<string>DestinationAssignee</string>
</tuple>
</value>
</item>
......
<?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>
<?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>
......@@ -36,7 +36,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value> <string>Auteur</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
......
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>default_value</string> </key>
<value> <string></string> </value>
<value> <string>Cash Sorting</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>default_value</string> </key>
<value> <string>0</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -30,19 +30,19 @@
</item>
<item>
<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>
<key> <string>actbox_url</string> </key>
<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>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Cash Classifications to Validate</string> </value>
<value> <string>Cash Sorting To Validate</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -80,7 +80,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
<string>DestinationAssignee</string>
</tuple>
</value>
</item>
......@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Classification</string>
<string>Cash Sorting</string>
</tuple>
</value>
</item>
......
......@@ -30,19 +30,19 @@
</item>
<item>
<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>
<key> <string>actbox_url</string> </key>
<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>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Drafts to Validate</string> </value>
<value> <string>Draft to validate</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Classification</string>
<string>Cash Sorting</string>
</tuple>
</value>
</item>
......
<?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>
......@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>cash_transfer_workflow</string> </value>
<value> <string>usual_cash_transfer_workflow</string> </value>
</item>
<item>
<key> <string>initial_state</string> </key>
......
2006-04-26 aurel
* add outgoing cash sorting cell
2006-04-24 aurel
* use cash sorting instead of cash classification
2006-04-06 aurel
* remove accounting event for cash classification
......
Cash Classification Module | list_ui
Cash Classification Module | sort_on
Cash Classification Module | view
Cash Classification | external
Cash Classification | fastinputIn
Cash Classification | fastinputOut
Cash Classification | history
Cash Classification | list
Cash Classification | metadata
Cash Classification | print
Cash Classification | source
Cash Classification | view
Cash Transfer Module | list_ui
Cash Transfer Module | sort_on
Cash Transfer Module | view
Cash Transfer | fastinput
Cash Transfer | history
Cash Transfer | metadata
Cash Transfer | print
Cash Transfer | view
Incoming Cash Classification Line | list
Incoming Cash Classification Line | metadata
Incoming Cash Classification Line | print
Incoming Cash Classification Line | view
Outgoing Cash Classification Line | list
Outgoing Cash Classification Line | metadata
Outgoing Cash Classification Line | print
Outgoing Cash Classification Line | view
\ No newline at end of file
Cash Sorting Module | list
Cash Sorting Module | list_ui
Cash Sorting Module | sort_on
Cash Sorting Module | view
Cash Sorting | history
Cash Sorting | incoming_fastinput
Cash Sorting | incoming_line_view
Cash Sorting | metadata
Cash Sorting | outgoing_fastinput
Cash Sorting | outgoing_line_list
Cash Sorting | view
Incoming Cash Sorting Line | metadata
Incoming Cash Sorting Line | view
Outgoing Cash Sorting Cell | metadata
Outgoing Cash Sorting Cell | view
Outgoing Cash Sorting Line | metadata
Outgoing Cash Sorting Line | view
Usual Cash Transfer Module | list_ui
Usual Cash Transfer Module | sort_on
Usual Cash Transfer Module | view
Usual Cash Transfer | fastinput
Usual Cash Transfer | history
Usual Cash Transfer | metadata
Usual Cash Transfer | print
Usual Cash Transfer | view
\ No newline at end of file
cash_classification_module
cash_transfer_module
\ No newline at end of file
cash_sorting_module
usual_cash_transfer_module
\ No newline at end of file
Cash Classification Module | Cash Classification
Cash Classification | Incoming Cash Classification Line
Cash Classification | Outgoing Cash Classification Line
Cash Transfer Module | Cash Transfer
Cash Transfer | Cash Delivery Line
Incoming Cash Classification Line | Cash Delivery Cell
Outgoing Cash Classification Line | Cash Delivery Cell
\ No newline at end of file
Cash Sorting Module | Cash Sorting
Cash Sorting | Incoming Cash Sorting Line
Cash Sorting | Outgoing Cash Sorting Line
Incoming Cash Sorting Line | Cash Delivery Cell
Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell
Usual Cash Transfer Module | Usual Cash Transfer
Usual Cash Transfer | Cash Delivery Line
\ No newline at end of file
Outgoing Cash Sorting Cell | variation
\ No newline at end of file
Cash Classification | Incoming Cash Classification Line
Cash Classification | Outgoing Cash Classification Line
Cash Transfer | Cash Delivery Line
Incoming Cash Classification Line | Cash Delivery Cell
Outgoing Cash Classification Line | Cash Delivery Cell
\ No newline at end of file
Cash Sorting | Incoming Cash Sorting Line
Cash Sorting | Outgoing Cash Sorting Line
Incoming Cash Sorting Line | Cash Delivery Cell
Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell
Usual Cash Transfer | Cash Delivery Line
\ No newline at end of file
Cash Classification
Cash Classification Module
Cash Transfer
Cash Transfer Module
Incoming Cash Classification Line
Outgoing Cash Classification Line
\ No newline at end of file
Cash Sorting
Cash Sorting Module
Incoming Cash Sorting Line
Outgoing Cash Sorting Cell
Outgoing Cash Sorting Line
Usual Cash Transfer
Usual Cash Transfer Module
\ No newline at end of file
Cash Classification | Price
Cash Transfer | Amount
Cash Transfer | Price
Incoming Cash Classification Line | CashDeliveryLine
Outgoing Cash Classification Line | CashDeliveryLine
\ No newline at end of file
Cash Sorting | Price
Incoming Cash Sorting Line | CashDeliveryLine
Outgoing Cash Sorting Cell | CashDeliveryLine
Outgoing Cash Sorting Line | CashDeliveryLine
Usual Cash Transfer | Amount
Usual Cash Transfer | Price
\ No newline at end of file
Cash Classification | cash_classification_workflow
Cash Classification | edit_workflow
Cash Transfer | cash_transfer_workflow
Cash Transfer | edit_workflow
\ No newline at end of file
Cash Sorting | cash_sorting_workflow
Cash Sorting | edit_workflow
Usual Cash Transfer | edit_workflow
Usual Cash Transfer | usual_cash_transfer_workflow
\ No newline at end of file
cash_classification_workflow
cash_transfer_workflow
\ No newline at end of file
cash_sorting_workflow
usual_cash_transfer_workflow
\ No newline at end of file
......@@ -44,6 +44,10 @@
<key> <string>id</string> </key>
<value> <string>list_ui</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
......
......@@ -44,6 +44,10 @@
<key> <string>id</string> </key>
<value> <string>sort_on</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
......
......@@ -44,6 +44,10 @@
<key> <string>id</string> </key>
<value> <string>vault_report</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
......
......@@ -44,6 +44,10 @@
<key> <string>id</string> </key>
<value> <string>view</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
......
......@@ -4,8 +4,8 @@
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Transitions</string>
<string>TransitionDefinition</string>
<string>Products.ERP5Type.Document.BaseCategory</string>
<string>BaseCategory</string>
</tuple>
<none/>
</tuple>
......@@ -19,61 +19,79 @@
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<key> <string>_count</string> </key>
<value>
<none/>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>aggregate</string>
</tuple>
</value>
</item>
<item>
<key> <string>guard</string> </key>
<key> <string>category_type</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
<tuple>
<string>sub_variation</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>reject</string> </value>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
<key> <string>id</string> </key>
<value> <string>aggregate</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Reject</string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>var_exprs</string> </key>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
......@@ -83,60 +101,48 @@
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
</value>
</item>
</dictionary>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<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>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
......@@ -144,8 +150,10 @@
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:1</string> </value>
<key> <string>_container</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
......
......@@ -42,24 +42,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</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>
<key> <string>id</string> </key>
<value> <string>vault_type</string> </value>
......
......@@ -172,6 +172,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -244,10 +247,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -316,10 +315,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -542,10 +537,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -713,10 +704,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -166,6 +166,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -237,9 +240,6 @@
<permission>
<name>Add Plugin Registrys</name>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -308,9 +308,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -531,10 +528,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -701,9 +694,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -715,10 +706,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -715,10 +706,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -173,6 +173,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -245,10 +248,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -317,10 +316,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -543,10 +538,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -715,10 +706,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -172,6 +172,9 @@
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ERP5Subversion Tools</name>
</permission>
<permission>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
......@@ -244,10 +247,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Portal ZSyncer Tools</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -316,10 +315,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission>
<name>Add ZSyncers</name>
<role>Manager</role>
</permission>
<permission>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -542,10 +537,6 @@
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Translation Services</name>
<role>Manager</role>
</permission>
<permission>
<name>Manage Vocabulary</name>
<role>Manager</role>
......@@ -713,10 +704,6 @@
<name>WebDAV access</name>
<role>Manager</role>
</permission>
<permission>
<name>ZSyncer: Use ZSyncer</name>
<role>Manager</role>
</permission>
<permission>
<name>ZopeProfiler: manage</name>
<role>Manager</role>
......
......@@ -84,14 +84,10 @@ if site is None:\n
site = site_list[0]\n
\n
# get only the office, not need of vault\n
if not \'siege\' in site:\n
# XXX must change the way it get the vault\n
site = site.split(\'/\')[3:4]\n
else:\n
site = \'siege\'\n
\n
context.log(\'Baobab_checkCounterDateOpen\', \'get site for vault %s\' %(site))\n
site = context.Baobab_getVaultSite(site)\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
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
......
<?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>
<?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>
......@@ -66,8 +66,36 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.getMovementList(portal_type=portal_type)\n
</string> </value>
<value> <string encoding="cdata"><![CDATA[
# 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>
<key> <string>_code</string> </key>
......@@ -87,7 +115,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>portal_type=None, *argv, **kw</string> </value>
<value> <string>portal_type=[], *argv, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -116,8 +144,18 @@
<string>portal_type</string>
<string>argv</string>
<string>kw</string>
<string>same_type</string>
<string>_getattr_</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>
</value>
</item>
......@@ -130,7 +168,7 @@
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
<list/>
</tuple>
</value>
</item>
......
......@@ -69,7 +69,7 @@
<value> <string># put all counter in closing state for the given site\n
transaction = state_change.object\n
\n
site = transaction.getSourceValue()\n
site = transaction.getSiteValue()\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
......
......@@ -71,14 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change.object\n
site = transaction.getSourceValue()\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
\n
site = transaction.Baobab_getVaultSite(vault=transaction.getSourceValue())\n
\n
# get the current counter date\n
kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n
......@@ -91,13 +85,17 @@ else:\n
current_date = date_list[0].getStartDate()\n
\n
site_uid = transaction.getSiteUid()\n
\n
# get all operations related to this counter\n
# as source\n
kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n
# as destination\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_object = [x.getObject() for x in operation_list]\n
# # as source\n
# kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n
# # as destination\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_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
\n
for operation in operation_list_object:\n
......@@ -165,9 +163,6 @@ for operation in operation_list_object:\n
<string>_getattr_</string>
<string>transaction</string>
<string>site</string>
<string>True</string>
<string>hasattr</string>
<string>msg</string>
<string>kwd</string>
<string>append</string>
<string>$append0</string>
......@@ -179,12 +174,9 @@ for operation in operation_list_object:\n
<string>None</string>
<string>current_date</string>
<string>len</string>
<string>msg</string>
<string>_getitem_</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</string>
</tuple>
......
......@@ -71,7 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change.object\n
site = transaction.getSourceValue()\n
site = transaction.getSiteValue()\n
\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
......@@ -80,11 +81,11 @@ while True:\n
break\n
site = site.getParentValue()\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
\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
</string> </value>
</item>
......
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