[Erp5-report] r24919 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 17 12:07:36 CET 2008
Author: mame
Date: Wed Dec 17 12:07:36 2008
New Revision: 24919
URL: http://svn.erp5.org?rev=24919&view=rev
Log:
2008-12-17 mame
* Modify script to not display stock of the resource when it's positive, negative or equal to zero
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.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=24919&r1=24918&r2=24919&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] Wed Dec 17 12:07:36 2008
@@ -62,13 +62,13 @@
Compare 2 lines and sort them according to\n
sort_on parameter.\n
"""\n
+ \n
result = cmp(line_a.getResourceReference(), line_b.getResourceReference())\n
if result == 0:\n
result = cmp(line_a.variation_text, line_b.variation_text)\n
if result == 0:\n
result = cmp(line_a.resource_title, line_b.resource_title)\n
return result\n
-\n
result_list = []\n
for x in context.portal_simulation.getCurrentInventoryList(\n
stock_node_category_uid=site.getUid(),\n
@@ -79,12 +79,14 @@
# 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 positive_stock and x.getInventory() > 0:\n
- result_list.append(x)\n
- if negative_stock and x.getInventory() < 0:\n
- result_list.append(x)\n
- if zero_stock and x.getInventory()==0:\n
- result_list.append(x)\n
+ if x.inventory <=0 and positive_stock:\n
+ result_list.append(x)\n
+ if x.inventory>=0 and negative_stock:\n
+ result_list.append(x)\n
+ if x.inventory!=0 and zero_stock:\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
result_list = list(result_list)\n
result_list.sort(cmp=mycmp)\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml [utf8] Wed Dec 17 12:07:36 2008
@@ -14,6 +14,7 @@
<value>
<list>
<string>title</string>
+ <string>description</string>
</list>
</value>
</item>
@@ -75,6 +76,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string>Don\'t display the negative stock of the resource if stock is negative</string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value>
</item>
@@ -88,7 +93,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Negative Stock</string> </value>
+ <value> <string>Don\'t Display Negative Stock</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml [utf8] Wed Dec 17 12:07:36 2008
@@ -14,6 +14,7 @@
<value>
<list>
<string>title</string>
+ <string>description</string>
</list>
</value>
</item>
@@ -75,6 +76,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string>Don\'t display positive stock of the resource if stock is positive</string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value>
</item>
@@ -88,7 +93,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Positive Stock</string> </value>
+ <value> <string>Don\'t Display Positive Stock</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml [utf8] Wed Dec 17 12:07:36 2008
@@ -14,6 +14,7 @@
<value>
<list>
<string>title</string>
+ <string>description</string>
</list>
</value>
</item>
@@ -75,6 +76,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string>Don\'t display zero stock of the resource if stock is equal to zero</string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value>
</item>
@@ -88,7 +93,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Zero Stock</string> </value>
+ <value> <string>Don\'t Display Zero Stock</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=24919&r1=24918&r2=24919&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Dec 17 12:07:36 2008
@@ -1,1 +1,1 @@
-550
+551
More information about the Erp5-report
mailing list