Commit 8f355b4f authored by Jérome Perrin's avatar Jérome Perrin

- return immediatly if context matches

- fix a wrong state, on validation worklow it's invalidated not cancelled

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40164 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b997fc34
...@@ -53,6 +53,10 @@ ...@@ -53,6 +53,10 @@
<value> <string>"""Returns the main organisation for that group.\n <value> <string>"""Returns the main organisation for that group.\n
"""\n """\n
\n \n
if len(context.contentValues(filter=\n
dict(portal_type=\'Accounting Period\'))) or context.getMapping():\n
return context\n
\n
def getOrganisationForSectionCategory(section):\n def getOrganisationForSectionCategory(section):\n
mapping = section.getMappingRelatedValue(portal_type=\'Organisation\',\n mapping = section.getMappingRelatedValue(portal_type=\'Organisation\',\n
checked_permission=\'Access contents information\')\n checked_permission=\'Access contents information\')\n
...@@ -64,7 +68,7 @@ def getOrganisationForSectionCategory(section):\n ...@@ -64,7 +68,7 @@ def getOrganisationForSectionCategory(section):\n
checked_permission=\'Access contents information\')\n checked_permission=\'Access contents information\')\n
\n \n
for organisation in organisation_list:\n for organisation in organisation_list:\n
if organisation.getProperty(\'validation_state\', \'unset\') not in (\'deleted\', \'cancelled\'):\n if organisation.getProperty(\'validation_state\', \'unset\') not in (\'deleted\', \'invalidated\'):\n
return organisation\n return organisation\n
\n \n
\n \n
...@@ -104,6 +108,48 @@ return context\n ...@@ -104,6 +108,48 @@ return context\n
<tuple/> <tuple/>
</value> </value>
</item> </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>len</string>
<string>_getattr_</string>
<string>context</string>
<string>dict</string>
<string>getOrganisationForSectionCategory</string>
<string>group</string>
<string>None</string>
<string>group_chain</string>
<string>_getiter_</string>
<string>organisation</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Organisation_getMappingRelatedOrganisation</string> </value> <value> <string>Organisation_getMappingRelatedOrganisation</string> </value>
......
1382 1383
\ No newline at end of file \ 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