[Erp5-report] r13294 - in /erp5/trunk/bt5/erp5_banking_cash: ActionTemplateItem/portal_type...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 8 17:21:09 CET 2007
Author: vincent
Date: Thu Mar 8 17:20:47 2007
New Revision: 13294
URL: http://svn.erp5.org?rev=13294&view=rev
Log:
Update action visibility conditions to match workflow states update.
Update getBaobabDestination accessor to "remove" exchanged mutilated banknotes from mutilated banknotes vault (they are added with a "canceled" state into the coins & banknotes vault).
Update available variations of banknotes available in the outgoing fast input.
Modified:
erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/exchanged_line_fast_input.xml
erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/returned_line_fast_input.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingMutilatedBanknoteLine_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_viewOutgoingLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/exchanged_line_fast_input.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%2520Banknote/exchanged_line_fast_input.xml?rev=13294&r1=13293&r2=13294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/exchanged_line_fast_input.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/exchanged_line_fast_input.xml Thu Mar 8 17:20:47 2007
@@ -104,7 +104,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: here.getSimulationState() == "planned"</string> </value>
+ <value> <string>python: here.getSimulationState() in ("stopped", "planned")</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/returned_line_fast_input.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%2520Banknote/returned_line_fast_input.xml?rev=13294&r1=13293&r2=13294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/returned_line_fast_input.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Mutilated%20Banknote/returned_line_fast_input.xml Thu Mar 8 17:20:47 2007
@@ -104,7 +104,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: here.getSimulationState() == "confirmed"</string> </value>
+ <value> <string>python: here.getSimulationState() == "finished"</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingMutilatedBanknoteLine_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingMutilatedBanknoteLine_getBaobabDestination.xml?rev=13294&r1=13293&r2=13294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingMutilatedBanknoteLine_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingMutilatedBanknoteLine_getBaobabDestination.xml Thu Mar 8 17:20:47 2007
@@ -68,14 +68,15 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># if sent to headquarter, line must not exist\n
-if not \'siege\' in context.getSource():\n
- # if we sent to headquarter, we have order the document at one time\n
- for workflow_item in context.getParentValue().Base_getWorkflowHistoryItemList(\'mutilated_banknote_workflow\',display=0):\n
- if workflow_item.getProperty(\'action\')==\'order_action\':\n
- return None\n
+ <value> <string># When the parent document (Mutilated Banknote) is finished or delivered, the mutilated banknotes must not be put in the "caisse_coutante/billets_mutiles"\n
+# In reality, they are moved to "caisse_courante/billets_mutiles" with "canceled" status.\n
+# To do this, the "mutilated" from "caisse_courante/billets_mutiles" are destroyed from erp5 point of view and new ones with state "canceled" are added to "caisse_courante/encaisse_des_billets_et_monnaies".\n
+# See ExchangedMutilatedBanknoteLine_getBaobabDestination (those lines are created at "planned" state).\n
\n
-return context.getDestination()\n
+if context.getParent().getSimulationState() in (\'finished\', \'delivered\'):\n
+ return None\n
+else:\n
+ return \'%s/surface/caisse_courante/billets_mutiles\' % (context.getParent().getSource(), )\n
</string> </value>
</item>
<item>
@@ -128,8 +129,6 @@
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
- <string>_getiter_</string>
- <string>workflow_item</string>
<string>None</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_viewOutgoingLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_viewOutgoingLineFastInputDialog.xml?rev=13294&r1=13293&r2=13294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_viewOutgoingLineFastInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_viewOutgoingLineFastInputDialog.xml Thu Mar 8 17:20:47 2007
@@ -70,8 +70,8 @@
<key> <string>_body</string> </key>
<value> <string>cash_detail_dict = {\'line_portal_type\' : \'Outgoing Mutilated Banknote Line\'\n
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
- , \'cash_status_list\' : None\n
- , \'emission_letter_list\' : None\n
+ , \'cash_status_list\' : [\'new_emitted\', \'valid\']\n
+ , \'emission_letter_list\' : context.Baobab_getUserEmissionLetterList()\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1)\n
, \'currency_cash_portal_type\': \'Banknote\'\n
, \'read_only\' : False\n
@@ -131,9 +131,9 @@
<tuple>
<string>_getattr_</string>
<string>context</string>
- <string>None</string>
<string>False</string>
<string>cash_detail_dict</string>
+ <string>None</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=13294&r1=13293&r2=13294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Thu Mar 8 17:20:47 2007
@@ -1,1 +1,1 @@
-207
+209
More information about the Erp5-report
mailing list