[Erp5-report] r13578 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 22 17:37:08 CET 2007
Author: aurel
Date: Thu Mar 22 17:36:07 2007
New Revision: 13578
URL: http://svn.erp5.org?rev=13578&view=rev
Log:
improve a bit code of init script
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabSourcePayment.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_init.xml?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingIncident_init.xml Thu Mar 22 17:36:07 2007
@@ -69,7 +69,10 @@
<item>
<key> <string>_body</string> </key>
<value> <string>user_site = context.Baobab_getUserAssignedRootSiteList()[0]\n
-context.edit(source=user_site)\n
+if user_site in (None, \'\'):\n
+ raise ValueError, "Unable to determine user site"\n
+else:\n
+ context.edit(source=user_site)\n
</string> </value>
</item>
<item>
@@ -122,8 +125,10 @@
<string>kw</string>
<string>_getitem_</string>
<string>_getattr_</string>
-<string>context</string>
+ <string>context</string>
<string>user_site</string>
+ <string>None</string>
+ <string>ValueError</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.xml?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.xml Thu Mar 22 17:36:07 2007
@@ -70,7 +70,7 @@
<key> <string>_body</string> </key>
<value> <string>site_list = context.Baobab_getUserAssignedSiteList()\n
if len(site_list) == 0:\n
- context.log("ClassificationSurvey_init", "unabled to determine site")\n
+ raise ValueError, "Unable to determine site"\n
\n
site = site_list[0]\n
site = context.Baobab_getVaultSite(site)\n
@@ -123,6 +123,7 @@
<string>context</string>
<string>site_list</string>
<string>len</string>
+ <string>ValueError</string>
<string>_getitem_</string>
<string>site</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_init.xml Thu Mar 22 17:36:07 2007
@@ -68,13 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># create a default banking operation line that will be updated later\n
-#context.edit(external_software=\'star\')\n
-\n
-transaction = context\n
-\n
-# XXX it might be better to set resource according to source_payment.\n
-transaction.setResource(\'currency_module/\' + context.Baobab_getPortalReferenceCurrencyID())\n
+ <value> <string>context.setResource(\'currency_module/\' + context.Baobab_getPortalReferenceCurrencyID())\n
\n
context.setDestination(context.getBaobabDestination())\n
\n
@@ -132,9 +126,8 @@
<value>
<tuple>
<string>kw</string>
+ <string>_getattr_</string>
<string>context</string>
- <string>transaction</string>
- <string>_getattr_</string>
<string>movement</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabSourcePayment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabSourcePayment.xml?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabSourcePayment.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabSourcePayment.xml Thu Mar 22 17:36:07 2007
@@ -68,9 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>context.log("MoneyDeposit_getBaobabDestinationPayment", "in get Destination Payment")\n
-\n
-return context.Baobab_getPortalDefaultPaymentNode()\n
+ <value> <string>return context.Baobab_getPortalDefaultPaymentNode()\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml Thu Mar 22 17:36:07 2007
@@ -69,7 +69,10 @@
<item>
<key> <string>_body</string> </key>
<value> <string>user_site = context.Baobab_getUserAssignedRootSiteList()[0]\n
-context.edit(source=user_site, source_trade=user_site)\n
+if user_site in (\'\', None):\n
+ raise ValueError, "Unable to determine site"\n
+else:\n
+ context.edit(source=user_site, source_trade=user_site)\n
</string> </value>
</item>
<item>
@@ -123,6 +126,8 @@
<string>_getattr_</string>
<string>context</string>
<string>user_site</string>
+ <string>None</string>
+ <string>ValueError</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=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Thu Mar 22 17:36:07 2007
@@ -1,1 +1,1 @@
-223
+225
More information about the Erp5-report
mailing list