Skip to content

erp5
erp5
Commit 4446deab authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Add a validation workflow on currencies 

Improve currency module list to have some more columns, and remove ID on currency and currency module

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17800 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a7c4ad7f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 376 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
View file @ 4446deab
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<string>Products.PythonScripts.PythonScript</string> <tuple/>
<string>PythonScript</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -69,6 +66,7 @@ ...@@ -69,6 +66,7 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n <value> <string>portal = context.getPortalObject()\n
from ZTUtils import LazyFilter\n
\n \n
def getCurrencyItemList(include_empty=1, portal_path=""):\n def getCurrencyItemList(include_empty=1, portal_path=""):\n
result = []\n result = []\n
...@@ -77,10 +75,12 @@ def getCurrencyItemList(include_empty=1, portal_path=""):\n ...@@ -77,10 +75,12 @@ def getCurrencyItemList(include_empty=1, portal_path=""):\n
currency_module = getattr(portal, \'currency_module\',\n currency_module = getattr(portal, \'currency_module\',\n
getattr(portal, \'currency\', None))\n getattr(portal, \'currency\', None))\n
\n \n
for currency in currency_module.contentValues():\n for currency in LazyFilter(currency_module.contentValues(), skip=\'View\'):\n
# for currency, we intentionaly use reference (EUR) not title (Euros).\n if not skip_invalidated or \\\n
result.append((currency.getReference() or currency.getTitleOrId(),\n currency.getProperty(\'validation_state\', \'default\') != \'invalidated\':\n
currency.getRelativeUrl()))\n # for currency, we intentionaly use reference (EUR) not title (Euros).\n
result.append((currency.getReference() or currency.getTitleOrId(),\n
currency.getRelativeUrl()))\n
\n \n
result.sort(lambda x,y: cmp(x[0], y[0]))\n result.sort(lambda x,y: cmp(x[0], y[0]))\n
return result\n return result\n
...@@ -115,7 +115,7 @@ return getCurrencyItemList( include_empty=include_empty,\n ...@@ -115,7 +115,7 @@ return getCurrencyItemList( include_empty=include_empty,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>include_empty=1</string> </value> <value> <string>include_empty=1, skip_invalidated=1</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -135,16 +135,19 @@ return getCurrencyItemList( include_empty=include_empty,\n ...@@ -135,16 +135,19 @@ return getCurrencyItemList( include_empty=include_empty,\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>include_empty</string> <string>include_empty</string>
<string>skip_invalidated</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>portal</string> <string>portal</string>
<string>ZTUtils</string>
<string>LazyFilter</string>
<string>getCurrencyItemList</string> <string>getCurrencyItemList</string>
<string>Products.ERP5Type.Cache</string> <string>Products.ERP5Type.Cache</string>
<string>CachingMethod</string> <string>CachingMethod</string>
...@@ -161,6 +164,7 @@ return getCurrencyItemList( include_empty=include_empty,\n ...@@ -161,6 +164,7 @@ return getCurrencyItemList( include_empty=include_empty,\n
<value> <value>
<tuple> <tuple>
<int>1</int> <int>1</int>
<int>1</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
View file @ 4446deab
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<string>Products.ERP5Form.ProxyField</string> <tuple/>
<string>ProxyField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -18,8 +15,7 @@ ...@@ -18,8 +15,7 @@
<list> <list>
<string>title</string> <string>title</string>
<string>columns</string> <string>columns</string>
<string>search_columns</string> <string>all_columns</string>
<string>sort_columns</string>
<string>sort</string> <string>sort</string>
<string>selection_name</string> <string>selection_name</string>
<string>portal_types</string> <string>portal_types</string>
...@@ -87,6 +83,45 @@ ...@@ -87,6 +83,45 @@
<key> <string>Base_viewSearchResultList</string> </key> <key> <string>Base_viewSearchResultList</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
</item> </item>
<item>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Currency Code</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>short_title</string>
<string>Symbol</string>
</tuple>
<tuple>
<string>base_unit_quantity</string>
<string>Precision</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>quantity_precision</string>
<string>Quantity Precision</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>all_editable_columns</string> </key> <key> <string>all_editable_columns</string> </key>
<value> <value>
...@@ -97,10 +132,6 @@ ...@@ -97,10 +132,6 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple> <tuple>
<string>reference</string> <string>reference</string>
<string>Currency Code</string> <string>Currency Code</string>
...@@ -117,6 +148,10 @@ ...@@ -117,6 +148,10 @@
<string>base_unit_quantity</string> <string>base_unit_quantity</string>
<string>Precision</string> <string>Precision</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -139,25 +174,6 @@ ...@@ -139,25 +174,6 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple>
<string>reference</string>
<string>Currency Code</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string>currency_module_selection</string> </value> <value> <string>currency_module_selection</string> </value>
...@@ -166,33 +182,10 @@ ...@@ -166,33 +182,10 @@
<key> <string>sort</string> </key> <key> <string>sort</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple>
<string>reference</string>
<string>Currency Code</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple> <tuple>
<string>reference</string> <string>reference</string>
<string>Currency Code</string> <string>Currency Code</string>
</tuple> </tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
View file @ 4446deab
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ERP5Form" module="Products.ERP5Form.Form"/>
<string>Products.ERP5Form.Form</string> <tuple/>
<string>ERP5Form</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -99,8 +96,8 @@ ...@@ -99,8 +96,8 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_id</string>
<string>my_title</string> <string>my_title</string>
<string>my_short_title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -108,9 +105,9 @@ ...@@ -108,9 +105,9 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>my_short_title</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_base_unit_quantity</string> <string>my_base_unit_quantity</string>
<string>my_translated_validation_state_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_base_unit_quantity.xml
View file @ 4446deab
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<string>Products.ERP5Form.ProxyField</string> <tuple/>
<string>ProxyField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -17,7 +14,6 @@ ...@@ -17,7 +14,6 @@
<value> <value>
<list> <list>
<string>title</string> <string>title</string>
<string>required</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -86,16 +82,12 @@ ...@@ -86,16 +82,12 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>required</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Precision</string> </value> <value> <string>Precision</string> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_translated_validation_state_title.xml 0 → 100644
View file @ 4446deab
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_translated_validation_state_title</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_translated_workflow_state_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/bt/revision
View file @ 4446deab
224 226
\ No newline at end of file \ No newline at end of file
bt5/erp5_base/bt/template_portal_type_workflow_chain_list
View file @ 4446deab
...@@ -10,6 +10,7 @@ Credit Card | edit_workflow ...@@ -10,6 +10,7 @@ Credit Card | edit_workflow
Currency Exchange Line | currency_exchange_line_interaction_workflow Currency Exchange Line | currency_exchange_line_interaction_workflow
Currency Exchange Line | edit_workflow Currency Exchange Line | edit_workflow
Currency | edit_workflow Currency | edit_workflow
Currency | validation_workflow
Email | edit_workflow Email | edit_workflow
Fax | edit_workflow Fax | edit_workflow
File | edit_workflow File | edit_workflow
......
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