Commit 998ed999 authored by Aurel's avatar Aurel

fix some field default + some other fixes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14141 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b2b2f9f9
...@@ -96,9 +96,7 @@ ...@@ -96,9 +96,7 @@
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
<value> <value>
<tuple> <tuple/>
<string>Manager</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -92,6 +92,12 @@ return context.getPortalObject().getProperty(\'reference_currency_id\')\n ...@@ -92,6 +92,12 @@ return context.getPortalObject().getProperty(\'reference_currency_id\')\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
...@@ -87,7 +87,7 @@ def getFunctionList(user_id=user_id):\n ...@@ -87,7 +87,7 @@ def getFunctionList(user_id=user_id):\n
\n \n
getFunctionList = CachingMethod(getFunctionList, id=\'Baobab_getUserAssignedFunctionList\', \n getFunctionList = CachingMethod(getFunctionList, id=\'Baobab_getUserAssignedFunctionList\', \n
cache_factory="erp5_ui_short")\n cache_factory="erp5_ui_short")\n
return getFunctionList()\n return getFunctionList(user_id=user_id)\n
]]></string> </value> ]]></string> </value>
......
...@@ -72,7 +72,6 @@ previous_state = None\n ...@@ -72,7 +72,6 @@ previous_state = None\n
found_given_state = 0\n found_given_state = 0\n
for workflow_item in workflow_item_list:\n for workflow_item in workflow_item_list:\n
current_state = workflow_item.getProperty(\'state\')\n current_state = workflow_item.getProperty(\'state\')\n
context.log(\'current_state\',current_state)\n
if current_state == state:\n if current_state == state:\n
found_given_state = 1\n found_given_state = 1\n
continue\n continue\n
......
...@@ -553,7 +553,7 @@ ...@@ -553,7 +553,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getSourcePaymentValue().getInternalBankAccountNumber()</string> </value> <value> <string>python: here.getSourcePaymentInternalBankAccountNumber()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getDestinationPaymentValue().getInternalBankAccountNumber()</string> </value> <value> <string>python: here.getDestinationPaymentInternalBankAccountNumber()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -208,6 +208,7 @@ for resource in resource_dict.keys():\n ...@@ -208,6 +208,7 @@ for resource in resource_dict.keys():\n
if current_resource_portal_type not in resource_portal_type:\n if current_resource_portal_type not in resource_portal_type:\n
continue\n continue\n
if len(resource)==3: # case of history\n if len(resource)==3: # case of history\n
context.log(\'movement uid before error\',resource[2])\n
movement = context.portal_catalog.getObject(resource[2])\n movement = context.portal_catalog.getObject(resource[2])\n
#context.log(\'movement\',movement)\n #context.log(\'movement\',movement)\n
explanation_value = movement\n explanation_value = movement\n
...@@ -231,11 +232,13 @@ for resource in resource_dict.keys():\n ...@@ -231,11 +232,13 @@ for resource in resource_dict.keys():\n
except KeyError:\n except KeyError:\n
resource_in_vault = {\'quantity\' : 0,\'total_price\' : 0}\n resource_in_vault = {\'quantity\' : 0,\'total_price\' : 0}\n
total_quantity = resource_in_vault[\'quantity\']\n total_quantity = resource_in_vault[\'quantity\']\n
total_price = resource_in_vault[\'total_price\']\n
if banknote_quantity_divisor is not None:\n if banknote_quantity_divisor is not None:\n
if current_resource_portal_type == \'Banknote\':\n if current_resource_portal_type == \'Banknote\':\n
total_quantity = round(total_quantity / banknote_quantity_divisor,0)\n total_quantity = round(total_quantity / banknote_quantity_divisor,0)\n
total_price = round(total_price / banknote_quantity_divisor,0)\n
tmp_dict.update({\'total_quantity\' : total_quantity,\n tmp_dict.update({\'total_quantity\' : total_quantity,\n
\'total_price\' : resource_in_vault[\'total_price\'],})\n \'total_price\' : total_price,})\n
if vault_report_type==\'history\':\n if vault_report_type==\'history\':\n
tmp_dict.update({\'date\':resource_in_vault[\'date\']})\n tmp_dict.update({\'date\':resource_in_vault[\'date\']})\n
general_total_price += resource_in_vault[\'total_price\']\n general_total_price += resource_in_vault[\'total_price\']\n
......
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
......
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getDestinationPaymentValue().getInternalBankAccountNumber()</string> </value> <value> <string>python: here.getDestinationPaymentInternalBankAccountNumber()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
205 207
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment