From 18fe9c60834ca1edc4fd88331d3b410676bc1b25 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Thu, 27 Sep 2012 18:31:39 +0530 Subject: [PATCH] [IMP] add the demo data file in procurement and make changes into the product module bzr revid: rma@tinyerp.com-20120927130139-1hhilbveocrzuj6t --- addons/procurement/__openerp__.py | 1 + addons/procurement/procurement.py | 1 + addons/procurement/procurement_demo.xml | 173 ++++++++++++++++++++++++ addons/product/product.py | 2 +- addons/product/product_demo.xml | 82 +++++------ 5 files changed, 217 insertions(+), 42 deletions(-) create mode 100644 addons/procurement/procurement_demo.xml diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index e797766eb40..29975503684 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -47,6 +47,7 @@ depending on the product's configuration. 'security/ir.model.access.csv', 'security/procurement_security.xml', 'procurement_data.xml', + 'procurement_demo.xml', 'wizard/make_procurement_view.xml', 'wizard/mrp_procurement_view.xml', 'wizard/orderpoint_procurement_view.xml', diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 842f9ec27fa..05fc745b538 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -628,6 +628,7 @@ class product_product(osv.osv): _inherit="product.product" _columns = { 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'), + 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), } product_product() diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml new file mode 100644 index 00000000000..6fc6716de80 --- /dev/null +++ b/addons/procurement/procurement_demo.xml @@ -0,0 +1,173 @@ + + + + + product + + + + product + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + + \ No newline at end of file diff --git a/addons/product/product.py b/addons/product/product.py index 20104fdda91..879a146fe53 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -280,7 +280,7 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), - 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), + 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."), 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index 97d6e03205c..bceb715cd38 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -101,7 +101,7 @@ 450.0 300.0 - product + consu make_to_order produce @@ -119,7 +119,7 @@ HDD SH-1 500.0 750.0 - product + consu make_to_order produce @@ -137,7 +137,7 @@ HDD SH-1 600.0 900.0 - product + consu make_to_order produce @@ -152,7 +152,7 @@ HDD SH-1 800.0 1200.0 - product + consu @@ -162,7 +162,7 @@ HDD SH-1 880.0 1350.0 - product + consu @@ -172,7 +172,7 @@ HDD SH-1 10.0 13.0 - product + consu @@ -182,7 +182,7 @@ HDD SH-1 10.0 13.0 - product + consu make_to_order @@ -193,7 +193,7 @@ HDD SH-1 12.50 14 - product + consu @@ -203,7 +203,7 @@ HDD SH-1 14 16.50 - product + consu @@ -213,7 +213,7 @@ HDD SH-1 18 12.50 - product + consu make_to_order @@ -224,7 +224,7 @@ HDD SH-1 78.0 85.0 - product + consu @@ -234,7 +234,7 @@ HDD SH-1 87.0 95.0 - product + consu @@ -244,7 +244,7 @@ HDD SH-1 80.0 85.0 - product + consu @@ -254,7 +254,7 @@ HDD SH-1 20.0 25.0 - product + consu make_to_order produce @@ -266,7 +266,7 @@ HDD SH-1 860.0 975.0 - product + consu @@ -276,7 +276,7 @@ HDD SH-1 1020.0 1150.0 - product + consu make_to_order produce @@ -288,7 +288,7 @@ HDD SH-1 1100.0 1250.0 - product + consu make_to_order produce @@ -301,7 +301,7 @@ HDD SH-1 1700.0 1950.0 - product + consu @@ -311,7 +311,7 @@ HDD SH-1 1790.0 2000.0 - product + consu @@ -321,7 +321,7 @@ HDD SH-1 2010.0 2100.0 - product + consu @@ -331,7 +331,7 @@ HDD SH-1 1910.0 1980.0 - product + consu @@ -341,7 +341,7 @@ HDD SH-1 876.0 885.0 - product + consu @@ -351,7 +351,7 @@ HDD SH-1 2870.0 2950.0 - product + consu 17" Monitor @@ -365,7 +365,7 @@ QWERTY keyboard 3000.0 3245.0 - product + consu 17" Monitor @@ -379,7 +379,7 @@ QWERTY keyboard 3300.0 3645.0 - product + consu make_to_order produce @@ -392,7 +392,7 @@ QWERTY keyboard 390.0 405.0 - product + consu @@ -403,7 +403,7 @@ QWERTY keyboard 90.0 100.0 - product + consu @@ -414,7 +414,7 @@ QWERTY keyboard 126.0 145.0 - product + consu @@ -424,7 +424,7 @@ QWERTY keyboard 134.0 150.0 - product + consu . @@ -435,7 +435,7 @@ QWERTY keyboard 57.0 62.0 - product + consu Hands free headset for laptop PC with in-line microphone and headphone plug. @@ -446,7 +446,7 @@ QWERTY keyboard 60.0 65.0 - product + consu make_to_order @@ -459,7 +459,7 @@ QWERTY keyboard 38.0 45.0 - product + consu @@ -470,7 +470,7 @@ QWERTY keyboard 18.40 20.0 - product + consu @@ -481,7 +481,7 @@ QWERTY keyboard 21.60 24.0 - product + consu @@ -492,7 +492,7 @@ QWERTY keyboard 4258.0 4410.0 - product + consu make_to_order @@ -505,7 +505,7 @@ QWERTY keyboard 60.0 65.0 - product + consu @@ -516,7 +516,7 @@ QWERTY keyboard 66.0 70.0 - product + consu @@ -586,7 +586,7 @@ QWERTY keyboard 55.0 60.0 - product + consu @@ -597,7 +597,7 @@ QWERTY keyboard 35.0 40.0 - product + consu @@ -608,7 +608,7 @@ QWERTY keyboard 55.0 70.0 - product + consu @@ -619,7 +619,7 @@ QWERTY keyboard 13.0 18.0 - product + consu