[Erp5-report] r24939 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: mame
Date: Thu Dec 18 14:16:00 2008
New Revision: 24939

URL: http://svn.erp5.org?rev=24939&view=rev
Log:
2008-12-18 mame
*modify script so that report can hide positive and negative stock at the same time, or positive and zero stock or negative and zero stock

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml?rev=24939&r1=24938&r2=24939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml [utf8] Thu Dec 18 14:16:00 2008
@@ -79,12 +79,18 @@
   # XXX resourceType= uses movement table.\n
   # resource_portal_type= does not work with cells (because resource is acquired from line)\n
   resourceType=context.getPortalProductTypeList(), **kw):\n
-  if x.inventory <=0 and positive_stock:\n
+  if positive_stock and negative_stock and not zero_stock and x.inventory == 0:\n
      result_list.append(x)\n
-  if x.inventory>=0 and negative_stock:\n
+  if positive_stock and not negative_stock and zero_stock and x.inventory <0:\n
      result_list.append(x)\n
-  if x.inventory!=0 and zero_stock:\n
-     result_list.append(x) \n
+  if negative_stock and zero_stock and not positive_stock and x.inventory >0:\n
+     result_list.append(x)\n
+  if positive_stock and not negative_stock and not zero_stock and x.inventory <=0:\n
+     result_list.append(x)\n
+  if negative_stock and not positive_stock and not zero_stock and x.inventory >=0:\n
+     result_list.append(x)\n
+  if zero_stock and not positive_stock and not negative_stock and x.inventory!=0:\n
+     result_list.append(x)\n
   if not positive_stock and not negative_stock and not zero_stock:\n
      result_list.append(x)\n
 \n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=24939&r1=24938&r2=24939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Thu Dec 18 14:16:00 2008
@@ -1,1 +1,1 @@
-551
+552