[Erp5-report] r18158 - in /erp5/trunk/bt5/erp5_banking_cash: PortalTypeAllowedContentTypeTe...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 10 10:54:32 CET 2007
Author: aurel
Date: Mon Dec 10 10:54:31 2007
New Revision: 18158
URL: http://svn.erp5.org?rev=18158&view=rev
Log:
fix allowed content type
fix security on mutilated workflow
Modified:
erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20To%20Currency%20Purchase%20Line.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Mon Dec 10 10:54:31 2007
@@ -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">
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20To%20Currency%20Purchase%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%2520Cash%2520To%2520Currency%2520Purchase%2520Line.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20To%20Currency%20Purchase%20Line.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20To%20Currency%20Purchase%20Line.xml Mon Dec 10 10:54:31 2007
@@ -103,6 +103,10 @@
<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>
<tuple/>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml Mon Dec 10 10:54:31 2007
@@ -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
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_viewLineFastInputDialog.xml Mon Dec 10 10:54:31 2007
@@ -81,10 +81,10 @@
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 @@
<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>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknoteModule_viewMutilatedBanknoteList/listbox.xml Mon Dec 10 10:54:31 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/cancelled.xml Mon Dec 10 10:54:31 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/delivered.xml Mon Dec 10 10:54:31 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/finished.xml Mon Dec 10 10:54:31 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/states/planned.xml Mon Dec 10 10:54:31 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Mon Dec 10 10:54:31 2007
@@ -1,1 +1,1 @@
-545
+546
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list?rev=18158&r1=18157&r2=18158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list Mon Dec 10 10:54:31 2007
@@ -32,7 +32,6 @@
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
More information about the Erp5-report
mailing list