Commit b84a65dd authored by Sebastien Robin's avatar Sebastien Robin

- there was several scripts for check items, I merged all of them

- some fixes on counter cheks

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15281 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 673caf7d
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/CheckbookDelivery_viewCheckbookInputDialog</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?your_fast_input_type=checkbook_delivery</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -88,11 +85,8 @@ ...@@ -88,11 +85,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/CheckbookMovement_viewCheckbookInputDialog</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?your_fast_input_type=checkbook_movement</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -88,11 +85,8 @@ ...@@ -88,11 +85,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -71,11 +71,8 @@ ...@@ -71,11 +71,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -90,18 +87,15 @@ ...@@ -90,18 +87,15 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python:object.getSimulationState() == \'draft\' </string> </value> <value> <string>python:object.getSimulationState() == \'empty\' </string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -109,11 +103,8 @@ ...@@ -109,11 +103,8 @@
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/CheckbookUsualCashTransfer_viewCheckbookInputDialog</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?your_fast_input_type=checkbook_usual_cash_transfer</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -88,11 +85,8 @@ ...@@ -88,11 +85,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/CheckbookDelivery_fastInputForm</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?your_fast_input_type=checkbook_vault_transfer</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/TravelerCheckPurchase_viewCheckbookInputDialog</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?fast_input_type=your_traveler_check_purchase</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -88,11 +85,8 @@ ...@@ -88,11 +85,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/TravelerCheckSale_viewCheckbookInputDialog</string> </value> <value> <string>string:${object_url}/CheckbookDelivery_fastInputForm?your_fast_input_type=traveler_check_sale</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -88,11 +85,8 @@ ...@@ -88,11 +85,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Expression" module="Products.CMFCore.Expression"/>
<string>Products.CMFCore.Expression</string> <tuple/>
<string>Expression</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<name>Access Transient Objects</name> <name>Access Transient Objects</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<name>Access contents information</name> <name>Access contents information</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -35,6 +37,7 @@ ...@@ -35,6 +37,7 @@
<name>Access session data</name> <name>Access session data</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Authenticated</role> <role>Authenticated</role>
...@@ -305,6 +308,7 @@ ...@@ -305,6 +308,7 @@
<permission type='tuple'> <permission type='tuple'>
<name>Add portal content</name> <name>Add portal content</name>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Author</role> <role>Author</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
...@@ -314,6 +318,7 @@ ...@@ -314,6 +318,7 @@
</permission> </permission>
<permission type='tuple'> <permission type='tuple'>
<name>Add portal folders</name> <name>Add portal folders</name>
<role>Assistant</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='tuple'> <permission type='tuple'>
...@@ -478,6 +483,7 @@ ...@@ -478,6 +483,7 @@
<permission type='tuple'> <permission type='tuple'>
<name>List folder contents</name> <name>List folder contents</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assistant</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='tuple'> <permission type='tuple'>
...@@ -644,6 +650,7 @@ ...@@ -644,6 +650,7 @@
<name>View</name> <name>View</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -656,6 +663,7 @@ ...@@ -656,6 +663,7 @@
<name>View History</name> <name>View History</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<name>Access Transient Objects</name> <name>Access Transient Objects</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<name>Access contents information</name> <name>Access contents information</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -35,6 +37,7 @@ ...@@ -35,6 +37,7 @@
<name>Access session data</name> <name>Access session data</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -313,6 +316,7 @@ ...@@ -313,6 +316,7 @@
<permission type='tuple'> <permission type='tuple'>
<name>Add portal content</name> <name>Add portal content</name>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Author</role> <role>Author</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
...@@ -323,6 +327,7 @@ ...@@ -323,6 +327,7 @@
<permission type='tuple'> <permission type='tuple'>
<name>Add portal folders</name> <name>Add portal folders</name>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Author</role> <role>Author</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
...@@ -489,6 +494,7 @@ ...@@ -489,6 +494,7 @@
<name>List folder contents</name> <name>List folder contents</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -661,6 +667,7 @@ ...@@ -661,6 +667,7 @@
<name>View</name> <name>View</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
...@@ -673,6 +680,7 @@ ...@@ -673,6 +680,7 @@
<name>View History</name> <name>View History</name>
<role>Assignee</role> <role>Assignee</role>
<role>Assignor</role> <role>Assignor</role>
<role>Assistant</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role> <role>Author</role>
......
...@@ -71,7 +71,7 @@ if vault is not None:\n ...@@ -71,7 +71,7 @@ if vault is not None:\n
if not vault.endswith(\'encaisse_des_billets_et_monnaies\'):\n if not vault.endswith(\'encaisse_des_billets_et_monnaies\'):\n
vault = "%s/%s" % (vault,\'encaisse_des_billets_et_monnaies\')\n vault = "%s/%s" % (vault,\'encaisse_des_billets_et_monnaies\')\n
\n \n
listbox_data = context.Delivery_viewCheckbookInputDialog(batch_mode=1,node=vault)\n listbox_data = context.Delivery_getCheckbookList(batch_mode=1,node=vault,at_date=at_date)\n
\n \n
result_list = []\n result_list = []\n
i=0\n i=0\n
...@@ -101,7 +101,7 @@ return result_list\n ...@@ -101,7 +101,7 @@ return result_list\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>vault=None,at_date=None,from_date=None,**kw</string> </value> <value> <string>vault=None,at_date=None,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -121,7 +121,7 @@ return result_list\n ...@@ -121,7 +121,7 @@ return result_list\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>3</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -129,7 +129,6 @@ return result_list\n ...@@ -129,7 +129,6 @@ return result_list\n
<tuple> <tuple>
<string>vault</string> <string>vault</string>
<string>at_date</string> <string>at_date</string>
<string>from_date</string>
<string>kw</string> <string>kw</string>
<string>Products.ERP5Type.Document</string> <string>Products.ERP5Type.Document</string>
<string>newTempBase</string> <string>newTempBase</string>
...@@ -142,6 +141,7 @@ return result_list\n ...@@ -142,6 +141,7 @@ return result_list\n
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>_apply_</string> <string>_apply_</string>
<string>_inplacevar_</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -156,7 +156,6 @@ return result_list\n ...@@ -156,7 +156,6 @@ return result_list\n
<tuple> <tuple>
<none/> <none/>
<none/> <none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -101,7 +101,9 @@ ...@@ -101,7 +101,9 @@
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list/> <list>
<string>your_fast_input_type</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_destination_section</string> </value> <value> <string>your_fast_input_type</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -173,7 +173,9 @@ ...@@ -173,7 +173,9 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -236,7 +238,7 @@ ...@@ -236,7 +238,7 @@
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
...@@ -248,7 +250,7 @@ ...@@ -248,7 +250,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Owner</string> </value> <value> <string>your_fast_input_type</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -271,18 +273,31 @@ ...@@ -271,18 +273,31 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string> </tuple>
</tuple> </pickle>
<none/> <pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(request, \'fast_input_type\', \'\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: cell.getDestinationPaymentValue().getParentValue().getTitle()</string> </value> <value> <string>python: \'\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -95,9 +95,7 @@ ...@@ -95,9 +95,7 @@
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list/>
<string>listbox_destination_section</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
<string>Value of check</string> <string>Value of check</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_section</string> <string>destination_trade_title</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -527,11 +527,8 @@ ...@@ -527,11 +527,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Method" module="Products.Formulator.MethodField"/>
<string>Products.Formulator.MethodField</string> <tuple/>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -89,17 +89,18 @@ if listbox is None:\n ...@@ -89,17 +89,18 @@ if listbox is None:\n
if node is None:\n if node is None:\n
node = context.getBaobabSource()\n node = context.getBaobabSource()\n
\n \n
reference_date = DateTime()\n if at_date is None:\n
at_date = DateTime()\n
item_list = []\n item_list = []\n
listbox = []\n listbox = []\n
if node is not None or disable_node:\n if node is not None or disable_node:\n
getCurrentTrackingList = context.portal_simulation.getCurrentTrackingList\n getCurrentTrackingList = context.portal_simulation.getCurrentTrackingList\n
#context.log(\'Delivery_viewCheckbookInputDialog\', getCurrentTrackingList(at_date=reference_date, node=node,src__=1,where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'"))\n #context.log(\'Delivery_viewCheckbookInputDialog\', getCurrentTrackingList(at_date=at_date, node=node,src__=1,where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'"))\n
#return [x.path for x in getCurrentTrackingList(at_date=reference_date, node=node)]\n #return [x.path for x in getCurrentTrackingList(at_date=at_date, node=node)]\n
if disable_node:\n if disable_node:\n
node=None\n node=None\n
current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n
at_date=reference_date, node=node,\n at_date=at_date, node=node,\n
where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n
for item in current_tracking_list:\n for item in current_tracking_list:\n
exclude=0\n exclude=0\n
...@@ -129,18 +130,21 @@ if listbox is None:\n ...@@ -129,18 +130,21 @@ if listbox is None:\n
item_dict[\'resource_title\'] = item.getResourceTitle()\n item_dict[\'resource_title\'] = item.getResourceTitle()\n
item_dict[\'destination_trade\'] = item.getDestinationTradeTitle()\n item_dict[\'destination_trade\'] = item.getDestinationTradeTitle()\n
item_dict[\'check_amount_title\'] = item.getCheckAmountTitle()\n item_dict[\'check_amount_title\'] = item.getCheckAmountTitle()\n
item_dict[\'internal_bank_account_number\'] = \'\'\n
destination_payment_value = item.getDestinationPaymentValue()\n
if destination_payment_value is not None:\n
item_dict[\'internal_bank_account_number\'] = destination_payment_value.getInternalBankAccountNumber()\n
item_dict[\'selection\'] = 0\n item_dict[\'selection\'] = 0\n
item_dict[\'uid\'] = \'new_%s\' %(item.getUid(),)\n item_dict[\'uid\'] = \'new_%s\' %(item.getUid(),)\n
\n \n
listbox.append(item_dict)\n listbox.append(item_dict)\n
\n \n
if batch_mode:\n return listbox\n
return listbox\n #context.Base_updateDialogForm(listbox=listbox\n
context.Base_updateDialogForm(listbox=listbox\n # )\n
)\n #return context.asContext(context=None\n
return context.asContext(context=None\n # , portal_type=context.getPortalType()\n
, portal_type=context.getPortalType()\n # ).CheckbookDelivery_fastInputForm(**kw)\n
).CheckbookDelivery_fastInputForm(**kw)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -163,7 +167,7 @@ return context.asContext(context=None\n ...@@ -163,7 +167,7 @@ return context.asContext(context=None\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,simulation_state=None,disable_node=0,**kw</string> </value> <value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,simulation_state=None,disable_node=0,at_date=None,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -183,7 +187,7 @@ return context.asContext(context=None\n ...@@ -183,7 +187,7 @@ return context.asContext(context=None\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>7</int> </value> <value> <int>8</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -196,6 +200,7 @@ return context.asContext(context=None\n ...@@ -196,6 +200,7 @@ return context.asContext(context=None\n
<string>batch_mode</string> <string>batch_mode</string>
<string>simulation_state</string> <string>simulation_state</string>
<string>disable_node</string> <string>disable_node</string>
<string>at_date</string>
<string>kw</string> <string>kw</string>
<string>DateTime</string> <string>DateTime</string>
<string>Dummy</string> <string>Dummy</string>
...@@ -205,7 +210,6 @@ return context.asContext(context=None\n ...@@ -205,7 +210,6 @@ return context.asContext(context=None\n
<string>vault</string> <string>vault</string>
<string>None</string> <string>None</string>
<string>context</string> <string>context</string>
<string>reference_date</string>
<string>item_list</string> <string>item_list</string>
<string>getCurrentTrackingList</string> <string>getCurrentTrackingList</string>
<string>append</string> <string>append</string>
...@@ -221,7 +225,7 @@ return context.asContext(context=None\n ...@@ -221,7 +225,7 @@ return context.asContext(context=None\n
<string>item_portal_type</string> <string>item_portal_type</string>
<string>item_dict</string> <string>item_dict</string>
<string>_write_</string> <string>_write_</string>
<string>_apply_</string> <string>destination_payment_value</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -241,12 +245,13 @@ return context.asContext(context=None\n ...@@ -241,12 +245,13 @@ return context.asContext(context=None\n
<int>0</int> <int>0</int>
<none/> <none/>
<int>0</int> <int>0</int>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Delivery_viewCheckbookInputDialog</string> </value> <value> <string>Delivery_getCheckbookList</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
...@@ -80,74 +80,47 @@ item_list = []\n ...@@ -80,74 +80,47 @@ item_list = []\n
listbox = []\n listbox = []\n
invalid_check_state_list = (\'draft\', \'confirmed\')\n invalid_check_state_list = (\'draft\', \'confirmed\')\n
\n \n
getCurrentTrackingList = context.portal_simulation.getCurrentTrackingList\n
current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n
at_date=reference_date, node=node,\n
where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n
\n
context_portal_type = context.getPortalType()\n
simulation_state = None\n simulation_state = None\n
model_filter_dict = {}\n model_filter_dict = {}\n
fast_input_type = getattr(request, \'your_fast_input_type\', None)\n
if fast_input_type is None:\n
fast_input_type = getattr(request, \'field_your_fast_input_type\')\n
\n
context.log(\'ListBox_listCheckbook, fast_input_type\', fast_input_type)\n
\n
\n
disable_node = 0\n disable_node = 0\n
if context_portal_type == \'Traveler Check Purchase\':\n at_date = context.getStartDate()\n
if fast_input_type == \'traveler_check_purchase\':\n
model_filter_dict[\'fixed_price\']=1\n model_filter_dict[\'fixed_price\']=1\n
item_portal_type_list = (\'Check\',)\n item_portal_type_list = (\'Check\',)\n
destination_payment = context.getDestinationPayment()\n destination_payment = context.getDestinationPayment()\n
disable_node = 1\n disable_node = 1\n
elif context_portal_type == \'Traveler Check Sale\':\n if fast_input_type == \'checkbook_delivery\':\n
destination_payment = context.getDestinationPayment()\n
elif fast_input_type == \'traveler_check_sale\':\n
model_filter_dict[\'fixed_price\']=1\n model_filter_dict[\'fixed_price\']=1\n
item_portal_type_list = (\'Check\',)\n item_portal_type_list = (\'Check\',)\n
elif context_portal_type == \'Checkbook Movement\':\n elif fast_input_type == \'checkbook_movement\':\n
# Nothing special here\n # Nothing special here\n
pass\n pass\n
elif context_portal_type == \'Checkbook Usual Cash Transfer\':\n elif fast_input_type == \'checkbook_vault_transfer\':\n
# Nothing special here\n
pass\n
elif fast_input_type == \'checkbook_usual_cash_transfer\':\n
model_filter_dict[\'fixed_price\']=1\n model_filter_dict[\'fixed_price\']=1\n
item_portal_type_list = (\'Check\',)\n item_portal_type_list = (\'Check\',)\n
\n \n
\n \n
\n \n
context.log(\'current_tracking_list\',current_tracking_list)\n listbox = context.Delivery_getCheckbookList(\n
context.log(\'context_portal_type\',context_portal_type)\n item_portal_type_list=item_portal_type_list,\n
context.log(\'item_portal_type_list\',item_portal_type_list)\n destination_payment=destination_payment,\n
for item in current_tracking_list:\n model_filter_dict=model_filter_dict,\n
exclude=0\n simulation_state=simulation_state,\n
if model_filter_dict is not None:\n disable_node=disable_node,\n
resource = item.getResourceValue()\n at_date=at_date,\n
for property,value in model_filter_dict.items():\n node=node)\n
if resource.getProperty(property)!=value:\n
exclude=1\n
if destination_payment is not None:\n
if destination_payment!=item.getDestinationPayment():\n
exclude=1\n
context.log(\'exclude\',exclude)\n
if not exclude:\n
item_portal_type = item.getPortalType()\n
context.log(\'item_portal_type\',item_portal_type)\n
if item_portal_type in item_portal_type_list:\n
if item_portal_type==\'Check\' and item.getSimulationState() not in (\'draft\',\'confirmed\'):\n
continue\n
context.log(\'simulation_state\',simulation_state)\n
if simulation_state is not None:\n
context.log(\'item\',item.getRelativeUrl())\n
context.log(\'item.getSimulationState\',item.getSimulationState())\n
context.log(\'item.getReferenceRangeMin\',item.getReference())\n
if item.getSimulationState()!=simulation_state:\n
continue\n
item_dict = {}\n
if item_portal_type==\'Check\':\n
item_dict[\'reference_range_max\'] = item.getReference()\n
item_dict[\'reference_range_min\'] = item.getReference()\n
else:\n
item_dict[\'reference_range_min\'] = item.getReferenceRangeMin()\n
item_dict[\'reference_range_max\'] = item.getReferenceRangeMax()\n
item_dict[\'resource_title\'] = item.getResourceTitle()\n
item_dict[\'destination_trade\'] = item.getDestinationTradeTitle()\n
item_dict[\'check_amount_title\'] = item.getCheckAmountTitle()\n
item_dict[\'selection\'] = 0\n
item_dict[\'uid\'] = \'new_%s\' %(item.getUid(),)\n
\n
listbox.append(item_dict)\n
\n
\n \n
context.Base_updateDialogForm(listbox=listbox)\n context.Base_updateDialogForm(listbox=listbox)\n
return context.ListBox_initializeFastInput()\n return context.ListBox_initializeFastInput()\n
...@@ -213,24 +186,13 @@ return context.ListBox_initializeFastInput()\n ...@@ -213,24 +186,13 @@ return context.ListBox_initializeFastInput()\n
<string>item_list</string> <string>item_list</string>
<string>listbox</string> <string>listbox</string>
<string>invalid_check_state_list</string> <string>invalid_check_state_list</string>
<string>getCurrentTrackingList</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>x</string>
<string>current_tracking_list</string>
<string>context_portal_type</string>
<string>simulation_state</string> <string>simulation_state</string>
<string>model_filter_dict</string> <string>model_filter_dict</string>
<string>getattr</string>
<string>fast_input_type</string>
<string>disable_node</string> <string>disable_node</string>
<string>at_date</string>
<string>_write_</string> <string>_write_</string>
<string>item</string>
<string>exclude</string>
<string>resource</string>
<string>property</string>
<string>value</string>
<string>item_portal_type</string>
<string>item_dict</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -124,7 +124,7 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\' ...@@ -124,7 +124,7 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\'
interval = getIntervalBetweenDates(check_operation_line.getStartDate(), check_operation_line.getStopDate())\n interval = getIntervalBetweenDates(check_operation_line.getStartDate(), check_operation_line.getStopDate())\n
if interval[\'year\'] >= 3:\n if interval[\'year\'] >= 3:\n
if interval[\'month\'] > 0 or interval["day"] > 0:\n if interval[\'month\'] > 0 or interval["day"] > 0:\n
msg = Message(domain=\'ui\', message="Check $s is more than 3 years old.",\n msg = Message(domain=\'ui\', message="Check $check is more than 3 years old.",\n
mapping={"check" : check_operation_line.getAggregateFreeText()})\n mapping={"check" : check_operation_line.getAggregateFreeText()})\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
\n \n
......
...@@ -80,9 +80,9 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n ...@@ -80,9 +80,9 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n
\n \n
site = transaction.getSourceValue()\n site = transaction.getSourceValue()\n
\n \n
if not transaction.Baobab_checkCounterOpened(site):\n #if not transaction.Baobab_checkCounterOpened(site):\n
msg = Message(domain = "ui", message="Counter is not opened")\n # msg = Message(domain = "ui", message="Counter is not opened")\n
raise ValidationFailed, (msg,)\n # raise ValidationFailed, (msg,)\n
\n \n
# For safety, check the consistency again.\n # For safety, check the consistency again.\n
context.validateConsistency(state_change)\n context.validateConsistency(state_change)\n
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>transaction = state_change[\'object\']\n <value> <string>transaction = state_change.object\n
\n \n
# Check getBaobabSource and getBaobabDestination\n # Check getBaobabSource and getBaobabDestination\n
transaction.Base_checkBaobabSourceAndDestination()\n transaction.Base_checkBaobabSourceAndDestination()\n
......
...@@ -93,6 +93,11 @@ source_object = context.portal_categories.getCategoryValue(source)\n ...@@ -93,6 +93,11 @@ source_object = context.portal_categories.getCategoryValue(source)\n
# check again that we are in the good accounting date\n # check again that we are in the good accounting date\n
transaction.Baobab_checkCounterDateOpen(site=source_object, date=transaction.getStartDate())\n transaction.Baobab_checkCounterDateOpen(site=source_object, date=transaction.getStartDate())\n
\n \n
\n
# check again that the counter is open\n
\n
context.Baobab_checkCounterOpened(source)\n
\n
resource = transaction.CashDelivery_checkCounterInventory(source = source, portal_type=\'Cash Delivery Line\', same_source=1)\n resource = transaction.CashDelivery_checkCounterInventory(source = source, portal_type=\'Cash Delivery Line\', same_source=1)\n
#transaction.log("call to CashDelivery_getCounterInventory return", resource)\n #transaction.log("call to CashDelivery_getCounterInventory return", resource)\n
\n \n
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>initial_state</string> </key> <key> <string>initial_state</string> </key>
<value> <string>draft</string> </value> <value> <string>empty</string> </value>
</item> </item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<string>View</string> <string>View</string>
<string>Access contents information</string> <string>Access contents information</string>
<string>Modify portal content</string> <string>Modify portal content</string>
<string>Add portal content</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -51,17 +51,14 @@ ...@@ -51,17 +51,14 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
...@@ -71,6 +68,7 @@ ...@@ -71,6 +68,7 @@
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -89,6 +87,7 @@ ...@@ -89,6 +87,7 @@
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -97,6 +98,7 @@ ...@@ -97,6 +98,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
<string>delete_action</string> <string>delete_action</string>
<string>deliver</string> <string>deliver</string>
<string>deliver_action</string> <string>deliver_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -83,6 +85,7 @@ ...@@ -83,6 +85,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -106,6 +109,7 @@ ...@@ -106,6 +109,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>empty</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Empty</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>delete</string>
<string>delete_action</string>
<string>deliver</string>
<string>deliver_action</string>
<string>draft</string>
<string>draft_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rejected</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Rejected</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>delete</string>
<string>delete_action</string>
<string>deliver</string>
<string>deliver_action</string>
<string>draft</string>
<string>draft_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Assistant</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Assistant</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Assistant</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Assistant</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -70,4 +70,26 @@ ...@@ -70,4 +70,26 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assistant</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -73,11 +73,8 @@ ...@@ -73,11 +73,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -88,6 +85,7 @@ ...@@ -88,6 +85,7 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Draft</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Go to Draft</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=draft_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>draft</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>draft_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>checkConsistency</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Draft</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>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assistant</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>reject</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>rejected</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>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Reject</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=reject_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>reject</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>reject_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>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>initial_state</string> </key> <key> <string>initial_state</string> </key>
<value> <string>draft</string> </value> <value> <string>empty</string> </value>
</item> </item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
......
...@@ -76,6 +76,12 @@ if destination is None:\n ...@@ -76,6 +76,12 @@ if destination is None:\n
message = Message(domain="ui",message="Please select a destination")\n message = Message(domain="ui",message="Please select a destination")\n
raise ValidationFailed, (message,)\n raise ValidationFailed, (message,)\n
\n \n
# Check that the destination is not empty\n
description = object.getDescription()\n
if description in (None, \'\'):\n
message = Message(domain="ui",message="Please set a description")\n
raise ValidationFailed, (message,)\n
\n
# Check that there is a least one line\n # Check that there is a least one line\n
if len(object.objectValues())==0:\n if len(object.objectValues())==0:\n
message = Message(domain="ui",message="Please enter some check or checkbooks")\n message = Message(domain="ui",message="Please enter some check or checkbooks")\n
...@@ -134,6 +140,7 @@ if len(object.objectValues())==0:\n ...@@ -134,6 +140,7 @@ if len(object.objectValues())==0:\n
<string>destination</string> <string>destination</string>
<string>None</string> <string>None</string>
<string>message</string> <string>message</string>
<string>description</string>
<string>len</string> <string>len</string>
</tuple> </tuple>
</value> </value>
......
...@@ -35,6 +35,15 @@ ...@@ -35,6 +35,15 @@
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value>
<tuple>
<string>delete</string>
<string>delete_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value> <value>
<tuple/> <tuple/>
</value> </value>
...@@ -62,6 +71,7 @@ ...@@ -62,6 +71,7 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -88,6 +98,7 @@ ...@@ -88,6 +98,7 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -101,6 +102,7 @@ ...@@ -101,6 +102,7 @@
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -99,6 +100,7 @@ ...@@ -99,6 +100,7 @@
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
<string>confirm_action</string> <string>confirm_action</string>
<string>delete</string> <string>delete</string>
<string>delete_action</string> <string>delete_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -77,6 +79,7 @@ ...@@ -77,6 +79,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -111,6 +114,7 @@ ...@@ -111,6 +114,7 @@
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
<string>Reviewer</string> <string>Reviewer</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>empty</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Empty</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>confirm</string>
<string>confirm_action</string>
<string>delete</string>
<string>delete_action</string>
<string>draft</string>
<string>draft_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assistant</string>
<string>Assignor</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
<string>confirm_action</string> <string>confirm_action</string>
<string>delete</string> <string>delete</string>
<string>delete_action</string> <string>delete_action</string>
<string>reject</string>
<string>reject_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -74,6 +76,7 @@ ...@@ -74,6 +76,7 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
</tuple> </tuple>
...@@ -84,6 +87,7 @@ ...@@ -84,6 +87,7 @@
<value> <value>
<tuple> <tuple>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
...@@ -93,6 +97,7 @@ ...@@ -93,6 +97,7 @@
<value> <value>
<tuple> <tuple>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
...@@ -103,6 +108,7 @@ ...@@ -103,6 +108,7 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
<string>Manager</string> <string>Manager</string>
<string>Reviewer</string> <string>Reviewer</string>
</tuple> </tuple>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,4 +64,26 @@ ...@@ -64,4 +64,26 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assistant</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -82,6 +79,7 @@ ...@@ -82,6 +79,7 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string> <string>Assignor</string>
<string>Assistant</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Draft</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Go to Draft</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=draft_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>draft</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>draft_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>CheckbookReception_validateData</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Draft</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>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assistant</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -84,12 +84,15 @@ transaction.Baobab_checkSameUserVault(source)\n ...@@ -84,12 +84,15 @@ transaction.Baobab_checkSameUserVault(source)\n
# check we are in an opened accounting day\n # check we are in an opened accounting day\n
transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n
\n \n
site = transaction.getSourceValue()\n context.Baobab_checkCounterOpened(source)\n
\n \n
if \'guichet\' in site.getVaultType():\n \n
if not context.Baobab_checkCounterOpened(site):\n #site = transaction.getSourceValue()\n
msg = Message(domain = "ui", message="Counter is not opened")\n \n
raise ValidationFailed, (msg,)\n #if \'guichet\' in site.getVaultType():\n
# if not context.Baobab_checkCounterOpened(site):\n
# msg = Message(domain = "ui", message="Counter is not opened")\n
# raise ValidationFailed, (msg,)\n
\n \n
# First we have to look if we have some checks with some prices,\n # First we have to look if we have some checks with some prices,\n
# if so, this means that we are saling such kinds of check, thus\n # if so, this means that we are saling such kinds of check, thus\n
...@@ -190,7 +193,6 @@ if total_credit>0:\n ...@@ -190,7 +193,6 @@ if total_credit>0:\n
<string>None</string> <string>None</string>
<string>source</string> <string>source</string>
<string>msg</string> <string>msg</string>
<string>site</string>
<string>context</string> <string>context</string>
<string>movement_list</string> <string>movement_list</string>
<string>total_credit</string> <string>total_credit</string>
......
292 300
\ No newline at end of file \ 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