[Erp5-report] r12832 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 16 18:26:26 CET 2007
Author: seb
Date: Fri Feb 16 18:26:15 2007
New Revision: 12832
URL: http://svn.erp5.org?rev=12832&view=rev
Log:
we now take into account stock changes with cash sorting incident
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingIncidentLine_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingIncidentLine_getBaobabSource.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingUsualCashIncidentLine_getBaobabSource.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingIncidentLine_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingIncidentLine_getBaobabDestination.xml?rev=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingIncidentLine_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingIncidentLine_getBaobabDestination.xml Fri Feb 16 18:26:15 2007
@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>return "%s/surface/salle_tri/encaisse_des_differences" %(context.getSource(),)\n
+ <value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingIncidentLine_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingIncidentLine_getBaobabSource.xml?rev=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingIncidentLine_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingIncidentLine_getBaobabSource.xml Fri Feb 16 18:26:15 2007
@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>return "%s/surface/salle_tri/encaisse_des_differences" %(context.getSource(),)\n
+ <value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingUsualCashIncidentLine_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingUsualCashIncidentLine_getBaobabSource.xml?rev=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingUsualCashIncidentLine_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingUsualCashIncidentLine_getBaobabSource.xml Fri Feb 16 18:26:15 2007
@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
+ <value> <string>return None\n
</string> </value>
</item>
<item>
@@ -119,8 +119,7 @@
<tuple>
<string>args</string>
<string>kw</string>
- <string>_getattr_</string>
- <string>context</string>
+ <string>None</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml?rev=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml Fri Feb 16 18:26:15 2007
@@ -79,7 +79,7 @@
price = txn.getSourceTotalAssetPrice()\n
in_price = txn.getTotalPrice(portal_type=[\'Incoming Cash Sorting Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
out_price = txn.getTotalPrice(portal_type=[\'Outgoing Cash Sorting Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
-\n
+vault = "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(txn.getSource(),)\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
@@ -87,10 +87,16 @@
elif len(in_list) == 0 and len(out_list) == 0:\n
msg = Message(domain = "ui", message="No resource.")\n
raise ValidationFailed, (msg,)\n
-\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
+\n
+if len(out_list) !=0:\n
+ \n
+ resource = txn.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Cash Sorting Incident Line\')\n
+ if resource != 0 :\n
+ msg = Message(domain="ui", message="Insufficient Balance.")\n
+ raise ValidationFailed, (msg,)\n
</string> </value>
</item>
<item>
@@ -146,8 +152,10 @@
<string>price</string>
<string>in_price</string>
<string>out_price</string>
+ <string>vault</string>
<string>len</string>
<string>msg</string>
+ <string>resource</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml?rev=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/scripts/checkConsistency.xml Fri Feb 16 18:26:15 2007
@@ -108,11 +108,7 @@
msg = Message(domain = "ui", message="No resource.")\n
raise ValidationFailed, (msg,)\n
\n
-elif len(out_list) !=0:\n
- resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Usual Cash Incident Line\')\n
- if resource <> 0 :\n
- msg = Message(domain="ui", message="Insufficient Balance.")\n
- raise ValidationFailed, (msg,)\n
+\n
\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
@@ -183,7 +179,6 @@
<string>in_price</string>
<string>out_price</string>
<string>len</string>
- <string>resource</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=12832&r1=12831&r2=12832&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Feb 16 18:26:15 2007
@@ -1,1 +1,1 @@
-172
+174
More information about the Erp5-report
mailing list