[Erp5-report] r8715 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jul 24 13:47:39 CEST 2006
Author: aurel
Date: Mon Jul 24 13:47:33 2006
New Revision: 8715
URL: http://svn.erp5.org?rev=8715&view=rev
Log:
2006-07-24 aurel
* do more checkions in incident modules' workflow and fix some forms
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_deficit_price.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_excess_price.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml
erp5/trunk/bt5/erp5_banking_cash/bt/change_log
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox.xml?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox.xml Mon Jul 24 13:47:33 2006
@@ -500,7 +500,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
- <value> <string>account_incident_module_selection</string> </value>
+ <value> <string>cash_incident_module_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_deficit_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_deficit_price.xml?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_deficit_price.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_deficit_price.xml Mon Jul 24 13:47:33 2006
@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Cash Incident Line\')</string> </value>
+ <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Cash Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_excess_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_excess_price.xml?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_excess_price.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashIncidentModule_viewCashIncidentList/listbox_excess_price.xml Mon Jul 24 13:47:33 2006
@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Cash Incident Line\')</string> </value>
+ <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Cash Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml Mon Jul 24 13:47:33 2006
@@ -76,8 +76,18 @@
in_list = txn.searchFolder(portal_type=\'Incoming Cash Incident Line\')\n
out_list = txn.searchFolder(portal_type=\'Outgoing Cash Incident Line\')\n
\n
+price = txn.getSourceTotalAssetPrice()\n
+in_price = txn.getTotalPrice(deliveryLineType=\'Incoming Cash Incident Line\')\n
+out_price = txn.getTotalPrice(deliveryLineType=\'Outgoing Cash Incident Line\')\n
+\n
if len(in_list) != 0 and len(out_list) != 0:\n
msg = Message(domain = "ui", message="You can\'t have excess and deficit on the document.")\n
+ raise ValidationFailed, (msg,)\n
+elif len(in_list) == 0 and len(out_list) == 0:\n
+ msg = Message(domain = "ui", message="No resource.")\n
+ raise ValidationFailed, (msg,)\n
+elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != price):\n
+ msg = Message(domain = "ui", message="Price differs between document and resource.")\n
raise ValidationFailed, (msg,)\n
</string> </value>
</item>
@@ -129,6 +139,9 @@
<string>_getattr_</string>
<string>in_list</string>
<string>out_list</string>
+ <string>price</string>
+ <string>in_price</string>
+ <string>out_price</string>
<string>len</string>
<string>msg</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/scripts/checkConsistency.xml Mon Jul 24 13:47:33 2006
@@ -76,8 +76,18 @@
in_list = txn.searchFolder(portal_type=\'Incoming Cash Incident Line\')\n
out_list = txn.searchFolder(portal_type=\'Outgoing Cash Incident Line\')\n
\n
+price = txn.getSourceTotalAssetPrice()\n
+in_price = txn.getTotalPrice(deliveryLineType=\'Incoming Cash Incident Line\')\n
+out_price = txn.getTotalPrice(deliveryLineType=\'Outgoing Cash Incident Line\')\n
+\n
if len(in_list) != 0 and len(out_list) != 0:\n
msg = Message(domain = "ui", message="You can\'t have excess and deficit on the document.")\n
+ raise ValidationFailed, (msg,)\n
+elif len(in_list) == 0 and len(out_list) == 0:\n
+ msg = Message(domain = "ui", message="No resource.")\n
+ raise ValidationFailed, (msg,)\n
+elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != price):\n
+ msg = Message(domain = "ui", message="Price differs between document and resource.")\n
raise ValidationFailed, (msg,)\n
</string> </value>
</item>
@@ -129,6 +139,9 @@
<string>_getattr_</string>
<string>in_list</string>
<string>out_list</string>
+ <string>price</string>
+ <string>in_price</string>
+ <string>out_price</string>
<string>len</string>
<string>msg</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/change_log?rev=8715&r1=8714&r2=8715&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/change_log Mon Jul 24 13:47:33 2006
@@ -1,3 +1,6 @@
+2006-07-24 aurel
+* do more checkions in incident modules' workflow
+
2006-07-21 aurel
* add cash incident module
More information about the Erp5-report
mailing list