Skip to content

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

change way to check counter date is opened 

add reject on all workflow
some other changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14963 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent af0e5127
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7502 additions and 1597 deletions
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Rendering.xml
View file @ a538cde8
......@@ -115,6 +115,10 @@
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
View file @ a538cde8
......@@ -78,7 +78,7 @@ if vcurrency is None :\n
return request.RESPONSE.redirect( redirect_url )\n
\n
if currency != \'XOF\':\n
cashStatus = [\'not_defined\']\n
cashStatus = [\'valid\']\n
emissionLetter = [\'not_defined\']\n
variation = [\'not_defined\']\n
else:\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml
View file @ a538cde8
......@@ -79,7 +79,7 @@ if vcurrency is None :\n
\n
\n
if currency != \'XOF\':\n
cashStatus = [\'not_defined\',]\n
cashStatus = [\'valid\',]\n
emissionLetter = [\'not_defined\',]\n
variation = [\'not_defined\',]\n
else:\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
View file @ a538cde8
......@@ -68,7 +68,7 @@
<value> <string>cash_detail_dict = {\'line_portal_type\' : \'Incoming Cash Sorting Line\'\n
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
, \'cash_status_list\' : [\'to_sort\',]\n
, \'emission_letter_list\' : [\'not_defined\',]\n
, \'emission_letter_list\' : [\'not_defined\',\'mixed\']\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
, \'currency_cash_portal_type\': None\n
, \'read_only\' : False\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineFastInputDialog.xml
View file @ a538cde8
......@@ -67,10 +67,10 @@
<key> <string>_body</string> </key>
<value> <string>cash_detail_dict = {\'line_portal_type\' : \'Outgoing Cash Sorting Line\'\n
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\', \'mixed\']\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\', \'mutilated\']\n
, \'emission_letter_list\' : None\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1)\n
, \'currency_cash_portal_type\': \'Banknote\'\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
, \'currency_cash_portal_type\': None\n
, \'read_only\' : False\n
, \'column_base_category\' : \'variation\'\n
}\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleModule_viewCurrencySaleList/listbox.xml
View file @ a538cde8
......@@ -349,7 +349,7 @@
<string>Description</string>
</tuple>
<tuple>
<string>Simulation_state</string>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
......@@ -394,7 +394,7 @@
<string>Description</string>
</tuple>
<tuple>
<string>Simulation_state</string>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view.xml
View file @ a538cde8
......@@ -118,6 +118,7 @@
<value>
<list>
<string>my_start_date</string>
<string>my_stop_date</string>
<string>my_description</string>
</list>
</value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
View file @ a538cde8
......@@ -76,19 +76,32 @@ cash_status = context.getCashStatus()\n
# possible cash status : cancelled, to_sort, valid\n
emission_letter = context.getEmissionLetter()\n
\n
if cash_status == "to_sort" and emission_letter == "not_defined":\n
# banknote letter \'not defined\' / a trier -> caisse source\n
return context.getSource()\n
elif emission_letter != site_letter:\n
# external banknote -> caisse auxiliaire / encaisse externe\n
# banknote letter \'mixed\' -> caisse auxiliaire / encaisse externe\n
return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
elif cash_status in ("cancelled", "to_sort"):\n
# banknote \'cancelled\' oo \'to_sort\'from same country -> caisse auxiliaire / billets et monnaies\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
elif cash_status == "valid":\n
# banknote \'valid\' from same country -> caisse de reserve / billets et monnaies\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
resource_portal_type = context.getResourceValue().getPortalType()\n
if resource_portal_type == \'Banknote\':\n
if cash_status == "to_sort" and emission_letter == "not_defined":\n
# banknote letter \'not defined\' / a trier -> caisse source\n
source = context.getSource()\n
if not \'ventilation\' in source:\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
return \'%s/caveau/auxiliaire/%s\' %(site, \'/\'.join(source.split(\'/\')[-2:]))\n
elif emission_letter != site_letter:\n
# external banknote -> caisse auxiliaire / encaisse externe\n
# banknote letter \'mixed\' -> caisse auxiliaire / encaisse externe\n
return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
elif cash_status in ("cancelled", "to_sort"):\n
# banknote \'cancelled\' or \'to_sort\'from same country -> caisse auxiliaire / billets et monnaies\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
elif cash_status == "valid":\n
# banknote \'valid\' from same country -> caisse de reserve / billets et monnaies\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
# Coin\n
if cash_status == "valid":\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
\n
\n
\n
# if emission_letter!=\'not_defined\' and not (emission_letter in site_letter):\n
......@@ -173,6 +186,8 @@ elif cash_status == "valid":\n
<string>site</string>
<string>cash_status</string>
<string>emission_letter</string>
<string>resource_portal_type</string>
<string>source</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/VaultTransfer_view/my_source.xml
View file @ a538cde8
......@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(), vault_type=(\'site/caveau/auxiliaire\',\'site/caveau/reserve\',))</string> </value>
<value> <string>python: here.Base_sortItemList(here.Delivery_getVaultItemList(current_url=here.getSource(), vault_type=(\'site/caveau/auxiliaire\',\'site/caveau/reserve\',))+here.Delivery_getVaultItemList(vault_type=(\'site/caveau/auxiliaire/encaisse_des_externes\',),leaf_node=0,strict_membership=1)[1:], keep_first=1)</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistencyAndValidatePositionAccounting.xml
View file @ a538cde8
......@@ -91,9 +91,7 @@ source = baobab_source\n
source_object = context.portal_categories.getCategoryValue(source)\n
\n
# check again that we are in the good accounting date\n
if not transaction.Baobab_checkCounterDateOpen(site=source_object, date=date):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
transaction.Baobab_checkCounterDateOpen(site=source_object, date=date)\n
\n
\n
vault = "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(transaction.getSource(),)\n
......@@ -227,11 +225,11 @@ if debit:\n
<string>site</string>
<string>site_value</string>
<string>source_object</string>
<string>msg</string>
<string>vault</string>
<string>price</string>
<string>in_price</string>
<string>out_price</string>
<string>msg</string>
<string>resource</string>
<string>bank_account</string>
<string>exchange_rate_list</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts.xml
View file @ a538cde8
......@@ -27,12 +27,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>scripts</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateSourceAndDestination.xml
View file @ a538cde8
......@@ -83,12 +83,6 @@ transaction.Base_checkBaobabSourceAndDestination()\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change, **kw</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml
View file @ a538cde8
......@@ -74,9 +74,7 @@ caisse = transaction.getSource()\n
\n
\n
# check again that we are in the good accounting date\n
if not transaction.Baobab_checkCounterDateOpen(site=caisse, date=transaction.getStartDate()):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
transaction.Baobab_checkCounterDateOpen(site=caisse, date=transaction.getStartDate())\n
\n
\n
resource_one = transaction.CashDelivery_checkCounterInventory(source = caisse, portal_type=\'Incoming Cash Balance Regulation Line\')\n
......@@ -129,12 +127,6 @@ if incoming_total != outgoing_total:\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
......@@ -172,12 +164,12 @@ if incoming_total != outgoing_total:\n
<string>transaction</string>
<string>_getattr_</string>
<string>caisse</string>
<string>msg</string>
<string>resource_one</string>
<string>resource_two</string>
<string>amount</string>
<string>incoming_total</string>
<string>outgoing_total</string>
<string>msg</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states.xml
View file @ a538cde8
......@@ -27,12 +27,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>states</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/cancelled.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......@@ -45,8 +39,6 @@
<tuple>
<string>deliver</string>
<string>deliver_action</string>
<string>draft</string>
<string>draft_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/deleted.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/rejected.xml 0 → 100644
View file @ a538cde8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</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>rejected</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></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>
<string>delete</string>
<string>delete_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>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions.xml
View file @ a538cde8
......@@ -27,12 +27,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>transitions</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/delete.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/delete_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......@@ -73,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -88,6 +79,7 @@
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assignee</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/reject.xml
View file @ a538cde8
......@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
<value> <string>rejected</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
......@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables.xml
View file @ a538cde8
......@@ -27,12 +27,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>variables</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/actor.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/comment.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/error_message.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/history.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/simulation_assigned.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/time.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists.xml
View file @ a538cde8
......@@ -27,12 +27,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>worklists</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/rejected.xml 0 → 100644
View file @ a538cde8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</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>Rejected Cash Balance Regulation (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=confirmed&rejected=1&portal_type=Cash Balance Regulation&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Rejected Cash Balance Regulation</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>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Balance Regulation</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>rejected</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
View file @ a538cde8
......@@ -82,10 +82,7 @@ caisse_outgoing = counter_site + encaisse_billets_et_monnaies_sortante\n
transaction.Baobab_checkSameUserVault(counter_site)\n
\n
# check again that we are in the good accounting date\n
if not transaction.Baobab_checkCounterDateOpen(site=caisse_outgoing, date=transaction.getStartDate()):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
\n
transaction.Baobab_checkCounterDateOpen(site=caisse_outgoing, date=transaction.getStartDate())\n
# use of the constraint : Test cash status line\n
#vliste = transaction.checkConsistency()\n
#transaction.log(\'vliste\', vliste)\n
......@@ -180,11 +177,11 @@ if amount_total != outgoing_total:\n
<string>counter_site</string>
<string>caisse_incoming</string>
<string>caisse_outgoing</string>
<string>msg</string>
<string>resource_two</string>
<string>incoming_total</string>
<string>outgoing_total</string>
<string>amount_total</string>
<string>msg</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml
View file @ a538cde8
......@@ -78,9 +78,7 @@ out_list = txn.objectValues(portal_type=\'Outgoing Cash Incident Line\')\n
# check that we are in the good accounting date\n
vault = txn.getSource()\n
\n
if not txn.Baobab_checkCounterDateOpen(site=vault, date=txn.getStartDate()):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
txn.Baobab_checkCounterDateOpen(site=vault, date=txn.getStartDate())\n
\n
\n
\n
......@@ -161,11 +159,11 @@ if out_price != 0:\n
<string>in_list</string>
<string>out_list</string>
<string>vault</string>
<string>msg</string>
<string>price</string>
<string>in_price</string>
<string>out_price</string>
<string>len</string>
<string>msg</string>
<string>resource</string>
</tuple>
</value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/validateSourceAndDestination.xml
View file @ a538cde8
......@@ -83,12 +83,6 @@ transaction.Base_checkBaobabSourceAndDestination()\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change, **kw</string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/states/cancelled.xml
View file @ a538cde8
......@@ -16,15 +16,29 @@
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>cancelled</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Cancelled</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/states/confirmed.xml
View file @ a538cde8
......@@ -39,8 +39,8 @@
<tuple>
<string>deliver</string>
<string>deliver_action</string>
<string>draft</string>
<string>draft_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/states/deleted.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/states/rejected.xml 0 → 100644
View file @ a538cde8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</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>rejected</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>Rejected</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>
<string>delete</string>
<string>delete_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>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/cancel.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......@@ -44,7 +38,7 @@
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
<none/>
</value>
</item>
<item>
......@@ -70,25 +64,4 @@
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</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_incident_workflow/transitions/cancel_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......@@ -85,6 +79,7 @@
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assignee</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/delete.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/delete_action.xml
View file @ a538cde8
......@@ -15,12 +15,6 @@
<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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/draft.xml deleted 100644 → 0
View file @ af0e5127
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</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>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Reject</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/draft.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/reject.xml
View file @ a538cde8
......@@ -43,11 +43,11 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
<value> <string>reject</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
<value> <string>rejected</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/draft_action.xml → bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/transitions/reject_action.xml
View file @ a538cde8
......@@ -25,11 +25,11 @@
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=draft_action</string> </value>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=reject_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>draft</string> </value>
<value> <string>reject</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -43,7 +43,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft_action</string> </value>
<value> <string>reject_action</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateDestinationCounterDate.xml
View file @ a538cde8
......@@ -73,9 +73,7 @@ transaction = state_change[\'object\']\n
vaultDestination = transaction.getDestination()\n
\n
# check again that we are in the good accounting date in site destination\n
if not transaction.Baobab_checkCounterDateOpen(site=vaultDestination, date=transaction.getStopDate()):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
transaction.Baobab_checkCounterDateOpen(site=vaultDestination, date=transaction.getStopDate())\n
</string> </value>
</item>
<item>
......@@ -134,7 +132,6 @@ if not transaction.Baobab_checkCounterDateOpen(site=vaultDestination, date=trans
<string>transaction</string>
<string>_getattr_</string>
<string>vaultDestination</string>
<string>msg</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/bt/revision
View file @ a538cde8
This diff is collapsed.
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