From 7df96e313cc540a51f00dd0723d191fdee6b5d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Tue, 26 Jun 2007 13:14:57 +0000 Subject: [PATCH] when classification, don't display line for coin git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14979 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...shSortingIncident_viewIncomingLineFastInputDialog.xml | 9 ++++++++- ...shSortingIncident_viewOutgoingLineFastInputDialog.xml | 9 ++++++++- bt5/erp5_banking_cash/bt/revision | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewIncomingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewIncomingLineFastInputDialog.xml index 639ca69c49..4dee6ad7d7 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewIncomingLineFastInputDialog.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewIncomingLineFastInputDialog.xml @@ -67,11 +67,17 @@ <key> <string>_body</string> </key> <value> <string>request = context.REQUEST\n \n +# no coin if classification\n +if \'ventilation\' in context.getSource(""):\n + coin = 0\n +else:\n + coin = 1\n +\n cash_detail_dict = {\'line_portal_type\' : \'Incoming Cash Sorting Incident Line\'\n , \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n , \'cash_status_list\' : None\n , \'emission_letter_list\' : None\n - , \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n + , \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=coin)\n , \'currency_cash_portal_type\': None\n , \'read_only\' : False\n , \'column_base_category\' : \'variation\'\n @@ -132,6 +138,7 @@ return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n <string>_getattr_</string> <string>context</string> <string>request</string> + <string>coin</string> <string>None</string> <string>False</string> <string>cash_detail_dict</string> diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewOutgoingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewOutgoingLineFastInputDialog.xml index b841f2171a..440a3b45ea 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewOutgoingLineFastInputDialog.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_viewOutgoingLineFastInputDialog.xml @@ -67,11 +67,17 @@ <key> <string>_body</string> </key> <value> <string>request = context.REQUEST\n \n +# no coin if classification\n +if \'ventilation\' in context.getSource(""):\n + coin = 0\n +else:\n + coin = 1\n +\n cash_detail_dict = {\'line_portal_type\' : \'Outgoing Cash Sorting Incident Line\'\n , \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n , \'cash_status_list\' : None\n , \'emission_letter_list\' : None\n - , \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n + , \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=coin)\n , \'currency_cash_portal_type\': None\n , \'read_only\' : False\n , \'column_base_category\' : \'variation\'\n @@ -132,6 +138,7 @@ return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n <string>_getattr_</string> <string>context</string> <string>request</string> + <string>coin</string> <string>None</string> <string>False</string> <string>cash_detail_dict</string> diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index e8930b6df9..b18d64367d 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -364 \ No newline at end of file +366 \ No newline at end of file -- 2.30.9