Commit 4de506b2 authored by Sebastien Robin's avatar Sebastien Robin

better calculation of the exchange value on traveler check

smalle updates on some forms

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10590 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e14e6ffc
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -84,6 +84,12 @@
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -101,6 +101,8 @@ for listbox_line in listbox:\n
item_dict[\'destination_trade\'] = item.getDestinationTrade()\n
item_dict["resource_value"] = item.getResourceValue()\n
item_dict["check_amount"] = item.getCheckAmount()\n
item_dict["check_type"] = item.getCheckType()\n
item_dict["price_currency"] = item.getPriceCurrency()\n
item_dict["aggregate_value"] = item\n
item_dict["quantity"] = 1\n
delivery_line.edit(**item_dict)\n
......
......@@ -80,7 +80,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -88,25 +88,7 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
......
......@@ -76,13 +76,19 @@
<value>
<dictionary>
<item>
<key> <string>left</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>my_vault</string>
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -104,7 +104,7 @@ for movement in movement_list:\n
msg = Message(domain = "ui", message="Sorry, the price was not defined on some traveler checks")\n
raise ValidationFailed, (msg,)\n
if total_debit>0:\n
total_debit = round(total_debit+0.5)\n
total_debit = round(total_debit)\n
# Source and destination will be updated automaticaly based on the category of bank account\n
# The default account chosen should act as some kind of *temp* account or *parent* account\n
movement = transaction.get(\'movement\',None)\n
......
7
\ No newline at end of file
9
\ 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