diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList.xml index c076a0b9dd0bec680c0ce7a3c4218a88a13decc9..01971cf27e75ad840a5a1b4ce35432552a2c95b9 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList.xml index 530a8210d7db986c003884c71a239560dff2c78d..c9d1b2f9c74619206d3799f57e2ca215f2c84e99 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovementModule_viewCheckbookMovementList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovementModule_viewCheckbookMovementList.xml index 9c1911aa2e3aee033d5db7b2fa8f87b361bb42ee..f1c8bbc4c2adb026be823f678efe94df3eba415a 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovementModule_viewCheckbookMovementList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovementModule_viewCheckbookMovementList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransferModule_viewCheckbookUsualCashTransferList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransferModule_viewCheckbookUsualCashTransferList.xml index 555a3bce7927ee428c0f3d7bc1d5b5cfb4dfb272..356c6a19e61f72c9b5ed6e32831150c5088bdf22 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransferModule_viewCheckbookUsualCashTransferList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransferModule_viewCheckbookUsualCashTransferList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransferModule_viewCheckbookVaultTransferList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransferModule_viewCheckbookVaultTransferList.xml index 01846d6b253234445776651adbd0ac298d10eae3..5599704b39c234bfd1bc75687525ae82a54a62b1 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransferModule_viewCheckbookVaultTransferList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransferModule_viewCheckbookVaultTransferList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList.xml index 21f18db6b97d6a89dcd5997a9652fbbcda30aab0..a93fe3ce2e858505b4d0674c8f4f48b1de8ba401 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList.xml @@ -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> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_saveCheckbookFastInputLine.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_saveCheckbookFastInputLine.xml index 81cbaa0ede78723ee682f5b869038e0780cae523..98cc28743efc39097bd5637f3522728c0ef17adb 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_saveCheckbookFastInputLine.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_saveCheckbookFastInputLine.xml @@ -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 diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReport.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReport.xml index dc26374a8f12a014501b9108b456059ed5069fa3..9e132e13bf2156e471a78a4c7ce436eb0e8eef1a 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReport.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReport.xml @@ -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> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml index ccdbfac5da3363e11c733d6ce40d19b4e2077b84..e5ffa48f81390dd3a81bf9010eb98ca64bcf39a6 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml @@ -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> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml index 63f26baf48914fcf01658fcc120eae8cbeb0f1f5..33b813f224ac94518f0ed8274075da2d79a4f5c7 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml @@ -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 diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index c7930257dfef505fd996e1d6f22f2f35149990d0..f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -7 \ No newline at end of file +9 \ No newline at end of file