[Erp5-report] r21347 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 5 14:00:10 CEST 2008
Author: aurel
Date: Thu Jun 5 14:00:10 2008
New Revision: 21347
URL: http://svn.erp5.org?rev=21347&view=rev
Log:
update code :
* defined more security on wf state and transition
* remove log
Modified:
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml Thu Jun 5 14:00:10 2008
@@ -94,6 +94,14 @@
<value> <string>bank_account</string> </value>
</item>
<item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>errors</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml Thu Jun 5 14:00:10 2008
@@ -70,7 +70,7 @@
\n
orga_id = "site_%3s" %(site.getCodification())\n
org = context.organisation_module[orga_id]\n
-context.log(\'org\',org)\n
+\n
return org\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml Thu Jun 5 14:00:10 2008
@@ -70,9 +70,8 @@
\n
object_to_check_list = [context]\n
object_to_check_list.extend(context.getMovementList())\n
-context.log("object to check", object_to_check_list)\n
+\n
for object in object_to_check_list:\n
- context.log("object", object)\n
baobab_source = object.getBaobabSource()\n
baobab_destination = object.getBaobabDestination()\n
\n
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml Thu Jun 5 14:00:10 2008
@@ -153,9 +153,7 @@
# resource_dict[\'simulation_state_title\'] = movement.getTranslatedSimulationStateTitle()\n
# resource_dict[\'explanation_translated_relative_url\'] = "%s/%s" % \\\n
# (explanation_value.getTranslatedPortalType(),source_reference)\n
-# context.log("explanation_uid", explanation_uid)\n
catalog_explanation = cache_dict[\'cache_explanation\'][explanation_uid]\n
-# context.log("explanation_uid url", catalog_explanation.relative_url)\n
resource_dict[\'explanation_relative_url\'] = catalog_explanation.relative_url\n
source_reference = catalog_explanation.source_reference\n
resource_dict[\'source_reference\'] = catalog_explanation.source_reference\n
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml Thu Jun 5 14:00:10 2008
@@ -30,6 +30,12 @@
<value> <string>cancelled</string> </value>
</item>
<item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>title</string> </key>
<value> <string>Cancelled</string> </value>
</item>
@@ -48,4 +54,55 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>AccessContentsInformation</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml Thu Jun 5 14:00:10 2008
@@ -65,9 +65,37 @@
<value>
<dictionary>
<item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>Delete objects</string> </key>
<value>
<tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml Thu Jun 5 14:00:10 2008
@@ -38,6 +38,7 @@
<value>
<tuple>
<string>confirm</string>
+ <string>delete</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml Thu Jun 5 14:00:10 2008
@@ -16,8 +16,83 @@
</value>
</item>
<item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>cancelled</string> </value>
+ </item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Cancelled</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>AccessContentsInformation</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml Thu Jun 5 14:00:10 2008
@@ -83,7 +83,9 @@
<item>
<key> <string>Modify portal content</string> </key>
<value>
- <tuple/>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml Thu Jun 5 14:00:10 2008
@@ -83,7 +83,9 @@
<item>
<key> <string>Modify portal content</string> </key>
<value>
- <tuple/>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml Thu Jun 5 14:00:10 2008
@@ -67,6 +67,11 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+from Products.ERP5Type.Message import Message\n
+from DateTime import DateTime\n
+\n
+\n
exchange_line = state_change[\'object\']\n
\n
# In this script, we will make sure it is impossible to get two \n
@@ -76,9 +81,6 @@
msg = Message(domain = \'ui\', message = \'Sorry, you must define a fixing price.\')\n
raise ValidationFailed, (msg,)\n
\n
-from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-from Products.ERP5Type.Message import Message\n
-from DateTime import DateTime\n
\n
# We have to looking for other currency exchanges lines\n
from Products.ERP5Type.Document import newTempBase\n
@@ -160,16 +162,16 @@
<tuple>
<string>state_change</string>
<string>kw</string>
+ <string>Products.DCWorkflow.DCWorkflow</string>
+ <string>ValidationFailed</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>DateTime</string>
<string>_getitem_</string>
<string>exchange_line</string>
<string>_getattr_</string>
<string>None</string>
- <string>Message</string>
<string>msg</string>
- <string>ValidationFailed</string>
- <string>Products.DCWorkflow.DCWorkflow</string>
- <string>Products.ERP5Type.Message</string>
- <string>DateTime</string>
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
<string>context</string>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=21347&r1=21346&r2=21347&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Thu Jun 5 14:00:10 2008
@@ -1,1 +1,1 @@
-438
+440
More information about the Erp5-report
mailing list