Commit 645b01e4 authored by Aurel's avatar Aurel

workflow state/transition title change

fix wf for dematerialization

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15799 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b9942982
master allow_login_change allow_login_change_differentiate_id_and_login allow_login_change_wip arnau arnau-kns arnau-kns-without-property-mapping arnau-merge arnau-poc auto_extend_select_list autoflake backup_erp5_workflow bk_erp5ish_actions_tool bk_sqlcatalog boc-interaction-drop bt5_config cache catalog_fulltext catalog_fulltext_old cedric cedriclen cedriclen-eos certificate_authority cherry-pick-4a8e045d cleanJSByJSLint clean_up_upgrader cleanup_acquisition_base_category compact_title_no_reference credential_update_action datetimefield deferred_listbox delivery_item_barcode douglas_forum dream_distributor drop-legacy-simulation dsn-phase3 eos-dev erp5-component erp5-data-notebook erp5-forum erp5-preference erp5-release erp5-slapos-upgrade erp5-util-testing erp5-vifib erp5-vifib-cleanup erp5_calendar erp5_catalog erp5_catalog_final erp5_free_subscription erp5_workflow erp5testnode_max_timeout experiment/coding_style_test_suite feat/accounting_balance_sheet_profit_and_loss_cleanups feat/accounting_stop_using_getObject feat/accounting_translate_gap feat/no_useless_records_in_predicate_table feat/olapy feat/test_inventory_api_domain_selection feat/trade_shipment_report feat/wendelin-py-data feature/renderjs-matrixbox feature/renderjs-ui-no-header fix/full_text_script_conflict fix/login_validate_check_consistency fix/repair_graph_editor fix/xvfb_all_displays_locked fix_system_processes_ownership for_testrunner_1 for_testrunner_2 for_testrunner_3 gabriel gabriel-fix-rounding-in-accounting-generation gabriel-fix-rounding-in-accounting-generation2 gadget-json-value http_cache_fix improve_default_caching_policy_manager initsite interaction-drop isDeletable item_tracking_graph_editor ivan jerome-bt-reference-doc jerome-test jerome_events jerome_graph_editor_renderjs jerome_new_style_solve_divergence jerome_promise_in_tests jerome_user_preference_time_zone jio jm/form-action-guard joblib-activity kns kns-kr lazy_simulation_causality lignan lingnan listbox-generator mame mame-bt5-cleanup mame-erp5_project-cleanup mame-naming-convention mame-naming-convention-list_method mame-test-stock-indexation mame-work mame2 maste_copy master-erp5-test-result-scalability master-erp5-test-result-scalability-rebase master-test-fix-additionalbt5path master_calendar_wip_patches master_calendar_wip_patches_extend_security master_no_guard_on_workflow_transition master_no_guard_on_workflow_transition_plus_calendar_wip_patchs merge_xhtml_jquery mmariani-inventory monitoring monitoring-graph mrp new-render-presentation nexedi-erp5-jp no_longer_simulated_state officejs officejs_clean officejs_zip pere portal_callables portal_solver_process_security_configuration presentation rebased_mrp refactor/base_edit refactor/renderjs reindex_calendar_after_change_calendar_exception reverse_logistics rewrite_test_21_AcquiredPortalType romain-fulltext scalability-master2 scalability-master2-rebase scalability-rebase scalability-roque scalability-roque-2 shop-box simulation sms_more_than_140_characters strict_catalog sws_fix syncml taskdistribution-xmlrpc-binary test_page testnode_software_link timezones tmp/getInstalledBusinessTemplate_never_installed_bt tristan tristan-merge tristan-performance ttrm upgradeSite view-aggregated-amounts vivekpab_erp5webrenderjs_layoutconfig vivekpab_jabberclient vivekpab_renderjs_interfaces wenjie wenjie_branch yryr yryr-components-cp yryr-inventory-cache yryr-test yryr-with-components yusei erp5.util-0.4.49 erp5.util-0.4.46 erp5.util-0.4.44 erp5.util-0.4.43 erp5.util-0.4.41 erp5.util-0.4.40 erp5.util-0.4.37 erp5.util-0.4.1 erp5.util-0.4 erp5.util-0.3 erp5.util-0.2 erp5.util-0.1
No related merge requests found
......@@ -61,7 +61,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Terminate the operation</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......@@ -73,11 +73,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>
......
......@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......@@ -73,11 +73,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>
......
......@@ -37,7 +37,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Terminate the operation</string> </value>
<value> <string>Delivered</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
......
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</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>
......
......@@ -21,7 +21,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</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>
......
......@@ -71,9 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change[\'object\']\n
\n
transaction.log("transaction", "validateVaultBalance")\n
vault = transaction.getSource()\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Monetary Destruction Line\')\n
\n
source_object = context.portal_categories.getCategoryValue(vault)\n
\n
......@@ -94,23 +93,11 @@ if \'encaisse_des_externes\' in vault:\n
\n
\n
\n
# Get price and total_price.\n
amount = transaction.getSourceTotalAssetPrice()\n
total_price = transaction.getTotalPrice(portal_type=[\'Monetary Destruction Line\',\'Monetary Destruction Cell\'],fast=0)\n
\n
if resource == 2:\n
msg = Message(domain="ui", message="No Resource.")\n
raise ValidationFailed, (msg,)\n
elif amount != total_price:\n
msg = Message(domain="ui", message="Amount differ from total price.")\n
raise ValidationFailed, (msg,)\n
elif resource <> 0 :\n
msg = Message(domain="ui", message="Insufficient Balance.")\n
raise ValidationFailed, (msg,)\n
\n
# In case of dematerialization, we must have only coins\n
transaction.log("isDematerialization", transaction.isDematerialization())\n
if transaction.isDematerialization():\n
for line in transaction.objectValues(portal_type=\'Cash Delivery Line\'):\n
for line in transaction.objectValues(portal_type=\'Monetary Destruction Line\'):\n
transaction.log("line", line.getResourceValue().getPortalType())\n
if line.getResourceValue().getPortalType() != \'Coin\':\n
msg = Message(domain="ui", message="Sorry, dematerialization is possible only with coins.")\n
raise ValidationFailed, (msg,)\n
......@@ -122,6 +109,22 @@ if transaction.isDematerialization():\n
if not \'encaisse_des_billets_retires_de_la_circulation\' in vault:\n
msg = Message(domain="ui", message="Invalid source.")\n
raise ValidationFailed, (msg,)\n
\n
\n
# Get price and total_price.\n
amount = transaction.getSourceTotalAssetPrice()\n
total_price = transaction.getTotalPrice(portal_type=[\'Monetary Destruction Line\',\'Monetary Destruction Cell\'],fast=0)\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Monetary Destruction Line\')\n
\n
if resource == 2:\n
msg = Message(domain="ui", message="No Resource.")\n
raise ValidationFailed, (msg,)\n
elif amount != total_price:\n
msg = Message(domain="ui", message="Amount differ from total price.")\n
raise ValidationFailed, (msg,)\n
elif resource <> 0 :\n
msg = Message(domain="ui", message="Insufficient Balance.")\n
raise ValidationFailed, (msg,)\n
]]></string> </value>
......@@ -177,16 +180,16 @@ if transaction.isDematerialization():\n
<string>transaction</string>
<string>_getattr_</string>
<string>vault</string>
<string>resource</string>
<string>context</string>
<string>source_object</string>
<string>msg</string>
<string>source_section</string>
<string>None</string>
<string>amount</string>
<string>total_price</string>
<string>_getiter_</string>
<string>line</string>
<string>amount</string>
<string>total_price</string>
<string>resource</string>
</tuple>
</value>
</item>
......
......@@ -108,7 +108,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: \'externe\' in here.getSource() or here.isDematerialization()</string> </value>
<value> <string>python: \'externe\' in here.getSource() or not here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -108,7 +108,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: \'externe\' not in here.getSource() and not here.isDematerialization()</string> </value>
<value> <string>python: \'externe\' not in here.getSource() and here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -61,7 +61,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......
......@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Delivered</string> </value>
<value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......
476
\ No newline at end of file
479
\ 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