Skip to content

erp5
erp5
Commit 4de506b2 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 29 deletions
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList.xml
View file @ 4de506b2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList.xml
View file @ 4de506b2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovementModule_viewCheckbookMovementList.xml
View file @ 4de506b2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransferModule_viewCheckbookUsualCashTransferList.xml
View file @ 4de506b2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransferModule_viewCheckbookVaultTransferList.xml
View file @ 4de506b2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList.xml
View file @ 4de506b2
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
...@@ -84,6 +84,12 @@ ...@@ -84,6 +84,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_saveCheckbookFastInputLine.xml
View file @ 4de506b2
...@@ -101,6 +101,8 @@ for listbox_line in listbox:\n ...@@ -101,6 +101,8 @@ for listbox_line in listbox:\n
item_dict[\'destination_trade\'] = item.getDestinationTrade()\n item_dict[\'destination_trade\'] = item.getDestinationTrade()\n
item_dict["resource_value"] = item.getResourceValue()\n item_dict["resource_value"] = item.getResourceValue()\n
item_dict["check_amount"] = item.getCheckAmount()\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["aggregate_value"] = item\n
item_dict["quantity"] = 1\n item_dict["quantity"] = 1\n
delivery_line.edit(**item_dict)\n delivery_line.edit(**item_dict)\n
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReport.xml
View file @ 4de506b2
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
...@@ -88,25 +88,7 @@ ...@@ -88,25 +88,7 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>center</string> </key> <key> <string>hidden</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>
<value> <value>
<list/> <list/>
</value> </value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml
View file @ 4de506b2
...@@ -76,13 +76,19 @@ ...@@ -76,13 +76,19 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>left</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>my_vault</string> <string>my_vault</string>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml
View file @ 4de506b2
...@@ -104,7 +104,7 @@ for movement in movement_list:\n ...@@ -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 msg = Message(domain = "ui", message="Sorry, the price was not defined on some traveler checks")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
if total_debit>0:\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 # 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 # The default account chosen should act as some kind of *temp* account or *parent* account\n
movement = transaction.get(\'movement\',None)\n movement = transaction.get(\'movement\',None)\n
......
bt5/erp5_banking_check/bt/revision
View file @ 4de506b2
7 9
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7