[Erp5-report] r24492 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Nov 5 14:01:02 CET 2008
Author: aurel
Date: Wed Nov 5 14:00:58 2008
New Revision: 24492
URL: http://svn.erp5.org?rev=24492&view=rev
Log:
add missing variables and missing verification in workflow transition and fast input
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_viewLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml?rev=24492&r1=24491&r2=24492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml [utf8] Wed Nov 5 14:00:58 2008
@@ -69,6 +69,7 @@
\n
\n
container_portal_type_list = ["Monetary Reception",]\n
+resource_translated_title_dict = {}\n
base_price_dict = {}\n
\n
if listbox is None:\n
@@ -101,7 +102,6 @@
container_dict = {}\n
container_lines = cash_container.searchFolder(portal_type=\'Container Line\')\n
if len(container_lines) == 0:\n
- context.log("CashMovementNewNotEmitted_generateCashContainerInputDialog", "No container line finf for cash container %s" %(cash_container.getRelativeUrl(),))\n
continue\n
container_line = container_lines[0].getObject()\n
container_dict[\'reference\'] = cash_container.getReference()\n
@@ -202,6 +202,7 @@
<string>kw</string>
<string>DateTime</string>
<string>container_portal_type_list</string>
+ <string>resource_translated_title_dict</string>
<string>base_price_dict</string>
<string>None</string>
<string>_getattr_</string>
@@ -222,7 +223,6 @@
<string>_write_</string>
<string>resource</string>
<string>base_price</string>
- <string>resource_translated_title_dict</string>
<string>resource_translated_title</string>
<string>quantity</string>
<string>total_price_dict</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_viewLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_viewLineFastInputDialog.xml?rev=24492&r1=24491&r2=24492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_viewLineFastInputDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_viewLineFastInputDialog.xml [utf8] Wed Nov 5 14:00:58 2008
@@ -71,19 +71,15 @@
currency = context.Baobab_getPortalReferenceCurrencyID()\n
source_section = context.getSourceSection()\n
\n
-\n
-# We must not force another site, it is optionnal\n
-# So I (Seb) remove this\n
-#if source_section is None :\n
-# redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n
-# , \'view\'\n
-# , \'portal_status_message=Please+select+a+site.\'\n
-# )\n
-# return request.RESPONSE.redirect( redirect_url )\n
-\n
-\n
-\n
-if \'serre\' in context.getSource():\n
+if source is None:\n
+ redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n
+ , \'view\'\n
+ , \'portal_status_message=Please+select+a+source.\'\n
+ )\n
+ return request.RESPONSE.redirect( redirect_url )\n
+\n
+\n
+if \'serre\' in source:\n
cash_status = [\'retired\',\'error\']\n
else:\n
cash_status = [\'cancelled\',\'mutilated\', \'maculated\',\'error\']\n
@@ -166,8 +162,9 @@
<string>source</string>
<string>currency</string>
<string>source_section</string>
+ <string>None</string>
+ <string>redirect_url</string>
<string>cash_status</string>
- <string>None</string>
<string>emission_letter</string>
<string>list</string>
<string>_getitem_</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.xml?rev=24492&r1=24491&r2=24492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.xml [utf8] Wed Nov 5 14:00:58 2008
@@ -74,6 +74,10 @@
date = transaction.getStartDate()\n
vault = transaction.getSource()\n
vaultDestination = transaction.getDestination()\n
+\n
+if vault is None or vaultDestination is None:\n
+ msg = Message(domain="ui", message="You must define vaults.")\n
+ raise ValidationFailed, (msg,)\n
\n
# use of the constraint : Test source and destination\n
vliste = transaction.checkConsistency()\n
@@ -161,9 +165,10 @@
<string>date</string>
<string>vault</string>
<string>vaultDestination</string>
+ <string>None</string>
+ <string>msg</string>
<string>vliste</string>
<string>len</string>
- <string>msg</string>
<string>resource</string>
<string>amount</string>
<string>total_price</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=24492&r1=24491&r2=24492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] Wed Nov 5 14:00:58 2008
@@ -1,1 +1,1 @@
-641
+642
More information about the Erp5-report
mailing list