[Erp5-report] r23923 - in /erp5/trunk/bt5/erp5_accounting: ActionTemplateItem/portal_types/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Oct 1 09:59:21 CEST 2008
Author: jerome
Date: Wed Oct 1 09:59:16 2008
New Revision: 23923
URL: http://svn.erp5.org?rev=23923&view=rev
Log:
Purchase Invoice Transaction has two views with exclusive conditions; change the conditions to prevent switching to source view when setting a source section member of the preferred group
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml
Modified:
erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view.xml
erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_source.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/view.xml?rev=23923&r1=23922&r2=23923&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view.xml Wed Oct 1 09:59:16 2008
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>action</string> </key>
<value>
@@ -93,7 +87,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:not(object.AccountingTransaction_isSourceView())</string> </value>
+ <value> <string>object/AccountingTransaction_isDestinationView</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/view_source.xml?rev=23923&r1=23922&r2=23923&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_source.xml Wed Oct 1 09:59:16 2008
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>action</string> </key>
<value>
@@ -93,7 +87,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:object.AccountingTransaction_isSourceView()</string> </value>
+ <value> <string>not: object/AccountingTransaction_isDestinationView</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml?rev=23923&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml Wed Oct 1 09:59:16 2008
@@ -1,0 +1,134 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>destination = context.getDestinationSectionValue()\n
+section_category = context.portal_preferences\\\n
+ .getPreferredAccountingTransactionSectionCategory()\n
+if destination is not None and section_category:\n
+ if destination.getPortalType() == \'Person\':\n
+ return 0\n
+ if destination.isMemberOf(section_category):\n
+ return 1\n
+\n
+return 0\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>destination</string>
+ <string>section_category</string>
+ <string>None</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransaction_isDestinationView</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=23923&r1=23922&r2=23923&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Oct 1 09:59:16 2008
@@ -1,1 +1,1 @@
-781
+783
More information about the Erp5-report
mailing list