Skip to content

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

remove many immediate_reindex 

more checks in workflows
fixed some security settings

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11191 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a350de0a
Show whitespace changes
Inline Side-by-side
Showing with 987 additions and 103 deletions
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Monetary%20Reception/fastinput.xml
View file @ a4264054
......@@ -104,7 +104,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: len(here.objectIds()) == 0</string> </value>
<value> <string>python: len(here.objectIds()) == 0 or here.objectValues()[0].getResourceValue().getPortalType()==\'Coin\'</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml
View file @ a4264054
......@@ -529,6 +529,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_movement_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
View file @ a4264054
......@@ -529,6 +529,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_to_currency_purchase_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/cash_to_currency_sale_module.xml
View file @ a4264054
......@@ -528,6 +528,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/currency_purchase_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/currency_sale_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/destruction_survey_module.xml
View file @ a4264054
......@@ -546,6 +546,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/internal_money_deposit_module.xml
View file @ a4264054
......@@ -527,6 +527,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml
View file @ a4264054
......@@ -526,6 +526,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml
View file @ a4264054
......@@ -527,6 +527,9 @@
<permission type='tuple'>
<name>Manage Groups</name>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml
View file @ a4264054
......@@ -549,6 +549,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml
View file @ a4264054
......@@ -542,6 +542,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/mutilated_banknote_module.xml
View file @ a4264054
......@@ -546,6 +546,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml
View file @ a4264054
......@@ -553,6 +553,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
View file @ a4264054
......@@ -543,6 +543,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml
View file @ a4264054
......@@ -553,6 +553,9 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Manage Selenium test cases</name>
</permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
View file @ a4264054
......@@ -24,6 +24,12 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_aliases</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_view/my_source_decision_title.xml
View file @ a4264054
......@@ -281,9 +281,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewIncomingLineList/listbox.xml
View file @ a4264054
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>account_incident_incoming_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineList/listbox.xml
View file @ a4264054
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>account_incident_outgoing_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncident_view/my_responsible_title.xml
View file @ a4264054
......@@ -281,9 +281,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncident_view/my_source.xml
View file @ a4264054
......@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(),vault_type=(\'site/surface/banque_interne\', \'site/surface/gros_paiement\', \'site/surface/gros_versement\', \'site/surface/operations_diverses\'), leaf_node=1, all=1)</string> </value>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(),vault_type=(\'site\'), leaf_node=0, all=1)</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncident_view/my_source_decision_title.xml
View file @ a4264054
......@@ -142,6 +142,14 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>allow_creation</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>allow_jump</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
......@@ -154,13 +162,23 @@
<key> <string>catalog_index</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>container_getter_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_module</string> </key>
......@@ -194,18 +212,46 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>jump_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>parameter_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string></string> </value>
......@@ -218,6 +264,14 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -281,9 +335,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......@@ -416,4 +468,23 @@
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getSourceDecisionTitle()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_view/my_responsible_title.xml
View file @ a4264054
......@@ -281,9 +281,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_view/my_source_decision_title.xml
View file @ a4264054
......@@ -281,9 +281,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencySale_viewIncomingLineList.xml
View file @ a4264054
......@@ -98,6 +98,7 @@
<value>
<list>
<string>listbox_total_price</string>
<string>listbox_quantity</string>
</list>
</value>
</item>
......@@ -105,7 +106,6 @@
<key> <string>left</string> </key>
<value>
<list>
<string>listbox_quantity</string>
<string>my_total_price</string>
</list>
</value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencySale_viewOutgoingLineList.xml
View file @ a4264054
......@@ -96,16 +96,17 @@
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
<list>
<string>listbox_quantity</string>
<string>listbox_total_price</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>listbox_quantity</string>
<string>my_total_price</string>
<string>listbox_total_price</string>
</list>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencyPurchase_init.xml
View file @ a4264054
......@@ -79,7 +79,6 @@ transaction = context\n
\n
movement = transaction.newContent(portal_type=\'Banking Operation Line\',\n
id=\'movement\',\n
immediate_reindex=1,\n
source=\'account_module/bank_account\', # Set default source\n
destination=\'account_module/bank_account\', # Set default destination\n
)\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencyPurchase_view/my_destination_payment_reference.xml
View file @ a4264054
......@@ -365,9 +365,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySale_view/my_destination_payment_reference.xml
View file @ a4264054
......@@ -359,9 +359,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ForeignCashReception_view/my_destination.xml
View file @ a4264054
......@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/caveau/devises\'), leaf_node=1,user_site=1)</string> </value>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/caveau/auxiliaire/encaisse_des_devises\'), leaf_node=1,user_site=1)</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml
View file @ a4264054
......@@ -78,7 +78,6 @@ transaction.setResource(\'currency_module/\' + context.Baobab_getPortalReference
\n
movement = context.newContent(portal_type=\'Banking Operation Line\',\n
id=\'movement\',\n
immediate_reindex=1,\n
source=\'account_module/bank_account\', # Set default source\n
destination=\'account_module/bank_account\', # Set default destination\n
)\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml
View file @ a4264054
......@@ -78,6 +78,7 @@ if listbox is None:\n
reference_date = DateTime()\n
container_list = []\n
listbox = []\n
#context.log("tracking list", context.portal_simulation.getCurrentTrackingList(at_date= reference_date, node = node))\n
for o in context.portal_simulation.getCurrentTrackingList(at_date= reference_date, node = node):\n
if o.getObject().getParentValue().getPortalType() in container_portal_type_list:\n
cash_container = o.getObject()\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml
View file @ a4264054
......@@ -169,7 +169,9 @@ def split_head(CD_file_line_list):\n
head_resource_string = CD_file_line_list[11][32:56]\n
head_emission_letter = CD_file_line_list[14][25:26]\n
context.log(\'head_resource_string\',head_resource_string)\n
\n
context.log(\'head_start_date_string\',head_start_date_string)\n
context.log(\'head_movement_id\',head_movement_id)\n
\n
# find letter in the emission_letter category\n
default_emissionLetter_list = [x[1] for x in context.portal_categories.emission_letter.getCategoryChildTitleItemList()[1:]]\n
head_emission_letter = string.lower(head_emission_letter)\n
......@@ -325,10 +327,14 @@ def url_redirection(error_message,delivery_id=None):\n
\n
\n
request = context.REQUEST\n
CD_file_line_list = import_file.readlines()\n
if file_data is not None:\n
CD_file_line_list = file_data\n
else:\n
CD_file_line_list = import_file.readlines()\n
\n
# analyse the container head and split it into dictionnary\n
context.log("new_line_list", CD_file_line_list)\n
\n
# analyse the container head and split it into dictionnary\n
split_head_result_dict = split_head(CD_file_line_list[:20])\n
if split_head_result_dict[\'error\']:\n
return url_redirection(split_head_result_dict[\'message\'])\n
......@@ -382,7 +388,7 @@ return url_redirection(message_dict[\'message\' ],delivery_id=message_dict[\'del
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>import_file, **kw</string> </value>
<value> <string>import_file=None, file_data=None, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -410,13 +416,14 @@ return url_redirection(message_dict[\'message\' ],delivery_id=message_dict[\'del
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
<value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>import_file</string>
<string>file_data</string>
<string>kw</string>
<string>message_dict</string>
<string>isSameSet</string>
......@@ -443,7 +450,10 @@ return url_redirection(message_dict[\'message\' ],delivery_id=message_dict[\'del
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
<none/>
</tuple>
</value>
</item>
<item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDForm.xml
View file @ a4264054
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>bottom</string>
<string>left</string>
<string>hidden</string>
</list>
</value>
......@@ -77,17 +77,17 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox</string>
</list>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>left</string> </key>
<value>
<list/>
<list>
<string>my_import_file</string>
</list>
</value>
</item>
</dictionary>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_init.xml
View file @ a4264054
......@@ -78,7 +78,6 @@ transaction.setResource(\'currency_module/\' + context.Baobab_getPortalReference
\n
movement = context.newContent(portal_type=\'Banking Operation Line\',\n
id=\'movement\',\n
immediate_reindex=1,\n
source=\'account_module/bank_account\', # Set default source\n
destination=\'account_module/bank_account\', # Set default destination\n
)\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_view/my_destination_payment_reference.xml
View file @ a4264054
......@@ -293,9 +293,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_viewAccounting/my_destination_payment_reference.xml
View file @ a4264054
......@@ -287,9 +287,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_view/my_source_decision_title.xml
View file @ a4264054
......@@ -287,9 +287,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_module</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingClassificationSurveyCell_getBaobabDestination.xml
View file @ a4264054
......@@ -71,7 +71,7 @@
<value> <string>if context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n
return \'%s/auxiliaire/encaisse_des_billets_ventiles_et_detruits\' %(\'/\'.join(context.getSource().split(\'/\')[:-2]),)\n
else:\n
return \'%s/externes/encaisse_des_externes\' %(\'/\'.join(context.getSource().split(\'/\')[:-2]),)\n
return \'%s/auxiliaire/encaisse_des_externes\' %(\'/\'.join(context.getSource().split(\'/\')[:-2]),)\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncidentModule_viewUsualCashIncidentList/listbox_deficit_price.xml
View file @ a4264054
......@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Cash Incident Line\')</string> </value>
<value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Usual Cash Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncidentModule_viewUsualCashIncidentList/listbox_excess_price.xml
View file @ a4264054
......@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Cash Incident Line\')</string> </value>
<value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Usual Cash Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view.xml
View file @ a4264054
......@@ -105,6 +105,7 @@
<list>
<string>my_source_reference</string>
<string>my_incident_type</string>
<string>my_source_transport</string>
<string>my_source_total_asset_price</string>
</list>
</value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_description.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_description</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_incident_type.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_incident_type</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_source_reference.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_reference</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_source_total_asset_price.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_total_asset_price</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_source_transport.xml 0 → 100644
View file @ a4264054
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
<string>ListField</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_transport</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>unknown_selection</string> </key>
<value> <string>You selected an item that was not in the list.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Remote Site</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Delivery_getVaultItemList(user_site=0,vault_type=(\'site\',),strict_membership=1,leaf_node=0,with_base=0)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_start_date.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_start_date</string> </value>
......@@ -408,9 +414,9 @@
<key> <string>date</string> </key>
<value>
<list>
<string>year</string>
<string>month</string>
<string>day</string>
<string>year</string>
<string>month</string>
<string>day</string>
</list>
</value>
</item>
......@@ -418,9 +424,9 @@
<key> <string>time</string> </key>
<value>
<list>
<string>hour</string>
<string>minute</string>
<string>ampm</string>
<string>hour</string>
<string>minute</string>
<string>ampm</string>
</list>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_view/my_translated_simulation_state_title.xml
View file @ a4264054
......@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_translated_simulation_state_title</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_viewIncomingLineList/listbox.xml
View file @ a4264054
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>usual_cash_incident_incoming_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashIncident_viewOutgoingLineList/listbox.xml
View file @ a4264054
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>usual_cash_incident_outgoing_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml
View file @ a4264054
......@@ -68,14 +68,16 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># check that we don\'t have both incoming and outgoing line on the document\n
<value> <string encoding="cdata"><![CDATA[
# check that we don\'t have both incoming and outgoing line on the document\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
txn = state_change[\'object\']\n
in_list = txn.objectValues(portal_type=\'Incoming Account Incident Line\')\n
out_list = txn.objectValues(portal_type=\'Outgoing Account Incident Line\')\n
\n
vault = "%s/surface/salle_tri/encaisse_des_differences" %(txn.getSource(),)\n
price = txn.getSourceTotalAssetPrice()\n
in_price = txn.getTotalPrice(portal_type=[\'Incoming Account Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
out_price = txn.getTotalPrice(portal_type=[\'Outgoing Account Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
......@@ -86,10 +88,17 @@ if len(in_list) != 0 and len(out_list) != 0:\n
elif len(in_list) == 0 and len(out_list) == 0:\n
msg = Message(domain = "ui", message="No resource.")\n
raise ValidationFailed, (msg,)\n
elif len(out_list) !=0:\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Account Incident Line\')\n
if resource <> 0 :\n
msg = Message(domain="ui", message="Insufficient Balance.")\n
raise ValidationFailed, (msg,)\n
elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != price):\n
msg = Message(domain = "ui", message="Price differs between document and resource.")\n
raise ValidationFailed, (msg,)\n
</string> </value>
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
......@@ -147,11 +156,14 @@ elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != p
<string>_getattr_</string>
<string>in_list</string>
<string>out_list</string>
<string>vault</string>
<string>price</string>
<string>in_price</string>
<string>out_price</string>
<string>len</string>
<string>msg</string>
<string>transaction</string>
<string>resource</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive_action.xml
View file @ a4264054
......@@ -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/cash_sorting_incident_workflow/states/confirmed.xml
View file @ a4264054
......@@ -41,6 +41,7 @@
<value>
<tuple>
<string>archive</string>
<string>post_dialog_action</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/transitions/post_dialog_action.xml 0 → 100644
View file @ a4264054
<?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>Post</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/CashSortingIncident_viewPostDialog</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>post_dialog_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></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_purchase_workflow/scripts/validateVaultBalance.xml
View file @ a4264054
......@@ -104,9 +104,7 @@ if base_price is None or base_price <= 0:\n
fix_montant = transaction.getDiscount()\n
pourcentage = transaction.getDiscountRatio()\n
\n
if (fix_montant is None or fix_montant < 0) and (pourcentage is None or fix_montant < 0):\n
msg = Message(domain="ui", message="You have to specify discount or discount ratio.")\n
raise ValidationFailed, (msg,)\n
\n
\n
\n
resource_two = transaction.CashDelivery_checkCounterInventory(outgoing_source,portal_type=\'Outgoing Cash To Currency Purchase Line\')\n
......@@ -128,7 +126,8 @@ elif billetage_sorti != quantity :\n
msg = Message(domain="ui", message="Return amount is different from output cash")\n
raise ValidationFailed, (msg,) \n
elif resource_two!= 0 :\n
raise ValidationFailed, \'Insufficient balance\'\n
msg = Message(domain="ui", message="Insufficient balance")\n
raise ValidationFailed, (msg,)\n
]]></string> </value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/scripts/validateVaultBalance.xml
View file @ a4264054
......@@ -118,7 +118,8 @@ elif billetage_entre != quantity :\n
msg = Message(domain="ui", message="Return amount is different from output cash")\n
raise ValidationFailed, (msg,) \n
elif resource_one != 0 :\n
raise ValidationFailed, \'Insufficient balance\'\n
msg = Message(domain="ui", message="Insufficient balance")\n
raise ValidationFailed, (msg,)\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/cancelled.xml
View file @ a4264054
......@@ -72,8 +72,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -100,8 +98,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml
View file @ a4264054
......@@ -78,7 +78,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -105,7 +104,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/draft.xml
View file @ a4264054
......@@ -77,8 +77,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -89,7 +87,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -100,7 +97,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -111,8 +107,6 @@
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateCounter.xml
View file @ a4264054
......@@ -76,6 +76,16 @@ date = transaction.getStartDate()\n
destination= transaction.getDestination(None)\n
transaction.log(\'destination:\',destination)\n
\n
amount = transaction.getSourceTotalAssetPrice()\n
if amount is None:\n
msg = Message(domain="ui", message="Sorry, you have to define a quantity.")\n
raise ValidationFailed, (msg,)\n
\n
destination_payment = transaction.getDestinationPayment()\n
if destination_payment is None:\n
msg = Message(domain="ui", message="Sorry, you have to define an account.")\n
raise ValidationFailed, (msg,)\n
\n
var_state = transaction.getSimulationState()\n
if var_state == \'confirmed\': \n
# Get price and total_price.\n
......@@ -177,10 +187,11 @@ if len(counter_list) == 0:\n
<string>date</string>
<string>None</string>
<string>destination</string>
<string>var_state</string>
<string>amount</string>
<string>total_price</string>
<string>msg</string>
<string>destination_payment</string>
<string>var_state</string>
<string>total_price</string>
<string>site</string>
<string>append</string>
<string>$append0</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/draft.xml
View file @ a4264054
......@@ -94,6 +94,7 @@
<value>
<tuple>
<string>Assignor</string>
<string>Author</string>
<string>Manager</string>
</tuple>
</value>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml
View file @ a4264054
......@@ -68,23 +68,38 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># check that we don\'t have both incoming and outgoing line on the document\n
<value> <string encoding="cdata"><![CDATA[
# check that we don\'t have both incoming and outgoing line on the document\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change.object\n
txn = state_change[\'object\']\n
in_list = txn.objectValues(portal_type=\'Incoming Usual Cash Incident Line\')\n
out_list = txn.objectValues(portal_type=\'Outgoing Usual Cash Incident Line\')\n
\n
vault = "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(transaction.getSource(),)\n
date = transaction.getStartDate()\n
var_type =txn.getIncidentType()\n
var_source_transport =txn.getSourceTransport()\n
var_source = transaction.getSource()\n
\n
# check we are in an opened accounting day\n
if not transaction.Baobab_checkCounterDateOpen(site=var_source, date=date):\n
msg = Message(domain = "ui", message="Counter Date is not opened")\n
raise ValidationFailed, (msg,)\n
\n
if (var_type == \'reception\' and var_source_transport is None):\n
msg = Message(domain = "ui", message="Remote Site not null.")\n
raise ValidationFailed, (msg,)\n
\n
if (var_type == \'reception\' and var_source_transport is not None):\n
if var_source.find(var_source_transport)>=0:\n
msg = Message(domain = "ui", message="Cannot choose local site.")\n
raise ValidationFailed, (msg,)\n
\n
price = txn.getSourceTotalAssetPrice()\n
in_price = txn.getTotalPrice(portal_type=[\'Incoming Usual Cash Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
out_price = txn.getTotalPrice(portal_type=[\'Outgoing Usual Cash Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
in_price = txn.getTotalPrice(deliveryLineType=\'Incoming Usual Cash Incident Line\')\n
out_price = txn.getTotalPrice(deliveryLineType=\'Outgoing Usual Cash Incident Line\')\n
\n
if len(in_list) != 0 and len(out_list) != 0:\n
msg = Message(domain = "ui", message="You can\'t have excess and deficit on the document.")\n
......@@ -92,10 +107,19 @@ if len(in_list) != 0 and len(out_list) != 0:\n
elif len(in_list) == 0 and len(out_list) == 0:\n
msg = Message(domain = "ui", message="No resource.")\n
raise ValidationFailed, (msg,)\n
\n
elif len(out_list) !=0:\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Usual Cash Incident Line\')\n
if resource <> 0 :\n
msg = Message(domain="ui", message="Insufficient Balance.")\n
raise ValidationFailed, (msg,)\n
\n
elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != price):\n
msg = Message(domain = "ui", message="Price differs between document and resource.")\n
raise ValidationFailed, (msg,)\n
</string> </value>
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
......@@ -148,19 +172,24 @@ elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != p
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>_getattr_</string>
<string>transaction</string>
<string>_getitem_</string>
<string>txn</string>
<string>_getattr_</string>
<string>in_list</string>
<string>out_list</string>
<string>vault</string>
<string>date</string>
<string>var_type</string>
<string>var_source_transport</string>
<string>None</string>
<string>var_source</string>
<string>msg</string>
<string>None</string>
<string>price</string>
<string>in_price</string>
<string>out_price</string>
<string>len</string>
<string>resource</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/states/cancelled.xml 0 → 100644
View file @ a4264054
<?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>id</string> </key>
<value> <string>cancelled</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/states/confirmed.xml
View file @ a4264054
......@@ -40,6 +40,8 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>deliver</string>
<string>deliver_action</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/states/draft.xml
View file @ a4264054
......@@ -40,6 +40,8 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>confirm</string>
<string>confirm_action</string>
</tuple>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/transitions/cancel.xml 0 → 100644
View file @ a4264054
<?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>cancel</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>cancelled</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Cancel</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 : Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/transitions/cancel_action.xml 0 → 100644
View file @ a4264054
<?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>Cancel</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>cancel</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>cancel_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>Cancel</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>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/bt/revision
View file @ a4264054
54
\ No newline at end of file
85
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7