Skip to content

erp5
erp5
Commit 25057f90 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

- new calculation on exchange line of mutilated banknotes 

- add new vault type for monetary recall
- few changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14823 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent dd8fe4d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1180 additions and 259 deletions
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Mutilated%20Banknote.xml
View file @ 25057f90
......@@ -115,6 +115,10 @@
<key> <string>init_script</string> </key>
<value> <string>MutilatedBanknote_init</string> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewIncomingLineFastInputDialog.xml
View file @ 25057f90
......@@ -67,7 +67,7 @@
<key> <string>_body</string> </key>
<value> <string>request = context.REQUEST\n
a = 1\n
cash_status = [\'to_sort\',\'valid\']\n
cash_status = [\'to_sort\']\n
cash_detail_dict = { \'line_portal_type\' : \'Incoming Cash Exchange Line\' # The portal type that the fastinput will create\n
, \'operation_currency\' : \'XOF\' # The operation currently\n
, \'cash_status_list\' : cash_status # List of possible cashStatus or None if all\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncident_viewIncomingLineFastInputDialog.xml
View file @ 25057f90
......@@ -69,7 +69,7 @@
currency = context.getResourceId()\n
\n
if currency != context.Baobab_getPortalReferenceCurrencyID():\n
cash_status = [\'not_defined\']\n
cash_status = [\'valid\']\n
emission_letter = [\'not_defined\']\n
variation = [\'not_defined\']\n
else:\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncident_viewOutgoingLineFastInputDialog.xml
View file @ 25057f90
......@@ -69,7 +69,7 @@
currency = context.getResourceId()\n
\n
if currency != context.Baobab_getPortalReferenceCurrencyID():\n
cash_status = [\'not_defined\']\n
cash_status = [\'valid\']\n
emission_letter = [\'not_defined\']\n
variation = [\'not_defined\']\n
else:\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
View file @ 25057f90
......@@ -69,8 +69,8 @@
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
, \'cash_status_list\' : [\'to_sort\',]\n
, \'emission_letter_list\' : [\'not_defined\',]\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1)\n
, \'currency_cash_portal_type\': \'Banknote\'\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
, \'currency_cash_portal_type\': None\n
, \'read_only\' : False\n
, \'column_base_category\' : \'variation\'\n
}\n
......@@ -128,9 +128,9 @@ return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>None</string>
<string>False</string>
<string>cash_detail_dict</string>
<string>None</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencyPurchase_view.xml
View file @ 25057f90
......@@ -104,6 +104,7 @@
<value>
<list>
<string>my_start_date</string>
<string>your_price</string>
<string>my_price</string>
<string>my_discount_ratio</string>
<string>my_quantity</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencySale_view.xml
View file @ 25057f90
......@@ -111,6 +111,7 @@
<value>
<list>
<string>my_start_date</string>
<string>your_price</string>
<string>my_price</string>
<string>my_discount_ratio</string>
<string>my_quantity</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencySale_viewIncomingLineFastInputDialog.xml
View file @ 25057f90
......@@ -69,7 +69,7 @@
source = context.getSource()\n
source_section = context.getSourceSection()\n
\n
cash_status = [\'to_sort\',\'valid\']\n
cash_status = [\'to_sort\']\n
emission_letter = [\'not_defined\']\n
variation = context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_view/my_source.xml
View file @ 25057f90
......@@ -273,11 +273,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencyPurchase_view.xml
View file @ 25057f90
......@@ -119,6 +119,7 @@
<value>
<list>
<string>my_start_date</string>
<string>your_price</string>
<string>my_price</string>
<string>my_discount_ratio</string>
<string>my_quantity</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySale_view.xml
View file @ 25057f90
......@@ -119,6 +119,7 @@
<value>
<list>
<string>my_start_date</string>
<string>rate</string>
<string>my_price</string>
<string>my_discount_ratio</string>
<string>my_quantity</string>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ExchangedMutilatedBanknoteLine_getBaobabDestination.xml
View file @ 25057f90
......@@ -65,7 +65,19 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
<value> <string>destination = "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
\n
# If it was sent to headquarters, the destination\n
# must be None\n
parent = context.getParentValue()\n
for workflow_item in \\\n
parent.Base_getWorkflowHistoryItemList(\'mutilated_banknote_workflow\',\n
display=0):\n
if workflow_item.state == \'planned\':\n
destination = None\n
break\n
\n
return destination\n
</string> </value>
</item>
<item>
......@@ -118,6 +130,11 @@
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>destination</string>
<string>parent</string>
<string>_getiter_</string>
<string>workflow_item</string>
<string>None</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryRecallCell_getBaobabDestinationVariationText.xml
View file @ 25057f90
......@@ -68,6 +68,7 @@
<value> <string>var = context.getVariationText() \n
dest_var = var.replace("cancelled", "retired")\n
dest_var = dest_var.replace("mutilated", "retired")\n
dest_var = dest_var.replace("error", "retired")\n
return dest_var\n
</string> </value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryRecallLine_getBaobabDestinationVariationText.xml
View file @ 25057f90
......@@ -68,6 +68,7 @@
<value> <string>var = context.getVariationText() \n
dest_var = var.replace("cancelled", "retired")\n
dest_var = dest_var.replace("mutilated", "retired")\n
dest_var = dest_var.replace("error", "retired")\n
return dest_var\n
</string> </value>
</item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryRecall_getBaobabDestination.xml
View file @ 25057f90
......@@ -68,9 +68,9 @@
<value> <string>source = context.getSource()\n
if source != None:\n
if not \'ventilation\' in source:\n
return "%s/serre/encaisse_des_billets_retires_de_la_circulation" %("/".join(source.split("/")[:-2]),)\n
return "%s/caveau/serre/encaisse_des_billets_retires_de_la_circulation" %("/".join(source.split("/")[:-3]),)\n
else:\n
return "%s/serre/encaisse_des_billets_retires_de_la_circulation" %("/".join(source.split("/")[:-3]),)\n
return "%s/caveau/serre/encaisse_des_billets_retires_de_la_circulation" %("/".join(source.split("/")[:-4]),)\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryRecall_view/my_source.xml
View file @ 25057f90
......@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_sortItemList(here.Delivery_getVaultItemList(vault_type = (\'site/caveau/auxiliaire\',), exclude_vault_type=(\'site/caveau/auxiliaire/externe/transit\',),user_site = 1)+here.Delivery_getVaultItemList(vault_type = (\'site/caveau/auxiliaire/encaisse_des_externes\',), user_site = 1,leaf_node=0,strict_membership=1))</string> </value>
<value> <string>python:here.Base_sortItemList(here.Delivery_getVaultItemList(vault_type = (\'site/caveau/auxiliaire\',\'site/surface/caisse_courante\',), exclude_vault_type=(\'site/caveau/auxiliaire/externe/transit\',),user_site = 1)+here.Delivery_getVaultItemList(vault_type = (\'site/caveau/auxiliaire/encaisse_des_externes\',), user_site = 1,leaf_node=0,strict_membership=1))</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDepositRendering_viewLineFastInputDialog.xml
View file @ 25057f90
......@@ -76,7 +76,7 @@ if currency is None :\n
return request.RESPONSE.redirect( redirect_url )\n
\n
if currency != context.Baobab_getPortalReferenceCurrencyID():\n
cash_status = [\'not_defined\']\n
cash_status = [\'valid\']\n
emission_letter = [\'not_defined\']\n
variation = [\'not_defined\']\n
else:\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_viewMoneyDepositLineFastInputAction.xml
View file @ 25057f90
......@@ -65,7 +65,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>cash_status = [\'to_sort\',\'valid\']\n
<value> <string>cash_status = [\'to_sort\']\n
emission_letter = [\'not_defined\',]\n
variation = context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_view.xml
View file @ 25057f90
......@@ -102,7 +102,7 @@
<list>
<string>my_source_reference</string>
<string>my_destination</string>
<string>my_source_decision_title</string>
<string>my_deponent</string>
<string>my_source_total_asset_price</string>
<string>my_destination_total_asset_price</string>
<string>my_source_trade</string>
......
bt5/erp5_banking_cash/bt/revision
View file @ 25057f90
355
\ No newline at end of file
358
\ 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