diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml index c61084ee47aa45c4367785e4c442d0489be9e5d8..f2c3028bc8bb516da039f3a2b6b286f04cb8561f 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml @@ -62,13 +62,13 @@ def mycmp(line_a, line_b):\n 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 @@ for x in context.portal_simulation.getCurrentInventoryList(\n # 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 diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml index 6102cb443de08356cb6359a25c7c1654c8d61eec..da4f841ae2c390c12e3b162ab2f580ff906f8717 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_negative_stock.xml @@ -14,6 +14,7 @@ <value> <list> <string>title</string> + <string>description</string> </list> </value> </item> @@ -74,6 +75,10 @@ <key> <string>values</string> </key> <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> @@ -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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml index 30cb9b63a6449f57b35407e572b4f5d20b64a9f0..0f65ce338125c8a1dec63a9425cae72dae5f010c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_positive_stock.xml @@ -14,6 +14,7 @@ <value> <list> <string>title</string> + <string>description</string> </list> </value> </item> @@ -74,6 +75,10 @@ <key> <string>values</string> </key> <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> @@ -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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml index b23e6456e44cd3692e1e4f0390f2e89638d16e2b..c31e7b9abdd79e995985e399344408f47353c57a 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySiteDialog/your_zero_stock.xml @@ -14,6 +14,7 @@ <value> <list> <string>title</string> + <string>description</string> </list> </value> </item> @@ -74,6 +75,10 @@ <key> <string>values</string> </key> <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> @@ -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> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index b1ce634589a4522510dafef5c9c9cd5e7f199a6d..55a318f19d9be5830ef50c209e49d77e1896a772 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -550 \ No newline at end of file +551 \ No newline at end of file