Skip to content

erp5
erp5
Commit 6f1e39b7 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

* fix the fix in foreign cash reception 

* some xml changed even if no change was mode

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9252 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent aa976885
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 942 additions and 218 deletions
bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml
View file @ 6f1e39b7
......@@ -456,10 +456,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml
View file @ 6f1e39b7
......@@ -440,9 +440,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignee</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml
View file @ 6f1e39b7
......@@ -456,10 +456,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml
View file @ 6f1e39b7
......@@ -456,10 +456,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
View file @ 6f1e39b7
......@@ -440,9 +440,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignee</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml
View file @ 6f1e39b7
......@@ -456,10 +456,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml
View file @ 6f1e39b7
......@@ -439,9 +439,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignor</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml
View file @ 6f1e39b7
......@@ -439,9 +439,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignor</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml
View file @ 6f1e39b7
......@@ -455,9 +455,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml
View file @ 6f1e39b7
......@@ -459,9 +459,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml
View file @ 6f1e39b7
......@@ -454,9 +454,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml
View file @ 6f1e39b7
......@@ -456,10 +456,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml
View file @ 6f1e39b7
......@@ -462,9 +462,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
View file @ 6f1e39b7
......@@ -455,9 +455,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml
View file @ 6f1e39b7
......@@ -462,9 +462,6 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Account%20Incident%20Module.xml
View file @ 6f1e39b7
......@@ -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>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Exchange.xml
View file @ 6f1e39b7
......@@ -100,7 +100,7 @@
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
<value> <string>CashExchange_init</string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
View file @ 6f1e39b7
......@@ -89,7 +89,7 @@ if currency != \'XOF\':\n
\n
cash_detail_dict= { \'line_portal_type\' : \'Incoming Cash Balance Regulation Line\' # The portal type that the fastinput will create\n
, \'operation_currency\' : currency # The operation currently\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\'] # List of possible cashStatus or None if all\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\'] # List of possible cashStatus or None if all\n
, \'emission_letter_list\' : None # List of possible emissionLetter or None if all\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1) # List of possible variation or None if all\n
, \'currency_cash_portal_type\': None # \'Coin\' or \'Banknote\' or None if both\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml
View file @ 6f1e39b7
......@@ -89,7 +89,7 @@ if currency != \'XOF\':\n
\n
cash_detail_dict= { \'line_portal_type\' : \'Outgoing Cash Balance Regulation Line\' # The portal type that the fastinput will create\n
, \'operation_currency\' : currency # The operation currently\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\'] # List of possible cashStatus or None if all\n
, \'cash_status_list\' : [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\'] # List of possible cashStatus or None if all\n
, \'emission_letter_list\' : None # List of possible emissionLetter or None if all\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1) # List of possible variation or None if all\n
, \'currency_cash_portal_type\': None # \'Coin\' or \'Banknote\' or None if both\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList.xml
View file @ 6f1e39b7
......@@ -104,6 +104,7 @@
<string>listbox</string>
<string>listbox_delivery_start_date</string>
<string>listbox_source_total_asset_price</string>
<string>listbox_source_logical_path</string>
</list>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox.xml
View file @ 6f1e39b7
......@@ -372,6 +372,10 @@
<string>source_reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>source_logical_path</string>
<string>Vault</string>
</tuple>
<tuple>
<string>delevery.start_date</string>
<string>Date</string>
......@@ -380,10 +384,6 @@
<string>source_total_asset_price</string>
<string>Amount</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.xml
View file @ 6f1e39b7
......@@ -70,8 +70,27 @@
<key> <string>_body</string> </key>
<value> <string>source = context.getSource()\n
if source != None:\n
source = source + \'/sortante\'\n
return source\n
else:\n
# calculate the source\n
user_site = None\n
# must use owner to know site letter\n
group_list = context.get_local_roles()\n
for group, role_list in group_list:\n
if \'Owner\' in role_list:\n
user_id = group\n
\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
for site in site_list:\n
site_value = context.portal_categories.getCategoryValue(site)\n
context.log(\'site_value\',site_value)\n
if site_value.getVaultType().endswith(\'guichet\'):\n
user_site = site\n
if site is None:\n
from Products.ERP5Type.Message import Message\n
message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
raise ValueError,message\n
return site\n
</string> </value>
</item>
<item>
......@@ -124,6 +143,19 @@ if source != None:\n
<string>context</string>
<string>source</string>
<string>None</string>
<string>user_site</string>
<string>group_list</string>
<string>_getiter_</string>
<string>group</string>
<string>role_list</string>
<string>user_id</string>
<string>site_list</string>
<string>site</string>
<string>site_value</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>message</string>
<string>ValueError</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_init.xml
View file @ 6f1e39b7
......@@ -68,29 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>immediate_reindex=1\n
\n
# Definition des s\xc3\xa9curit\xc3\xa9s\n
#return\n
\n
#context.Baobab_assignLocalRole(\n
# Assignor = ({\'site\': None, \n
# \'group\':\'bceao/agence/principale/dakar/service/caisse\', # principale/dakar/ will be removed\n
# \'function\':\'agence/principale/caissier_particulier\'},),\n
# Assignee = ({\'site\': None, \n
# \'group\':\'bceao/agence/principale/dakar/service/caisse\', # principale/dakar/ will be removed\n
# \'function\':\'agence/principale/caissier_principal\'},),\n
# Auditor = ({\'site\': \'siege\', \n
# \'group\':\'bceao/siege/direction/emission/service/caisse\', \n
# \'function\':\'siege/caissier_principal\'},\n
# {\'site\': \'siege\', \n
# \'group\':\'bceao/siege/direction/comptabilite_et_du_budget/service/comptabilite_siege\', \n
# \'function\':\'siege/chef_comptable\'},\n
# {\'site\': None, \n
# \'group\':\'bceao/agence/principale/dakar/service/comptabilite\', \n
# \'function\':\'agence/principale/chef_comptable\'},\n
#),\n
# )\n
<value> <string>context.setSource(context.getBaobabSource())\n
</string> </value>
</item>
<item>
......@@ -111,7 +89,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
<value> <string>*args,**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -137,7 +115,10 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>immediate_reindex</string>
<string>args</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view.xml
View file @ 6f1e39b7
......@@ -95,6 +95,7 @@
<value>
<list>
<string>my_source_reference</string>
<string>my_source_logical_path</string>
<string>my_source_total_asset_price</string>
<string>my_translated_simulation_state_title</string>
</list>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewOutgoingLineFastInputDialog.xml
View file @ 6f1e39b7
......@@ -70,7 +70,7 @@
<key> <string>_body</string> </key>
<value> <string>cash_detail_dict= { \'line_portal_type\' : \'Outgoing Cash Exchange Line\' # The portal type that the fastinput will create\n
, \'operation_currency\' : \'XOF\' # The operation currently\n
, \'cash_status_list\' : [\'valid\'] # List of possible cashStatus or None if all\n
, \'cash_status_list\' : [\'valid\', \'new_emitted\'] # List of possible cashStatus or None if all\n
, \'emission_letter_list\' : context.Baobab_getUserEmissionLetterList() # List of possible emissionLetter or None if all\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1) # List of possible variation or None if all #[\'2003\'] # List of possible variation or None if all\n
, \'currency_cash_portal_type\': None # \'Coin\' or \'Banknote\' or None if both\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabDestination.xml
View file @ 6f1e39b7
......@@ -72,7 +72,8 @@
if \'devise\' in source:\n
return "%s/caisse_courante/%s" %("/".join(source.split("/")[:-4]), "/".join(source.split("/")[-2:]))\n
else:\n
return "%s/caisse_courante/%s" %("/".join(source.split("/")[:-3]), "/".join(source.split("/")[-1:]))\n
# return "%s/caisse_courante/%s" %("/".join(source.split("/")[:-3]), "/".join(source.split("/")[-1:]))\n
return "%s/caisse_courante/encaisse_des_billets_et_monnaies" %("/".join(source.split("/")[:-4]))\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashExchangeLine_getBaobabDestination.xml
View file @ 6f1e39b7
......@@ -68,38 +68,9 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
source = context.getSource()\n
if source != None:\n
source = source + \'/entrante\'\n
return source\n
"""\n
\n
context.log(\'la_destination\',"")\n
currency = context.getResourceTitle()\n
encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/%s/entrante" %(context.getParentValue().getResourceTitle().lower())\n
\n
# OLD METHOD user logged in\n
#user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n
# NEW METHOD must use owner to know site letter\n
old_group_list = context.get_local_roles()\n
for group, role_list in old_group_list:\n
if \'Owner\' in role_list:\n
user_id = group\n
\n
\n
\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
context.log(\'site_list\',site_list)\n
destination = None\n
for site in site_list:\n
site_value = context.portal_categories.getCategoryValue(site)\n
context.log(\'site_value\',site_value)\n
if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
destination = site + encaisse_billets_et_monnaies\n
break\n
context.log(\'la_bonne_destination\',destination)\n
<value> <string>encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/entrante"\n
counter_site = context.getSource()\n
destination = counter_site + encaisse_billets_et_monnaies\n
return destination\n
</string> </value>
</item>
......@@ -149,20 +120,11 @@ return destination\n
<tuple>
<string>args</string>
<string>kw</string>
<string>encaisse_billets_et_monnaies</string>
<string>_getattr_</string>
<string>context</string>
<string>currency</string>
<string>encaisse_billets_et_monnaies</string>
<string>old_group_list</string>
<string>_getiter_</string>
<string>group</string>
<string>role_list</string>
<string>user_id</string>
<string>site_list</string>
<string>None</string>
<string>counter_site</string>
<string>destination</string>
<string>site</string>
<string>site_value</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashExchangeLine_getBaobabSource.xml
View file @ 6f1e39b7
......@@ -68,37 +68,9 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
source = context.getSource()\n
if source != None:\n
source = source + \'/sortante\'\n
return source\n
"""\n
\n
currency = context.getResourceTitle()\n
encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/sortante"\n
\n
# OLD METHOD user logged in\n
#user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n
# NEW METHOD must use owner to know site letter\n
old_group_list = context.get_local_roles()\n
for group, role_list in old_group_list:\n
if \'Owner\' in role_list:\n
user_id = group\n
\n
\n
\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
context.log(\'site_list\',site_list)\n
destination = None\n
for site in site_list:\n
site_value = context.portal_categories.getCategoryValue(site)\n
context.log(\'site_value\',site_value)\n
if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
destination = site + encaisse_billets_et_monnaies\n
break\n
context.log(\'la_bonne_destination\',destination)\n
<value> <string>encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/sortante"\n
counter_site = context.getSource()\n
destination = counter_site + encaisse_billets_et_monnaies\n
return destination\n
</string> </value>
</item>
......@@ -148,20 +120,11 @@ return destination\n
<tuple>
<string>args</string>
<string>kw</string>
<string>encaisse_billets_et_monnaies</string>
<string>_getattr_</string>
<string>context</string>
<string>currency</string>
<string>encaisse_billets_et_monnaies</string>
<string>old_group_list</string>
<string>_getiter_</string>
<string>group</string>
<string>role_list</string>
<string>user_id</string>
<string>site_list</string>
<string>None</string>
<string>counter_site</string>
<string>destination</string>
<string>site</string>
<string>site_value</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml 0 → 100644
View file @ 6f1e39b7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Variables</string>
<string>VariableDefinition</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>default_expr</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_value</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>for_status</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>portal_type</string> </value>
</item>
<item>
<key> <string>info_guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>update_always</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml
View file @ 6f1e39b7
......@@ -79,6 +79,14 @@ Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Cash Ex
<key> <string>_container</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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml
View file @ 6f1e39b7
......@@ -79,6 +79,14 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset
<key> <string>_container</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>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
View file @ 6f1e39b7
......@@ -77,35 +77,21 @@ encaisse_billets_et_monnaies_sortante = "/encaisse_des_billets_et_monnaies/sorta
encaisse_billets_et_monnaies_entrante = "/encaisse_des_billets_et_monnaies/entrante"\n
\n
\n
# user logged in\n
user_id = transaction.portal_membership.getAuthenticatedMember().getUserName()\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
\n
\n
caisse_incoming = None\n
caisse_outgoing = None\n
for site in site_list:\n
site_value = context.portal_categories.getCategoryValue(site)\n
\n
if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
caisse_incoming = site + encaisse_billets_et_monnaies_entrante\n
caisse_outgoing = site + encaisse_billets_et_monnaies_sortante\n
break\n
counter_site = transaction.getSource()\n
caisse_incoming = counter_site + encaisse_billets_et_monnaies_entrante\n
caisse_outgoing = counter_site + encaisse_billets_et_monnaies_sortante\n
\n
\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
if not transaction.Baobab_checkCounterDateOpen(site=counter_site, date=transaction.getStartDate()):\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
\n
\n
\n
#resource_one = transaction.CashDelivery_checkCounterInventory(source = caisse_incoming, portal_type=\'Incoming Cash Exchange Line\')\n
resource_two = transaction.CashDelivery_checkCounterInventory(caisse_outgoing, portal_type=\'Outgoing Cash Exchange Line\')\n
\n
#resource_two = transaction.CashDelivery_checkCounterInventory(outgoing_source,portal_type=\'Outgoing Cash To Currency Purchase Line\')\n
\n
# Get total_price.\n
incoming_total = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Exchange Line\')\n
outgoing_total = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Exchange Line\')\n
......@@ -148,7 +134,7 @@ if amount_total != outgoing_total:\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
<value> <string>state_change, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -175,6 +161,7 @@ if amount_total != outgoing_total:\n
<value>
<tuple>
<string>state_change</string>
<string>kw</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
......@@ -184,15 +171,9 @@ if amount_total != outgoing_total:\n
<string>currency</string>
<string>encaisse_billets_et_monnaies_sortante</string>
<string>encaisse_billets_et_monnaies_entrante</string>
<string>user_id</string>
<string>context</string>
<string>site_list</string>
<string>None</string>
<string>counter_site</string>
<string>caisse_incoming</string>
<string>caisse_outgoing</string>
<string>_getiter_</string>
<string>site</string>
<string>site_value</string>
<string>msg</string>
<string>resource_two</string>
<string>incoming_total</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
View file @ 6f1e39b7
......@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Delivered </string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/portal_type.xml
View file @ 6f1e39b7
......@@ -24,10 +24,42 @@
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_value</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>for_status</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>portal_type</string> </value>
</item>
<item>
<key> <string>info_guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>update_always</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/delivered.xml
View file @ 6f1e39b7
......@@ -103,6 +103,14 @@ Base_viewSearchResultList?simulation_state=delivered&reset=1&portal_type=Cash Ex
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/draft.xml
View file @ 6f1e39b7
......@@ -103,6 +103,14 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Cash Exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
View file @ 6f1e39b7
......@@ -82,7 +82,7 @@ line_price = object.getTotalPrice(deliveryLineType=\'Cash Delivery Line\')\n
\n
if object_price != line_price:\n
msg = Message(domain="ui", message="Amount differs between document and lines.")\n
raise validationFailed, (msg,)\n
raise ValidationFailed, (msg,)\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm.xml
View file @ 6f1e39b7
......@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Assign To Vault Controler</string> </value>
<value> <string>Assigned To Vault Controler</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm_action.xml
View file @ 6f1e39b7
......@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Assign To Vault Controler</string> </value>
<value> <string>Assigned To Vault Controler</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Assign To Vault Controler Action</string> </value>
<value> <string>Assigned To Vault Controler Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateSourceAndDestination.xml 0 → 100644
View file @ 6f1e39b7
<?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>
<none/>
</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># Call the script wich checks if source and destination\n
# are well defined\n
transaction = state_change.object\n
transaction.Base_checkBaobabSourceAndDestination()\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_workflow/vault_transfer_workflow/scripts/validateSourceAndDestination</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</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>state_change</string>
<string>_getattr_</string>
<string>transaction</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>validateSourceAndDestination</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/confirm_to_deliver_action.xml
View file @ 6f1e39b7
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
<value> <string>validateSourceAndDestination</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/order_to_deliver_action.xml
View file @ 6f1e39b7
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
<value> <string>validateSourceAndDestination</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
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