[Erp5-report] r14072 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 13 16:13:57 CEST 2007
Author: aurel
Date: Fri Apr 13 16:13:47 2007
New Revision: 14072
URL: http://svn.erp5.org?rev=14072&view=rev
Log:
many changes
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetarySurvey_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml Fri Apr 13 16:13:47 2007
@@ -82,7 +82,7 @@
emissionLetter = [\'not_defined\']\n
variation = [\'not_defined\']\n
else:\n
- cashStatus = [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\',\'error\']\n
+ cashStatus = [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\',\'error\',\'mixed\']\n
emissionLetter = None\n
variation = context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
\n
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml Fri Apr 13 16:13:47 2007
@@ -67,8 +67,9 @@
<key> <string>_body</string> </key>
<value> <string>site_list = context.Baobab_getUserAssignedSiteList()\n
if len(site_list) == 0:\n
- context.log("DestructionSurvey_init", "unabled to determine site")\n
- return\n
+ from Products.ERP5Type.Message import Message\n
+ message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
+ raise ValueError,message\n
\n
site = site_list[0]\n
\n
@@ -128,6 +129,10 @@
<string>context</string>
<string>site_list</string>
<string>len</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>message</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_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_getBaobabDestination.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_getBaobabDestination.xml Fri Apr 13 16:13:47 2007
@@ -73,7 +73,8 @@
return None\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
for site in site_list:\n
- if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\') and (destination in site or site in destination):\n
+# if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\') and (destination in site or site in destination):\n
+ if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\') and destination in site:\n
return site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetarySurvey_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetarySurvey_init.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetarySurvey_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetarySurvey_init.xml Fri Apr 13 16:13:47 2007
@@ -67,8 +67,9 @@
<key> <string>_body</string> </key>
<value> <string>site_list = context.Baobab_getUserAssignedSiteList()\n
if len(site_list) == 0:\n
- context.log("MonetarySurvey_init", "unabled to determine site")\n
- return\n
+ from Products.ERP5Type.Message import Message\n
+ message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
+ raise ValueError,message\n
\n
site = site_list[0]\n
site = context.Baobab_getVaultSite(site)\n
@@ -128,6 +129,10 @@
<string>context</string>
<string>site_list</string>
<string>len</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>message</string>
+ <string>ValueError</string>
<string>_getitem_</string>
<string>site</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml Fri Apr 13 16:13:47 2007
@@ -76,7 +76,7 @@
return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
elif emission_letter==\'not_defined\':\n
# remaining banknote which are not sorted yet, or cancelled one\n
- if not \'ventilation\' in context.getSource():\n
+ if not \'ventilation\' in context.getSource() and (context.getCashStatus() not in (\'mixed\',)):\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
if context.getCashStatus() in ("mixed", "to_sort"):\n
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml Fri Apr 13 16:13:47 2007
@@ -78,6 +78,10 @@
caisse_incoming = counter_site + encaisse_billets_et_monnaies_entrante\n
caisse_outgoing = counter_site + encaisse_billets_et_monnaies_sortante\n
\n
+# check again that we are in the good accounting date\n
+if not transaction.Baobab_checkCounterDateOpen():\n
+ msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
+ raise ValidationFailed, (msg,)\n
\n
\n
\n
@@ -168,11 +172,11 @@
<string>counter_site</string>
<string>caisse_incoming</string>
<string>caisse_outgoing</string>
+ <string>msg</string>
<string>resource_two</string>
<string>incoming_total</string>
<string>outgoing_total</string>
<string>amount_total</string>
- <string>msg</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml Fri Apr 13 16:13:47 2007
@@ -69,7 +69,7 @@
from Products.ERP5Type.Message import Message\n
\n
# Purchase Transaction .\n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
\n
\n
# use of the constraint : Test if quantity is multiple of 1000\n
@@ -156,11 +156,11 @@
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
+ <string>_getitem_</string>
+ <string>transaction</string>
<string>_getattr_</string>
- <string>transaction</string>
<string>vliste</string>
<string>len</string>
- <string>_getitem_</string>
<string>vault</string>
<string>resource</string>
<string>msg</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=14072&r1=14071&r2=14072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Apr 13 16:13:47 2007
@@ -1,1 +1,1 @@
-272
+275
More information about the Erp5-report
mailing list