Skip to content

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

fixed the duplicate applied rule problem 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4591 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b8d4fd86
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 34 deletions
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
View file @ b6cc0b85
......@@ -70,7 +70,8 @@
\n
previous_tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
expand_tag = order.getPath() + \'_expand\'\n
order.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(tag=expand_tag,rule_id = \'default_order_rule\')\n
activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
order.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
\n
\n
order_portal_type = order.getPortalType()\n
......@@ -84,27 +85,28 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
</item>
<item>
<key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAcAAAAOAAAAQwAA
AHMRAQAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAZAMAF30DAHQAAHwCAGQCAIMCAIMA
AGQEABd9BAB0AAB0AAB8AgBkBQCDAgBkBgB8BABkBwB8AwCDAAJkCACDAgBkBgB8BABkCQBkCgCD
AAIBdAAAfAIAZAsAgwIAgwAAfQUAfAUAZAwAagIAbxwAAXQAAHQAAHwCAGQNAIMCAGQOAIMCAH0G
AG4qAAF8BQBkDwBqAgBvHAABdAAAdAAAfAIAZA0AgwIAZBAAgwIAfQYAbgEAAXQAAHQAAHwGAGQF
AIMCAGQRAGQSAGQHAHwEAIMAAmQTAIMCAGQUAHQAAHwCAGQVAIMCAIMAAIMAAQFkAABTKBYAAABO
cwYAAABvYmplY3RzBwAAAGdldFBhdGhzFwAAAF9maXJzdFVwZGF0ZUFwcGxpZWRSdWxlcwcAAABf
ZXhwYW5kcwgAAABhY3RpdmF0ZXMDAAAAdGFncwkAAABhZnRlcl90YWdzEQAAAHVwZGF0ZUFwcGxp
ZWRSdWxlcwcAAABydWxlX2lkcxIAAABkZWZhdWx0X29yZGVyX3J1bGVzDQAAAGdldFBvcnRhbFR5
cGVzCgAAAFNhbGUgT3JkZXJzEQAAAHBvcnRhbF9kZWxpdmVyaWVzcxkAAABzYWxlX3BhY2tpbmdf
bGlzdF9idWlsZGVycw4AAABQdXJjaGFzZSBPcmRlcnMdAAAAcHVyY2hhc2VfcGFja2luZ19saXN0
X2J1aWxkZXJzCAAAAGFjdGl2aXR5cwgAAABTUUxRdWV1ZXMFAAAAYnVpbGRzDwAAAGV4cGxhbmF0
aW9uX3VpZHMGAAAAZ2V0VWlkKAcAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwUA
AABvcmRlcnMMAAAAcHJldmlvdXNfdGFncwoAAABleHBhbmRfdGFncxEAAABvcmRlcl9wb3J0YWxf
dHlwZXMQAAAAZGVsaXZlcnlfYnVpbGRlcigHAAAAcwwAAABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRh
dHRyX3MFAAAAb3JkZXJzDAAAAHByZXZpb3VzX3RhZ3MKAAAAZXhwYW5kX3RhZ3MRAAAAb3JkZXJf
cG9ydGFsX3R5cGVzEAAAAGRlbGl2ZXJ5X2J1aWxkZXIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5
dGhvbilzFgAAAE9yZGVyX2J1aWxkUGFja2luZ0xpc3QBAAAAcxIAAAAPAhYBHAEuAxIBDQEcAQ0B
IgIoAQAAAHMWAAAAT3JkZXJfYnVpbGRQYWNraW5nTGlzdCgBAAAAcxYAAABPcmRlcl9idWlsZFBh
Y2tpbmdMaXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABz
AAAAAA==</string> </value>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAgAAAAOAAAAQwAA
AHMpAQAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAZAMAF30DAHQAAHwCAGQCAIMCAIMA
AGQEABd9BABoAAAEZAUAfAQAAzwEZAYAZAcAAzx9BQB0AAB0AAB8AgBkCACDAgBkBQB8BABkCQB8
AwCDAAJkCgCDAgBkCwBkDABkDQB8BQCDAAIBdAAAfAIAZA4AgwIAgwAAfQYAfAYAZA8AagIAbxwA
AXQAAHQAAHwCAGQQAIMCAGQRAIMCAH0HAG4qAAF8BgBkEgBqAgBvHAABdAAAdAAAfAIAZBAAgwIA
ZBMAgwIAfQcAbgEAAXQAAHQAAHwHAGQIAIMCAGQUAGQVAGQJAHwEAIMAAmQWAIMCAGQXAHQAAHwC
AGQYAIMCAIMAAIMAAQFkAABTKBkAAABOcwYAAABvYmplY3RzBwAAAGdldFBhdGhzFwAAAF9maXJz
dFVwZGF0ZUFwcGxpZWRSdWxlcwcAAABfZXhwYW5kcwMAAAB0YWdzCAAAAHByaW9yaXR5aQMAAABz
CAAAAGFjdGl2YXRlcwkAAABhZnRlcl90YWdzEQAAAHVwZGF0ZUFwcGxpZWRSdWxlcwcAAABydWxl
X2lkcxIAAABkZWZhdWx0X29yZGVyX3J1bGVzCwAAAGFjdGl2YXRlX2t3cw0AAABnZXRQb3J0YWxU
eXBlcwoAAABTYWxlIE9yZGVycxEAAABwb3J0YWxfZGVsaXZlcmllc3MZAAAAc2FsZV9wYWNraW5n
X2xpc3RfYnVpbGRlcnMOAAAAUHVyY2hhc2UgT3JkZXJzHQAAAHB1cmNoYXNlX3BhY2tpbmdfbGlz
dF9idWlsZGVycwgAAABhY3Rpdml0eXMIAAAAU1FMUXVldWVzBQAAAGJ1aWxkcw8AAABleHBsYW5h
dGlvbl91aWRzBgAAAGdldFVpZCgIAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMF
AAAAb3JkZXJzDAAAAHByZXZpb3VzX3RhZ3MKAAAAZXhwYW5kX3RhZ3MLAAAAYWN0aXZhdGVfa3dz
EQAAAG9yZGVyX3BvcnRhbF90eXBlcxAAAABkZWxpdmVyeV9idWlsZGVyKAgAAABzDAAAAHN0YXRl
X2NoYW5nZXMJAAAAX2dldGF0dHJfcwUAAABvcmRlcnMMAAAAcHJldmlvdXNfdGFncwoAAABleHBh
bmRfdGFncwsAAABhY3RpdmF0ZV9rd3MRAAAAb3JkZXJfcG9ydGFsX3R5cGVzEAAAAGRlbGl2ZXJ5
X2J1aWxkZXIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzFgAAAE9yZGVyX2J1aWxkUGFj
a2luZ0xpc3QBAAAAcxQAAAAPAhYBFgEeAS4DEgENARwBDQEiAigBAAAAcxYAAABPcmRlcl9idWls
ZFBhY2tpbmdMaXN0KAEAAABzFgAAAE9yZGVyX2J1aWxkUGFja2luZ0xpc3QoAAAAACgAAAAAcw8A
AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
</item>
<item>
<key> <string>_dav_writelocks</string> </key>
......@@ -149,6 +151,7 @@ AAAAAA==</string> </value>
<string>order</string>
<string>previous_tag</string>
<string>expand_tag</string>
<string>activate_kw</string>
<string>order_portal_type</string>
<string>delivery_builder</string>
</tuple>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
View file @ b6cc0b85
......@@ -69,22 +69,24 @@
<value> <string>order = state_change.object\n
\n
tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
order.activate(tag=tag).updateAppliedRule(tag=tag,rule_id = \'default_order_rule\')\n
activate_kw = {\'tag\':tag,\'priority\':3}\n
order.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAGAAAASwAA
AHNXAAAAdAAAfAAAZAEAgwIAfQMAdAAAfAMAZAIAgwIAgwAAZAMAF30EAHQAAHQAAHwDAGQEAIMC
AGQFAHwEAIMAAWQGAIMCAGQFAHwEAGQHAGQIAIMAAgFkAABTKAkAAABOcwYAAABvYmplY3RzBwAA
AGdldFBhdGhzFwAAAF9maXJzdFVwZGF0ZUFwcGxpZWRSdWxlcwgAAABhY3RpdmF0ZXMDAAAAdGFn
cxEAAAB1cGRhdGVBcHBsaWVkUnVsZXMHAAAAcnVsZV9pZHMSAAAAZGVmYXVsdF9vcmRlcl9ydWxl
KAQAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwUAAABvcmRlcnMDAAAAdGFnKAUA
AABzDAAAAHN0YXRlX2NoYW5nZXMCAAAAa3dzCQAAAF9nZXRhdHRyX3MFAAAAb3JkZXJzAwAAAHRh
ZygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMVAAAAT3JkZXJfY3JlYXRlT3JkZXJSdWxl
AQAAAHMEAAAADwIcASgBAAAAcxUAAABPcmRlcl9jcmVhdGVPcmRlclJ1bGUoAQAAAHMVAAAAT3Jk
ZXJfY3JlYXRlT3JkZXJSdWxlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k
dWxlPgEAAABzAAAAAA==</string> </value>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAYAAAAGAAAASwAA
AHNvAAAAdAAAfAAAZAEAgwIAfQMAdAAAfAMAZAIAgwIAgwAAZAMAF30EAGgAAARkBAB8BAADPARk
BQBkBgADPH0FAHQAAHQAAHwDAGQHAIMCAGQEAHwEAIMAAWQIAIMCAGQJAGQKAGQLAHwFAIMAAgFk
AABTKAwAAABOcwYAAABvYmplY3RzBwAAAGdldFBhdGhzFwAAAF9maXJzdFVwZGF0ZUFwcGxpZWRS
dWxlcwMAAAB0YWdzCAAAAHByaW9yaXR5aQMAAABzCAAAAGFjdGl2YXRlcxEAAAB1cGRhdGVBcHBs
aWVkUnVsZXMHAAAAcnVsZV9pZHMSAAAAZGVmYXVsdF9vcmRlcl9ydWxlcwsAAABhY3RpdmF0ZV9r
dygFAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMFAAAAb3JkZXJzAwAAAHRhZ3ML
AAAAYWN0aXZhdGVfa3coBgAAAHMMAAAAc3RhdGVfY2hhbmdlcwIAAABrd3MJAAAAX2dldGF0dHJf
cwUAAABvcmRlcnMDAAAAdGFncwsAAABhY3RpdmF0ZV9rdygAAAAAKAAAAABzDwAAAFNjcmlwdCAo
UHl0aG9uKXMVAAAAT3JkZXJfY3JlYXRlT3JkZXJSdWxlAQAAAHMGAAAADwIWAR4BKAEAAABzFQAA
AE9yZGVyX2NyZWF0ZU9yZGVyUnVsZSgBAAAAcxUAAABPcmRlcl9jcmVhdGVPcmRlclJ1bGUoAAAA
ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
</item>
<item>
<key> <string>_filepath</string> </key>
......@@ -123,6 +125,7 @@ dWxlPgEAAABzAAAAAA==</string> </value>
<string>_getattr_</string>
<string>order</string>
<string>tag</string>
<string>activate_kw</string>
</tuple>
</value>
</item>
......
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