[Erp5-report] r22443 - in /erp5/trunk/bt5/erp5_mrp: SkinTemplateItem/portal_skins/erp5_mrp/...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jul 11 13:02:57 2008
New Revision: 22443

URL: http://svn.erp5.org?rev=22443&view=rev
Log:
- added support for src__ parameter
- use stock instead of movement table

Modified:
    erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml
    erp5/trunk/bt5/erp5_mrp/bt/revision

Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml?rev=22443&r1=22442&r2=22443&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml Fri Jul 11 13:02:57 2008
@@ -85,19 +85,22 @@
       if q.getResourceUid() is not None]\n
 \n
   query = NegatedQuery(\n
-      Query(operator=\'IN\',**{\'movement.resource_uid\':ignored_resource_uid_list})\n
+      Query(operator=\'IN\',**{\'stock.resource_uid\':ignored_resource_uid_list})\n
       )\n
 \n
   kw.update(**query.asSQLExpression())\n
 \n
 kw[\'explanation_uid\'] = [context.getUid()] + [q.getUid() for q in \\\n
   context.getCausalityRelatedValueList(portal_type=context.getPortalDeliveryTypeList())]\n
+\n
 kw[\'group_by_date\'] = 1\n
 kw[\'group_by_node\'] = 1\n
 kw[\'group_by_variation\'] = 1\n
 kw[\'group_by_resource\'] = 1\n
 kwargs.update(**kw)\n
 # XXX: below filtering to be replaced by HAVING expression\n
+if kwargs.get(\'src__\',0) == 1:\n
+  return simulation_tool.getFutureInventoryList(*args,**kwargs)\n
 return [q for q in simulation_tool.getFutureInventoryList(*args,**kwargs) if q.inventory < 0.0]\n
 
 

Modified: erp5/trunk/bt5/erp5_mrp/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/revision?rev=22443&r1=22442&r2=22443&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision Fri Jul 11 13:02:57 2008
@@ -1,1 +1,1 @@
-357
+358