Skip to content

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

- modified security on some rejected states 

- added property sheet CurrencyExchangeRate on CashToCurrencyPurchase

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15362 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent af50d07c
Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 44 deletions
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Foreign%20Cash%20Reception/fastinput.xml
View file @ 233b027c
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: object.getSimulationState()==\'empty\'</string> </value> <value> <string>python: object.getSimulationState() in (\'empty\', \'rejected\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/fastinput.xml
View file @ 233b027c
...@@ -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() in (\'draft\',\'rejected\')</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>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/history.xml
View file @ 233b027c
...@@ -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>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/metadata.xml
View file @ 233b027c
...@@ -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>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/print.xml
View file @ 233b027c
...@@ -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>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/view.xml
View file @ 233b027c
...@@ -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>
......
bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ 233b027c
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
</portal_type> </portal_type>
<portal_type id="Cash To Currency Purchase"> <portal_type id="Cash To Currency Purchase">
<item>Discount</item> <item>Discount</item>
<item>CurrencyExchangeRate</item>
<item>Resource</item> <item>Resource</item>
<item>Price</item> <item>Price</item>
<item>Reference</item> <item>Reference</item>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20To%20Currency%20Purchase.xml
View file @ 233b027c
...@@ -119,6 +119,10 @@ ...@@ -119,6 +119,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>CashToCurrencyPurchase_init</string> </value> <value> <string>CashToCurrencyPurchase_init</string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencyPurchase_view.xml
View file @ 233b027c
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
<list> <list>
<string>my_start_date</string> <string>my_start_date</string>
<string>your_exchange_rate</string> <string>your_exchange_rate</string>
<string>my_currency_exchange_rate</string>
<string>my_price</string> <string>my_price</string>
<string>my_discount_ratio</string> <string>my_discount_ratio</string>
<string>my_quantity</string> <string>my_quantity</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencyPurchase_view/my_currency_exchange_rate.xml 0 → 100644
View file @ 233b027c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="FloatField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_currency_exchange_rate</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>not_float</string> </key>
<value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1 234.5</string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Specific Exchange Rate</string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml
View file @ 233b027c
...@@ -100,6 +100,7 @@ cash_detail_dict = {\'line_portal_type\' : \'Cash Delivery Line\'\n ...@@ -100,6 +100,7 @@ cash_detail_dict = {\'line_portal_type\' : \'Cash Delivery Line\'\n
return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n
, cash_detail_dict = cash_detail_dict\n , cash_detail_dict = cash_detail_dict\n
, destination = context.getObject().absolute_url()\n , destination = context.getObject().absolute_url()\n
, rendering_vault = context.getSource()\n
)\n )\n
</string> </value> </string> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/rejected.xml
View file @ 233b027c
...@@ -45,10 +45,12 @@ ...@@ -45,10 +45,12 @@
<tuple> <tuple>
<string>cancel</string> <string>cancel</string>
<string>cancel_action</string> <string>cancel_action</string>
<string>confirm</string>
<string>confirm_action</string>
<string>delete</string> <string>delete</string>
<string>delete_action</string> <string>delete_action</string>
<string>deliver</string> <string>draft</string>
<string>deliver_action</string> <string>draft_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/states/rejected.xml
View file @ 233b027c
...@@ -43,8 +43,8 @@ ...@@ -43,8 +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>draft</string>
<string>reject_action</string> <string>draft_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/states/rejected.xml
View file @ 233b027c
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
<string>delete_action</string> <string>delete_action</string>
<string>draft</string> <string>draft</string>
<string>draft_action</string> <string>draft_action</string>
<string>order</string>
<string>order_action</string>
<string>plan</string> <string>plan</string>
<string>plan_action</string> <string>plan_action</string>
</tuple> </tuple>
......
bt5/erp5_banking_cash/bt/revision
View file @ 233b027c
431 433
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list
View file @ 233b027c
...@@ -9,6 +9,7 @@ Cash Exchange | Simulation ...@@ -9,6 +9,7 @@ Cash Exchange | Simulation
Cash Movement | Price Cash Movement | Price
Cash Sorting | Price Cash Sorting | Price
Cash To Currency Purchase | Amount Cash To Currency Purchase | Amount
Cash To Currency Purchase | CurrencyExchangeRate
Cash To Currency Purchase | Discount Cash To Currency Purchase | Discount
Cash To Currency Purchase | Price Cash To Currency Purchase | Price
Cash To Currency Purchase | Reference Cash To Currency Purchase | Reference
......
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