Commit 0d5eb5d7 authored by Julien Muchembled's avatar Julien Muchembled

Sync with trunk@39088

Conflicts:
	bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_listbox_price.xml
	products/ERP5/Document/SimulationMovement.py
	products/ERP5/mixin/composition.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@39113 20353a03-c40f-0410-a6d1-a30d3c3de9de
parents 885a32d2 5d6661d0
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getDestinationAssetCredit()\n total += line.getDestinationInventoriatedTotalAssetCredit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getDestinationAssetDebit()\n total += line.getDestinationInventoriatedTotalAssetDebit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getSourceAssetCredit()\n total += line.getSourceInventoriatedTotalAssetCredit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getSourceAssetDebit()\n total += line.getSourceInventoriatedTotalAssetDebit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
...@@ -128,7 +128,7 @@ return context.REQUEST.RESPONSE.redirect(\n ...@@ -128,7 +128,7 @@ return context.REQUEST.RESPONSE.redirect(\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>node, payment_mode, payment, selection_index=None, uids=[], listbox_uid=[],selection_name=\'\'</string> </value> <value> <string>node, payment_mode, payment, selection_index=None, uids=[], listbox_uid=[],selection_name=\'\', **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -161,6 +161,7 @@ return context.REQUEST.RESPONSE.redirect(\n ...@@ -161,6 +161,7 @@ return context.REQUEST.RESPONSE.redirect(\n
<string>uids</string> <string>uids</string>
<string>listbox_uid</string> <string>listbox_uid</string>
<string>selection_name</string> <string>selection_name</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string> <string>Products.ERP5Type.Message</string>
<string>translateString</string> <string>translateString</string>
<string>zExceptions</string> <string>zExceptions</string>
......
...@@ -119,7 +119,7 @@ return context.Base_redirect(form_id,\n ...@@ -119,7 +119,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>cancellation_amount=False, date=None, plan=False, uids=[], listbox_uid=[], selection_name=\'\', form_id=\'view\'</string> </value> <value> <string>cancellation_amount=False, date=None, plan=False, uids=[], listbox_uid=[], selection_name=\'\', form_id=\'view\', **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -152,6 +152,7 @@ return context.Base_redirect(form_id,\n ...@@ -152,6 +152,7 @@ return context.Base_redirect(form_id,\n
<string>listbox_uid</string> <string>listbox_uid</string>
<string>selection_name</string> <string>selection_name</string>
<string>form_id</string> <string>form_id</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string> <string>Products.ERP5Type.Message</string>
<string>translateString</string> <string>translateString</string>
<string>zExceptions</string> <string>zExceptions</string>
......
...@@ -72,7 +72,7 @@ return context.AccountingTransactionModule_setGroupingReference(\n ...@@ -72,7 +72,7 @@ return context.AccountingTransactionModule_setGroupingReference(\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>uids=[], listbox=None, listbox_uid=[], list_selection_name=\'\', node=\'\', mirror_section=\'\', cancel_url, **kw</string> </value> <value> <string>uids=[], listbox=None, listbox_uid=[], list_selection_name=\'\', node=\'\', mirror_section=\'\', cancel_url=\'\', **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -126,7 +126,7 @@ return context.AccountingTransactionModule_setGroupingReference(\n ...@@ -126,7 +126,7 @@ return context.AccountingTransactionModule_setGroupingReference(\n
<string></string> <string></string>
<string></string> <string></string>
<string></string> <string></string>
<none/> <string></string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
......
...@@ -50,21 +50,18 @@ ...@@ -50,21 +50,18 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ERP5.Document.Document import ConversionError\n <value> <string>"""\n
\n
"""\n
Script to convert the prices used in the transaction to the \n Script to convert the prices used in the transaction to the \n
currency of the destination section\n currency of the destination section\n
form_id : Page that action is called from\n form_id : Page that action is called from\n
\n \n
\n \n
"""\n """\n
\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
#get the precision of the destination\n #get the precision of the destination\n
precision =context.getDestinationSectionValue().getPriceCurrencyValue().getQuantityPrecision()\n precision = context.getDestinationSectionValue().getPriceCurrencyValue().getQuantityPrecision()\n
#Get all transaction lines of the transaction \n #Get all transaction lines of the transaction \n
line_list= context.contentValues(\n line_list = context.contentValues(\n
portal_type=portal.getPortalAccountingMovementTypeList())\n portal_type=portal.getPortalAccountingMovementTypeList())\n
"""\n """\n
For each transaction line, calculate the price of the resource\n For each transaction line, calculate the price of the resource\n
...@@ -74,26 +71,24 @@ and start_date categories \n ...@@ -74,26 +71,24 @@ and start_date categories \n
"""\n """\n
\n \n
for line in line_list:\n for line in line_list:\n
if line.getDestinationSectionValue() is None:\n section = line.getDestinationSectionValue()\n
raise AssertionError\n
else:\n
currency = line.getResourceValue()\n currency = line.getResourceValue()\n
exchange_ratio = currency.getPrice(context=line.asContext(\n if not exchange_rate:\n
categories=[\'resource/%s\' % line.getResource(), \n exchange_rate = currency.getPrice(context=line.asContext(\n
\'price_currency/currency_module/%s\' %\n categories=[line.getResource(base=True),\n
line.getDestinationSectionValue().getPriceCurrencyId()],\n section.getPriceCurrency(base=True)],\n
start_date=line.getStopDate()))\n start_date=line.getStopDate()))\n
\n \n
#redirect to previous page without doing the conversion\n # redirect to previous page without doing the conversion\n
if exchange_ratio is None:\n if exchange_rate is None:\n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
keep_items=dict(\n keep_items=dict(\n
portal_status_message=context.Base_translateString(\'No exchange ratio found.\'))) \n portal_status_message=context.Base_translateString(\'No exchange ratio found.\')))\n
#update the corresponding price and round it according to the precision of\n
#the converted currency\n
line.setDestinationTotalAssetPrice(\n
round(exchange_ratio*(line.getQuantity()), precision))\n
\n \n
# update the corresponding price and round it according to the precision of\n
# the converted currency\n
line.setDestinationTotalAssetPrice(\n
round(exchange_rate * (line.getQuantity()), precision))\n
\n \n
msg = context.Base_translateString(\'Price converted.\')\n msg = context.Base_translateString(\'Price converted.\')\n
\n \n
...@@ -109,7 +104,7 @@ return context.Base_redirect(form_id,\n ...@@ -109,7 +104,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id=\'view\'</string> </value> <value> <string>exchange_rate=None, form_id=\'view\'</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -129,15 +124,14 @@ return context.Base_redirect(form_id,\n ...@@ -129,15 +124,14 @@ return context.Base_redirect(form_id,\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>exchange_rate</string>
<string>form_id</string> <string>form_id</string>
<string>Products.ERP5.Document.Document</string>
<string>ConversionError</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>portal</string> <string>portal</string>
...@@ -145,10 +139,10 @@ return context.Base_redirect(form_id,\n ...@@ -145,10 +139,10 @@ return context.Base_redirect(form_id,\n
<string>line_list</string> <string>line_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>None</string> <string>section</string>
<string>AssertionError</string>
<string>currency</string> <string>currency</string>
<string>exchange_ratio</string> <string>True</string>
<string>None</string>
<string>dict</string> <string>dict</string>
<string>round</string> <string>round</string>
<string>msg</string> <string>msg</string>
...@@ -164,6 +158,7 @@ return context.Base_redirect(form_id,\n ...@@ -164,6 +158,7 @@ return context.Base_redirect(form_id,\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<none/>
<string>view</string> <string>view</string>
</tuple> </tuple>
</value> </value>
......
...@@ -50,16 +50,15 @@ ...@@ -50,16 +50,15 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ERP5.Document.Document import ConversionError\n <value> <string>"""\n
"""\n
Script to convert the prices used in the transaction to the \n Script to convert the prices used in the transaction to the \n
currency of the destination section\n currency of the destination section\n
"""\n """\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
#get the precision of the destination\n #get the precision of the destination\n
precision =context.getSourceSectionValue().getPriceCurrencyValue().getQuantityPrecision()\n precision = context.getSourceSectionValue().getPriceCurrencyValue().getQuantityPrecision()\n
#Get all transaction lines of the transaction \n #Get all transaction lines of the transaction \n
line_list= context.contentValues(\n line_list = context.contentValues(\n
portal_type=portal.getPortalAccountingMovementTypeList())\n portal_type=portal.getPortalAccountingMovementTypeList())\n
"""\n """\n
For each transaction line, calculate the price of the resource\n For each transaction line, calculate the price of the resource\n
...@@ -69,27 +68,24 @@ and start_date categories \n ...@@ -69,27 +68,24 @@ and start_date categories \n
"""\n """\n
\n \n
for line in line_list:\n for line in line_list:\n
if line.getSourceSectionValue() is None:\n section = line.getSourceSectionValue()\n
raise AssertionError\n
else:\n
currency = line.getResourceValue()\n currency = line.getResourceValue()\n
exchange_ratio = currency.getPrice(context=line.asContext(\n if not exchange_rate:\n
categories=[\'resource/%s\' % line.getResource(), \n exchange_rate = currency.getPrice(context=line.asContext(\n
\'price_currency/currency_module/%s\' %\n categories=[line.getResource(base=True),\n
line.getSourceSectionValue().getPriceCurrencyId()],\n section.getPriceCurrency(base=True)],\n
start_date=line.getStartDate()))\n start_date=line.getStartDate()))\n
#redirect to previous page without doing the conversion\n # redirect to previous page without doing the conversion\n
if exchange_ratio is None:\n if exchange_rate is None:\n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
keep_items=dict(\n keep_items=dict(\n
portal_status_message=context.Base_translateString(\'No exchange ratio found.\'))) \n portal_status_message=context.Base_translateString(\'No exchange ratio found.\')))\n
\n \n
\n \n
#update the corresponding price and round it according to the precision of\n # update the corresponding price and round it according to the precision of\n
#the converted currency\n # the converted currency\n
line.setSourceTotalAssetPrice(\n line.setSourceTotalAssetPrice(\n
round(exchange_ratio * (-line.getQuantity()), precision))\n round(exchange_rate * (-line.getQuantity()), precision))\n
\n
\n \n
msg = context.Base_translateString(\'Price converted.\')\n msg = context.Base_translateString(\'Price converted.\')\n
\n \n
...@@ -105,7 +101,7 @@ return context.Base_redirect(form_id,\n ...@@ -105,7 +101,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id=\'view\'</string> </value> <value> <string>exchange_rate=None, form_id=\'view\'</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -125,15 +121,14 @@ return context.Base_redirect(form_id,\n ...@@ -125,15 +121,14 @@ return context.Base_redirect(form_id,\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>exchange_rate</string>
<string>form_id</string> <string>form_id</string>
<string>Products.ERP5.Document.Document</string>
<string>ConversionError</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>portal</string> <string>portal</string>
...@@ -141,10 +136,10 @@ return context.Base_redirect(form_id,\n ...@@ -141,10 +136,10 @@ return context.Base_redirect(form_id,\n
<string>line_list</string> <string>line_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>None</string> <string>section</string>
<string>AssertionError</string>
<string>currency</string> <string>currency</string>
<string>exchange_ratio</string> <string>True</string>
<string>None</string>
<string>dict</string> <string>dict</string>
<string>round</string> <string>round</string>
<string>msg</string> <string>msg</string>
...@@ -160,6 +155,7 @@ return context.Base_redirect(form_id,\n ...@@ -160,6 +155,7 @@ return context.Base_redirect(form_id,\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<none/>
<string>view</string> <string>view</string>
</tuple> </tuple>
</value> </value>
......
...@@ -157,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n ...@@ -157,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>cancellation_amount=False, date=None, plan=False</string> </value> <value> <string>cancellation_amount=False, date=None, plan=False, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -186,6 +186,7 @@ return reversal.Base_redirect(\'view\',\n ...@@ -186,6 +186,7 @@ return reversal.Base_redirect(\'view\',\n
<string>cancellation_amount</string> <string>cancellation_amount</string>
<string>date</string> <string>date</string>
<string>plan</string> <string>plan</string>
<string>kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>Base_translateString</string> <string>Base_translateString</string>
......
...@@ -50,16 +50,10 @@ ...@@ -50,16 +50,10 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>"""\n <value> <string>return context.getResourceValue().getPrice(\n
Script used to get the exchange ratio used \n context=context.asContext(categories=[context.getResource(base=True),\n
in the conversion of the destination price\n context.getDestinationSectionValue().getPriceCurrency(base=True)],\n
"""\n
\n
currency = context.getResourceValue()\n
exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResource(), \n
\'price_currency/currency_module/%s\' % context.getDestinationSectionValue().getPriceCurrencyId()],\n
start_date=context.getStopDate()))\n start_date=context.getStopDate()))\n
return exchange_ratio\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -98,8 +92,7 @@ return exchange_ratio\n ...@@ -98,8 +92,7 @@ return exchange_ratio\n
<tuple> <tuple>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>currency</string> <string>True</string>
<string>exchange_ratio</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -50,11 +50,10 @@ ...@@ -50,11 +50,10 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>currency = context.getResourceValue()\n <value> <string>return context.getResourceValue().getPrice(\n
exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResource(), \n context=context.asContext(categories=[context.getResource(base=True),\n
\'price_currency/currency_module/%s\' % context.getSourceSectionValue().getPriceCurrencyId()],\n context.getSourceSectionValue().getPriceCurrency(base=True)],\n
start_date=context.getStartDate()))\n start_date=context.getStartDate()))\n
return exchange_ratio\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -93,8 +92,7 @@ return exchange_ratio\n ...@@ -93,8 +92,7 @@ return exchange_ratio\n
<tuple> <tuple>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>currency</string> <string>True</string>
<string>exchange_ratio</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>enctype</string> </key> <key> <string>enctype</string> </key>
<value> <string>application/x-www-form-urlencoded</string> </value> <value> <string>multipart/form-data</string> </value>
</item> </item>
<item> <item>
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
...@@ -143,6 +143,10 @@ ...@@ -143,6 +143,10 @@
<key> <string>update_action</string> </key> <key> <string>update_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>default</string> <string>default</string>
<string>precision</string> <string>precision</string>
<string>editable</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -84,10 +83,6 @@ ...@@ -84,10 +83,6 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>enctype</string> </key> <key> <string>enctype</string> </key>
<value> <string>application/x-www-form-urlencoded</string> </value> <value> <string>multipart/form-data</string> </value>
</item> </item>
<item> <item>
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
...@@ -143,6 +143,10 @@ ...@@ -143,6 +143,10 @@
<key> <string>update_action</string> </key> <key> <string>update_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>default</string> <string>default</string>
<string>precision</string> <string>precision</string>
<string>editable</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -84,10 +83,6 @@ ...@@ -84,10 +83,6 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getDestinationTotalAssetPrice() is None, None, cell.getDestinationAssetCredit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getDestinationTotalAssetPrice() is None, None, cell.getDestinationAssetDebit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getSourceTotalAssetPrice() is None, None, cell.getSourceAssetCredit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getSourceTotalAssetPrice() is None, None, cell.getSourceAssetDebit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:[(\'\', \'\')] + Base_getTranslatedAccountingWorkflowStateItemList()</string> </value> <value> <string>python:[(\'\', \'\')] + context.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:[(\'\', \'\')] + Base_getTranslatedAccountingWorkflowStateItemList()</string> </value> <value> <string>python:[(\'\', \'\')] + context.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -166,7 +166,7 @@ else:\n ...@@ -166,7 +166,7 @@ else:\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>node, payment_mode, payment, date=None, plan=False, batch_mode=0</string> </value> <value> <string>node, payment_mode, payment, date=None, plan=False, batch_mode=0, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -198,6 +198,7 @@ else:\n ...@@ -198,6 +198,7 @@ else:\n
<string>date</string> <string>date</string>
<string>plan</string> <string>plan</string>
<string>batch_mode</string> <string>batch_mode</string>
<string>kw</string>
<string>DateTime</string> <string>DateTime</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<string>listbox_source</string> <string>listbox_source</string>
<string>listbox_source_debit</string> <string>listbox_source_debit</string>
<string>listbox_source_credit</string> <string>listbox_source_credit</string>
<string>listbox_source_payment</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_columns</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string> <string>selection_name</string>
<string>stat_method</string> <string>stat_method</string>
...@@ -74,29 +73,6 @@ ...@@ -74,29 +73,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>source_debit</string>
<string>Debit</string>
</tuple>
<tuple>
<string>source_credit</string>
<string>Credit</string>
</tuple>
<tuple>
<string>source</string>
<string>Account</string>
</tuple>
<tuple>
<string>source_payment</string>
<string>Bank Account</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_view_listbox</string> </value> <value> <string>my_source_view_listbox</string> </value>
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<string>listbox_destination</string> <string>listbox_destination</string>
<string>listbox_destination_credit</string> <string>listbox_destination_credit</string>
<string>listbox_destination_debit</string> <string>listbox_destination_debit</string>
<string>listbox_destination_payment</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_columns</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string> <string>selection_name</string>
<string>stat_method</string> <string>stat_method</string>
...@@ -74,29 +73,6 @@ ...@@ -74,29 +73,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>destination_debit</string>
<string>Debit</string>
</tuple>
<tuple>
<string>destination_credit</string>
<string>Credit</string>
</tuple>
<tuple>
<string>destination</string>
<string>Account</string>
</tuple>
<tuple>
<string>destination_payment</string>
<string>Section Bank Account</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_destination_view_listbox</string> </value> <value> <string>my_destination_view_listbox</string> </value>
......
1358 1369
\ No newline at end of file \ No newline at end of file
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
\n
counter_site = context.getSource()\n
# check we don\'t change of user\n
context.Baobab_checkSameUserVault(counter_site)\n
# check that we are in the good accounting date\n
context.Baobab_checkCounterDateOpen(site=counter_site,\n
date=context.getStartDate())\n
# check that the counter is open\n
context.Baobab_checkCounterOpened(counter_site)\n
\n
if is_currency_sale:\n
foreign_currency_portal_type = outgoing_portal_type\n
default_currency_portal_type = incoming_portal_type\n
total_quantity = context.CurrencySale_getQuantity()\n
else:\n
foreign_currency_portal_type = incoming_portal_type\n
default_currency_portal_type = outgoing_portal_type\n
total_quantity = context.CurrencyPurchase_getQuantity()\n
\n
# check if an exchange rate is defined\n
if total_quantity is None:\n
raise ValidationFailed, (Message(domain=\'ui\',\n
message="No exchange rate defined for this currency at document date."))\n
\n
# check resource on currency fastinput\n
doc_resource = context.getResource()\n
for line in context.contentValues(portal_type=foreign_currency_portal_type):\n
if line.getResourceValue().getPriceCurrency() != doc_resource:\n
raise ValidationFailed, (Message(domain="ui",\n
message="Resource defined on document is different from currency cash."), )\n
\n
# check outgoing amount\n
if is_currency_sale:\n
amount = context.getSourceTotalAssetPrice()\n
else:\n
amount = context.getQuantity()\n
if amount is None or amount <= 0:\n
msg = Message(domain="ui", message="Amount is not valid.")\n
raise ValidationFailed, (msg, )\n
\n
# Reverse error messages in cash of currency purchase\n
default_msg = "Received amount is different from input cash."\n
foreign_msg = "Return amount is different from output cash"\n
if not is_currency_sale:\n
(default_msg, foreign_msg) = (foreign_msg, default_msg)\n
\n
# Check default currency amount consistency\n
if context.getTotalPrice(portal_type=[default_currency_portal_type,\n
\'Cash Delivery Cell\'], fast=0) != context.getQuantity():\n
raise ValidationFailed, (Message(domain="ui", message=default_msg), )\n
\n
# Check foreign currency amount consistency\n
if context.getTotalPrice(portal_type=[foreign_currency_portal_type,\n
\'Cash Delivery Cell\'], fast=0) != context.getSourceTotalAssetPrice():\n
raise ValidationFailed, (Message(domain="ui", message=foreign_msg), )\n
\n
# Check outgoing inventory\n
resource_one = context.CashDelivery_checkCounterInventory(\n
portal_type=outgoing_portal_type)\n
if resource_one == 2:\n
raise ValidationFailed, (Message(domain="ui", message="No Resource."), )\n
elif resource_one == 1:\n
raise ValidationFailed, (Message(domain="ui",\n
message="Insufficient balance"), )\n
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>incoming_portal_type, outgoing_portal_type, is_currency_sale</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>incoming_portal_type</string>
<string>outgoing_portal_type</string>
<string>is_currency_sale</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>_getattr_</string>
<string>context</string>
<string>counter_site</string>
<string>foreign_currency_portal_type</string>
<string>default_currency_portal_type</string>
<string>total_quantity</string>
<string>None</string>
<string>doc_resource</string>
<string>_getiter_</string>
<string>line</string>
<string>amount</string>
<string>msg</string>
<string>default_msg</string>
<string>foreign_msg</string>
<string>resource_one</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>CurrencySaleOrPurchase_validateVaultBalance</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -83,7 +83,7 @@ if at_date is None:\n ...@@ -83,7 +83,7 @@ if at_date is None:\n
tracking_kw = {\n tracking_kw = {\n
\'at_date\': at_date,\n \'at_date\': at_date,\n
\'node\': node,\n \'node\': node,\n
\'limit_expression\': (int(kw.get(\'list_start\')) or 0, int(kw.get(\'list_lines\')) or 20),\n \'limit_expression\': (int(kw.get(\'list_start\', 0)), int(kw.get(\'list_lines\', 20))),\n
}\n }\n
\n \n
request = context.REQUEST\n request = context.REQUEST\n
......
...@@ -53,78 +53,12 @@ ...@@ -53,78 +53,12 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>state_change[\'object\'].CurrencySaleOrPurchase_validateVaultBalance(\n
incoming_portal_type=\'Incoming Cash To Currency Purchase Line\',\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n outgoing_portal_type=\'Outgoing Cash To Currency Purchase Line\',\n
from Products.ERP5Type.Message import Message\n is_currency_sale=False,\n
transaction = state_change[\'object\']\n )\n
\n </string> </value>
currency = transaction.getResourceTitle()\n
encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/sortante"\n
\n
\n
ressource_title = transaction.getResourceTitle().lower()\n
ressource_title = ressource_title.replace(" ", "_")\n
encaisse_devise = "/encaisse_des_devises/%s/entrante" %(ressource_title)\n
\n
#encaisse_devise = "/encaisse_des_devises/%s/entrante" %(transaction.getResourceTitle().lower())\n
\n
counter_site = transaction.getSource()\n
\n
# check we don\'t change of user\n
transaction.Baobab_checkSameUserVault(counter_site)\n
\n
incoming_destination = counter_site + encaisse_devise\n
outgoing_source = counter_site + encaisse_billets_et_monnaies\n
\n
# check again that we are in the good accounting date\n
transaction.Baobab_checkCounterDateOpen(site=outgoing_source, date=transaction.getStartDate())\n
\n
# check again that the counter is open\n
\n
context.Baobab_checkCounterOpened(counter_site)\n
base_price = transaction.getSourceTotalAssetPrice()\n
# Check the amount.\n
\n
if base_price is None or base_price <= 0:\n
msg = Message(domain="ui", message="Amount is not valid.")\n
raise ValidationFailed, (msg,)\n
\n
# Check Taxes\n
fix_montant = transaction.getDiscount()\n
pourcentage = transaction.getDiscountRatio()\n
\n
# check resource on incoming line\n
doc_resource = transaction.getResource()\n
for line in transaction.contentValues(portal_type="Incoming Cash To Currency Purchase Line"):\n
if line.getResourceValue().getPriceCurrency() != doc_resource:\n
msg = Message(domain="ui", message="Resource defined on document is different from input cash.")\n
raise ValidationFailed, (msg,)\n
\n
resource_two = transaction.CashDelivery_checkCounterInventory(outgoing_source,portal_type=\'Outgoing Cash To Currency Purchase Line\')\n
\n
billetage_entre = transaction.getTotalPrice(portal_type=[\'Incoming Cash To Currency Purchase Line\', \'Cash Delivery Cell\'],fast=0)\n
billetage_sorti = transaction.getTotalPrice(portal_type=[\'Outgoing Cash To Currency Purchase Line\', \'Cash Delivery Cell\'],fast=0)\n
\n
\n
quantity = transaction.getQuantity()\n
\n
\n
if resource_two == 2:\n
msg = Message(domain="ui", message="No Resource.")\n
raise ValidationFailed, (msg,)\n
elif billetage_entre != base_price :\n
msg = Message(domain="ui", message="Received amount is different from input cash.")\n
raise ValidationFailed, (msg,)\n
elif billetage_sorti != quantity :\n
msg = Message(domain="ui", message="Return amount is different from output cash")\n
raise ValidationFailed, (msg,) \n
elif resource_two!= 0 :\n
msg = Message(domain="ui", message="Insufficient balance")\n
raise ValidationFailed, (msg,)\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -161,33 +95,9 @@ elif resource_two!= 0 :\n ...@@ -161,33 +95,9 @@ elif resource_two!= 0 :\n
<value> <value>
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>_getitem_</string>
<string>transaction</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>currency</string> <string>_getitem_</string>
<string>encaisse_billets_et_monnaies</string> <string>False</string>
<string>ressource_title</string>
<string>encaisse_devise</string>
<string>counter_site</string>
<string>incoming_destination</string>
<string>outgoing_source</string>
<string>context</string>
<string>base_price</string>
<string>None</string>
<string>msg</string>
<string>fix_montant</string>
<string>pourcentage</string>
<string>doc_resource</string>
<string>_getiter_</string>
<string>line</string>
<string>resource_two</string>
<string>billetage_entre</string>
<string>billetage_sorti</string>
<string>quantity</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -53,75 +53,11 @@ ...@@ -53,75 +53,11 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n <value> <string>state_change[\'object\'].CurrencySaleOrPurchase_validateVaultBalance(\n
from Products.ERP5Type.Message import Message\n incoming_portal_type=\'Incoming Cash To Currency Sale Line\',\n
transaction = state_change[\'object\']\n outgoing_portal_type=\'Outgoing Cash To Currency Sale Line\',\n
\n is_currency_sale=True,\n
currency = transaction.getResourceTitle()\n )\n
\n
var_ressource_title = transaction.getResourceTitle().lower()\n
var_ressource_title = var_ressource_title.replace(" ", "_")\n
encaisse_devise = "/encaisse_des_devises/%s/sortante" %(var_ressource_title)\n
#encaisse_devise = "/encaisse_des_devises/%s/sortante" %(transaction.getResourceTitle().lower())\n
\n
\n
encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/entrante"\n
\n
\n
# check resource on incoming line\n
doc_resource = transaction.getResource()\n
for line in transaction.contentValues(portal_type="Outgoing Cash To Currency Sale Line"):\n
if line.getResourceValue().getPriceCurrency() != doc_resource:\n
msg = Message(domain="ui", message="Resource defined on document is different from input cash.")\n
raise ValidationFailed, (msg,)\n
\n
counter_site = transaction.getSource()\n
\n
# check we don\'t change of user\n
transaction.Baobab_checkSameUserVault(counter_site)\n
\n
outgoing_source = counter_site + encaisse_devise\n
\n
# check again that we are in the good accounting date\n
transaction.Baobab_checkCounterDateOpen(site=outgoing_source, date=transaction.getStartDate())\n
\n
# check again that the counter is open\n
\n
context.Baobab_checkCounterOpened(counter_site)\n
\n
# use of the constraint : Test cash status line\n
#vliste = transaction.checkConsistency()\n
#transaction.log(\'vliste\', vliste)\n
#if len(vliste) != 0:\n
# raise ValidationFailed, (vliste[0].getMessage(),)\n
\n
\n
\n
resource_one = transaction.CashDelivery_checkCounterInventory(outgoing_source,portal_type=\'Outgoing Cash To Currency Sale Line\')\n
\n
\n
#billetage_entre = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash To Currency Sale Line\')\n
billetage_entre = transaction.getTotalPrice(portal_type=[\'Incoming Cash To Currency Sale Line\',\'Cash Delivery Cell\'],fast=0)\n
#billetage_sorti = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash To Currency Sale Line\')\n
billetage_sorti = transaction.getTotalPrice(portal_type=[\'Outgoing Cash To Currency Sale Line\', \'Cash Delivery Cell\'],fast=0)\n
\n
\n
base_price = transaction.getSourceTotalAssetPrice()\n
quantity = transaction.getQuantity()\n
\n
\n
if resource_one == 2:\n
msg = Message(domain="ui", message="No Resource.")\n
raise ValidationFailed, (msg,)\n
elif billetage_entre != quantity :\n
msg = Message(domain="ui", message="Received amount is different from input cash.")\n
raise ValidationFailed, (msg,)\n
elif billetage_sorti != base_price :\n
msg = Message(domain="ui", message="Return amount is different from output cash")\n
raise ValidationFailed, (msg,) \n
elif resource_one != 0 :\n
msg = Message(domain="ui", message="Insufficient balance")\n
raise ValidationFailed, (msg,)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -159,29 +95,9 @@ elif resource_one != 0 :\n ...@@ -159,29 +95,9 @@ elif resource_one != 0 :\n
<value> <value>
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>_getitem_</string>
<string>transaction</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>currency</string> <string>_getitem_</string>
<string>var_ressource_title</string> <string>True</string>
<string>encaisse_devise</string>
<string>encaisse_billets_et_monnaies</string>
<string>doc_resource</string>
<string>_getiter_</string>
<string>line</string>
<string>msg</string>
<string>counter_site</string>
<string>outgoing_source</string>
<string>context</string>
<string>resource_one</string>
<string>billetage_entre</string>
<string>billetage_sorti</string>
<string>base_price</string>
<string>quantity</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -88,8 +85,8 @@ uid = context.getUid()\n ...@@ -88,8 +85,8 @@ uid = context.getUid()\n
url = context.absolute_url()\n url = context.absolute_url()\n
title = context.getTitle() or (hasattr(context, \'getReference\') and context.getReference()) or context.getId()\n title = context.getTitle() or (hasattr(context, \'getReference\') and context.getReference()) or context.getId()\n
portal_type = context.getTranslatedPortalType()\n portal_type = context.getTranslatedPortalType()\n
website = context.getWebSiteValue() or context.REQUEST.get(\'current_web_site\')\n website = context.REQUEST.get(\'current_web_site\', context.getWebSiteValue())\n
popup = context.Document_getPopupInfo(context.REQUEST.get(\'current_web_site\')) or \'\'\n popup = (context.Document_getPopupInfo(website) or \'\').encode(\'utf-8\')\n
\n \n
found = context.Base_showFoundText()\n found = context.Base_showFoundText()\n
owner_html = getOwnerHTML(context) or \'\'\n owner_html = getOwnerHTML(context) or \'\'\n
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -53,13 +50,11 @@ ...@@ -53,13 +50,11 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>"""\n <value> <string>delivery_movement = context.getDeliveryValue()\n
By default the upgrade is never required for None of\n
Business template.\n
\n \n
This script will be probably rewrite on other skin folder.\n if delivery_movement is not None:\n
"""\n delivery = delivery_movement.getRootDeliveryValue()\n
return 0\n delivery.activate().Delivery_calculate()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -70,7 +65,7 @@ return 0\n ...@@ -70,7 +65,7 @@ return 0\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>bt5_title</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -90,13 +85,17 @@ return 0\n ...@@ -90,13 +85,17 @@ return 0\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>bt5_title</string> <string>_getattr_</string>
<string>context</string>
<string>delivery_movement</string>
<string>None</string>
<string>delivery</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -113,7 +112,7 @@ return 0\n ...@@ -113,7 +112,7 @@ return 0\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>TemplateTool_isUpdateCatalogRequired</string> </value> <value> <string>SimulationMovement_calculateCausalityState</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/> <global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/> <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -35,6 +32,12 @@ ...@@ -35,6 +32,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -73,6 +76,10 @@ ...@@ -73,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/> <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/> <global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/> <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/> <global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/> <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -35,6 +32,12 @@ ...@@ -35,6 +32,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -73,6 +76,10 @@ ...@@ -73,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/> <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/> <global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/> <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -32,6 +32,12 @@ ...@@ -32,6 +32,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -39,7 +45,7 @@ ...@@ -39,7 +45,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -70,6 +76,10 @@ ...@@ -70,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -81,32 +91,4 @@ ...@@ -81,32 +91,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>expr</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:not here.isTempDocument()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -87,32 +91,4 @@ ...@@ -87,32 +91,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>expr</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:not here.isTempDocument()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -97,32 +101,4 @@ ...@@ -97,32 +101,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>expr</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:not here.isTempDocument()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -87,32 +91,4 @@ ...@@ -87,32 +91,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>expr</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:not here.isTempDocument()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/> <global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/> <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -35,6 +32,12 @@ ...@@ -35,6 +32,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -42,7 +45,7 @@ ...@@ -42,7 +45,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -59,7 +62,7 @@ ...@@ -59,7 +62,7 @@
</item> </item>
<item> <item>
<key> <string>once_per_transaction</string> </key> <key> <string>once_per_transaction</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>portal_type_filter</string> </key> <key> <string>portal_type_filter</string> </key>
...@@ -73,6 +76,10 @@ ...@@ -73,6 +76,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -84,38 +91,4 @@ ...@@ -84,38 +91,4 @@
</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>expr</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:not here.isTempDocument()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/> <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -55,11 +52,13 @@ ...@@ -55,11 +52,13 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>simulation_movement = state_change[\'object\']\n <value> <string>simulation_movement = state_change[\'object\']\n
\n \n
delivery_movement = simulation_movement.getDeliveryValue()\n # It is not quite useful to invoke the method calculate when a newly created\n
\n # simulation movement is not indexed yet, so it is better to wait for the indexing\n
if delivery_movement is not None:\n # to be done.\n
delivery = delivery_movement.getExplanationValue()\n path = simulation_movement.getPath()\n
delivery.activate().Delivery_calculate()\n method_id_list = (\'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
simulation_movement.activate(after_path_and_method_id=(path, method_id_list)) \\\n
.SimulationMovement_calculateCausalityState()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -118,9 +117,8 @@ if delivery_movement is not None:\n ...@@ -118,9 +117,8 @@ if delivery_movement is not None:\n
<string>_getitem_</string> <string>_getitem_</string>
<string>simulation_movement</string> <string>simulation_movement</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>delivery_movement</string> <string>path</string>
<string>None</string> <string>method_id_list</string>
<string>delivery</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/> <global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/> <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
2010-10-12 yo
* Fix an error that calculate may be called too early before a new simulation movement is indexed.
2010-10-12 yo
* Tweak the configurations of several interaction workflows for optimization.
2010-09-30 yusei 2010-09-30 yusei
* Update movement_resource_interaction_workflow and set quantity unit value to movement forcedly if current value is acquired from resource. * Update movement_resource_interaction_workflow and set quantity unit value to movement forcedly if current value is acquired from resource.
......
869 879
\ No newline at end of file \ No newline at end of file
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>budget_special_node</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>budget_special_node</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Special Nodes for Budget</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Category" module="Products.ERP5Type.Document.Category"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>budget_special_node/all_other</string>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>all_other</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>All Others</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Category" module="Products.ERP5Type.Document.Category"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>budget_special_node/none</string>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>none</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>None</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,13 +2,29 @@ ...@@ -2,13 +2,29 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>acquire_local_roles</string> </key> <key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -56,6 +72,48 @@ ...@@ -56,6 +72,48 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>BudgetLine</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -89,10 +86,7 @@ ...@@ -89,10 +86,7 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -109,10 +103,7 @@ ...@@ -109,10 +103,7 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -79,10 +76,7 @@ ...@@ -79,10 +76,7 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -99,10 +93,7 @@ ...@@ -99,10 +93,7 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -81,10 +78,7 @@ ...@@ -81,10 +78,7 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -101,10 +95,7 @@ ...@@ -101,10 +95,7 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -81,10 +78,7 @@ ...@@ -81,10 +78,7 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -101,10 +95,7 @@ ...@@ -101,10 +95,7 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
...@@ -2,13 +2,29 @@ ...@@ -2,13 +2,29 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>acquire_local_roles</string> </key> <key> <string>acquire_local_roles</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -60,4 +76,42 @@ ...@@ -60,4 +76,42 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -2,13 +2,29 @@ ...@@ -2,13 +2,29 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>acquire_local_roles</string> </key> <key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -60,4 +76,42 @@ ...@@ -60,4 +76,42 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -2,13 +2,29 @@ ...@@ -2,13 +2,29 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>acquire_local_roles</string> </key> <key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -60,4 +76,42 @@ ...@@ -60,4 +76,42 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
<value> <value>
<list> <list>
<string>my_aggregate_title_list</string> <string>my_aggregate_title_list</string>
<string>my_include_virtual_none_node</string>
<string>my_include_virtual_other_node</string> <string>my_include_virtual_other_node</string>
</list> </list>
</value> </value>
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="ListField" module="Products.Formulator.StandardFields"/> <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_destination_payment</string> </value> <value> <string>my_include_virtual_none_node</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -18,14 +18,6 @@ ...@@ -18,14 +18,6 @@
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>The input failed the external validator.</string> </value>
</item> </item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>unknown_selection</string> </key>
<value> <string>You selected an item that was not in the list.</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -65,42 +57,14 @@ ...@@ -65,42 +57,14 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -130,9 +94,7 @@ ...@@ -130,9 +94,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
...@@ -142,44 +104,14 @@ ...@@ -142,44 +104,14 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -197,7 +129,7 @@ ...@@ -197,7 +129,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -219,43 +151,13 @@ ...@@ -219,43 +151,13 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Section Bank Account</string> </value> <value> <string>Include a Virtual Node For "None"</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -263,30 +165,4 @@ ...@@ -263,30 +165,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: \'destination_payment\' in [item[0] for item in context.AccountingTransaction_getListBoxColumnList(source=0)]</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.AccountingTransaction_getDestinationPaymentItemList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
333 336
\ No newline at end of file \ No newline at end of file
budget_line_type budget_line_type
budget_section budget_section
budget_special_node
budget_type budget_type
budget_variation budget_variation
inventory_axis inventory_axis
\ No newline at end of file
portal_categories/budget_special_node/**
portal_categories/budget_variation/** portal_categories/budget_variation/**
portal_categories/inventory_axis/** portal_categories/inventory_axis/**
\ No newline at end of file
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_dhtml_style</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="DTMLMethod" module="OFS.DTMLMethod"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>erp5_dhtml_style.js</string> </value>
</item>
<item>
<key> <string>_vars</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>globals</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
/*\n
Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.\n
Sebastien Robin <seb@nexedi.com>\n
\n
This program is Free Software; you can redistribute it and/or\n
modify it under the terms of the GNU General Public License\n
as published by the Free Software Foundation; either version 2\n
of the License, or (at your option) any later version.\n
\n
This program is distributed in the hope that it will be useful,\n
but WITHOUT ANY WARRANTY; without even the implied warranty of\n
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n
GNU General Public License for more details.\n
\n
You should have received a copy of the GNU General Public License\n
along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
*/\n
\n
/*\n
Note: this JavaScript is used to make parallel list field more user friendly\n
*/\n
\n
$(function() {\n
\n
// Make the parallel list field adding more elements automatically.\n
$(\'.input:has(.extensible_parallel_list_field)\').change(function(event) {\n
event.preventDefault();\n
var select_element = $(event.target)\n
var add_element = true;\n
var to_clone_element = select_element\n
var parent = select_element.parent()\n
if (parent[0].nodeName == \'DIV\') {\n
to_clone_element = parent\n
parent = parent.parent()\n
}\n
var select_list = parent.find(\'select\')\n
for(var x = select_list.length; x;) {\n
current_select = select_list[--x]\n
if (current_select.selectedIndex == 0)\n
{\n
add_element = false;\n
}\n
}\n
if (add_element) {\n
parent.append(jQuery(\'<label>&nbsp;</label>\'))\n
var cloned_element = to_clone_element.clone(true)\n
cloned_element[0].selectedIndex = 0\n
cloned_element.appendTo(parent)\n
parent.append(jQuery(\'<p class="clear">\'))\n
}\n
});\n
\n
});
]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
2010-10-12 Seb
* Create dhtml_style business template
\ No newline at end of file
Copyright (c) 2010 Nexedi SA
\ No newline at end of file
erp5_xhtml_style
\ No newline at end of file
On top of xhtml style, provide more interactions and animations, mostly thanks to javascripts.
\ No newline at end of file
GPL
\ No newline at end of file
seb
\ No newline at end of file
3
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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