Skip to content

erp5
erp5
Commit 116519cb authored by Aurel's avatar Aurel
Browse files
Options

fix allowed content type 

fix security on mutilated workflow

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18158 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 897379fd
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 11 deletions
bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 116519cb
......@@ -87,7 +87,6 @@
<item>Cash Delivery Cell</item>
</portal_type>
<portal_type id="Incoming Cash To Currency Purchase Line">
<item>Delivery Cell</item>
<item>Cash Delivery Cell</item>
</portal_type>
<portal_type id="Incoming Cash To Currency Sale Line">
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20To%20Currency%20Purchase%20Line.xml
View file @ 116519cb
......@@ -102,6 +102,10 @@
<key> <string>init_script</string> </key>
<value> <string></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/CashSorting_viewIncomingLineFastInputDialog.xml
View file @ 116519cb
......@@ -68,7 +68,7 @@
<value> <string>cash_detail_dict = {\'line_portal_type\' : \'Incoming Cash Sorting Line\'\n
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
, \'cash_status_list\' : [\'to_sort\',\'valid\',\'cancelled\',]\n
, \'emission_letter_list\' : [\'not_defined\',\'mixed\']\n
, \'emission_letter_list\' : None\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
, \'currency_cash_portal_type\': None\n
, \'read_only\' : False\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml
View file @ 116519cb
......@@ -81,10 +81,10 @@ if currency != context.Baobab_getPortalReferenceCurrencyID():\n
variation = [\'not_defined\']\n
else:\n
cash_status = [\'to_sort\', \'new_emitted\', \'valid\', \'not_defined\', \'mutilated\', \'error\']\n
site_codification = context.Baobab_getVaultSite(context.getSourceValue().getRelativeUrl()).getCodification()\n
emission_letter = [\'not_defined\', ]\n
if site_codification not in (\'\', None):\n
emission_letter.append(site_codification[0].lower())\n
if context.getSource() is not None:\n
source_letter = context.Baobab_getSiteEmissionLetter(context.Baobab_getVaultSite(context.getSourceValue().getRelativeUrl()))\n
emission_letter.append(source_letter)\n
variation = context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
\n
cash_detail_dict = {\'line_portal_type\' : \'Cash Delivery Line\'\n
......@@ -159,8 +159,7 @@ return context.CashDelivery_generateCashDetailInputDialog(listbox = None\n
<string>cash_status</string>
<string>emission_letter</string>
<string>variation</string>
<string>site_codification</string>
<string>_getitem_</string>
<string>source_letter</string>
<string>False</string>
<string>cash_detail_dict</string>
</tuple>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml
View file @ 116519cb
......@@ -349,8 +349,8 @@
<string>Exchanged Amount</string>
</tuple>
<tuple>
<string>source_decision_title</string>
<string>Reporter</string>
<string>deponent</string>
<string>Deponent</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml
View file @ 116519cb
......@@ -73,6 +73,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......@@ -109,6 +110,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml
View file @ 116519cb
......@@ -67,6 +67,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......@@ -97,6 +98,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml
View file @ 116519cb
......@@ -72,6 +72,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......@@ -108,6 +109,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml
View file @ 116519cb
......@@ -74,6 +74,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......@@ -110,6 +111,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignee</string>
<string>DestinationAssignor</string>
<string>Manager</string>
<string>Reviewer</string>
......
bt5/erp5_banking_cash/bt/revision
View file @ 116519cb
545
\ No newline at end of file
546
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
View file @ 116519cb
......@@ -32,7 +32,6 @@ Incoming Cash Balance Regulation Line | Cash Delivery Cell
Incoming Cash Exchange Line | Cash Delivery Cell
Incoming Cash Sorting Line | Cash Delivery Cell
Incoming Cash To Currency Purchase Line | Cash Delivery Cell
Incoming Cash To Currency Purchase Line | Delivery Cell
Incoming Cash To Currency Sale Line | Cash Delivery Cell
Incoming Classification Survey Line | Cash Delivery Cell
Incoming Mutilated Banknote Line | Cash Delivery Cell
......
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