Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-product_issue-rma into
lp:~openerp-dev/openobject-addons/trunk-addons_issue12_product-mma.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-product_issue-rma/+merge/127714
Hello sir,
I have solve the project issues.
Thank you.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-product_issue-rma/+merge/127714
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-product_issue-rma into
lp:~openerp-dev/openobject-addons/trunk-addons_issue12_product-mma.
=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml 2012-10-03 06:48:40 +0000
+++ event_sale/event_sale_view.xml 2012-10-03 10:57:24 +0000
@@ -4,7 +4,7 @@
<record model="ir.ui.view" id="event_sale_order">
<field name="name">event.product</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view" />
+ <field name="inherit_id" ref="procurement.product_template_form_view_procurement" />
<field name="arch" type="xml">
<div name="options" position="inside">
<field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py 2012-10-03 09:04:31 +0000
+++ hr_expense/hr_expense.py 2012-10-03 10:57:24 +0000
@@ -243,7 +243,11 @@
data_obj = self.pool.get('ir.model.data')
cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
categ_id = data_obj.browse(cr, uid, cat_id).res_id
+<<<<<<< TREE
res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy', 'sale_ok' :False,'categ_id':categ_id }}
+=======
+ res = {'value' : {'type':'service','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+>>>>>>> MERGE-SOURCE
return res
product_product()
=== modified file 'mrp/__openerp__.py'
--- mrp/__openerp__.py 2012-09-26 12:16:27 +0000
+++ mrp/__openerp__.py 2012-10-03 10:57:24 +0000
@@ -29,7 +29,7 @@
'sequence': 18,
'summary': 'Manufacturing Orders, Bill of Materials, Routing',
'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
- 'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'],
+ 'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
'description': """
Manage the Manufacturing process in OpenERP
===========================================
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-09-30 14:16:53 +0000
+++ mrp/mrp_view.xml 2012-10-03 10:57:24 +0000
@@ -961,10 +961,10 @@
</data>
</field>
</record>
- <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+ <record id="product_product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.mrp.inherit</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='supply_method']" position="attributes">
<attribute name="invisible">False</attribute>
@@ -975,7 +975,7 @@
order</b> using the bill of materials assigned to this product.
The delivery order will be ready once the production is done.
</p>
-</group>
+ </group>
</field>
</record>
@@ -1050,7 +1050,5 @@
</xpath>
</field>
</record>
-
-
</data>
</openerp>
=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2012-10-01 09:52:54 +0000
+++ point_of_sale/point_of_sale.py 2012-10-03 10:57:24 +0000
@@ -1300,7 +1300,7 @@
'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
help="If you want to sell this product through the point of sale, select the category it belongs to."),
- 'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
+ 'to_weight' : fields.boolean('To Weigh', help="This category contains products that should to be weighed, mainly used for the self-checkout interface"),
}
def _default_pos_categ_id(self, cr, uid, context=None):
=== modified file 'procurement/__openerp__.py'
--- procurement/__openerp__.py 2012-09-26 12:16:27 +0000
+++ procurement/__openerp__.py 2012-10-03 10:57:24 +0000
@@ -47,6 +47,7 @@
'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',
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py 2012-10-02 20:40:23 +0000
+++ procurement/procurement.py 2012-10-03 10:57:24 +0000
@@ -102,7 +102,6 @@
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
" a make to order method."),
-
'note': fields.text('Note'),
'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
@@ -642,6 +641,18 @@
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
stock_warehouse_orderpoint()
+class product_template(osv.osv):
+ _inherit="product.template"
+ _columns = {
+ '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."),
+ 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+ '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."),
+ }
+ _defaults = {
+ 'procure_method': lambda *a: 'make_to_stock',
+ 'supply_method': lambda *a: 'buy',
+ }
+product_template()
class product_product(osv.osv):
_inherit="product.product"
@@ -649,6 +660,6 @@
'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
+
product_product()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'procurement/procurement_demo.xml'
--- procurement/procurement_demo.xml 1970-01-01 00:00:00 +0000
+++ procurement/procurement_demo.xml 2012-10-03 10:57:24 +0000
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+ <record id="product.product_product_1" model="product.product">
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+ <record id="product.product_product_2" model="product.product">
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+ <record id="product.product_product_3" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_4" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+
+ </record>
+ <record id="product.product_product_5" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_6" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_7" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_8" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_9" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ </record>
+
+ <record id="product.product_product_10" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_11" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_12" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ </record>
+
+ <record id="product.product_product_13" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_14" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_15" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_16" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_17" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_18" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_19" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_20" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_21" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_22" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_23" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_24" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_25" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_26" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_27" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_28" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_29" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_30" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_31" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_32" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_33" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ </record>
+
+ <record id="product.product_product_34" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_35" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_36" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_37" model="product.product">
+ <field name="type">product</field>
+ <field name="procure_method">make_to_order</field>
+ </record>
+
+ <record id="product.product_product_38" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_39" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_44" model="product.product">
+ <field name="procure_method">make_to_order</field>
+ <field name="supply_method">produce</field>
+ </record>
+
+ <record id="product.product_product_45" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_46" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_47" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ <record id="product.product_product_48" model="product.product">
+ <field name="type">product</field>
+ </record>
+
+ </data>
+</openerp>
+
\ No newline at end of file
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2012-09-30 14:16:38 +0000
+++ procurement/procurement_view.xml 2012-10-03 10:57:24 +0000
@@ -303,8 +303,45 @@
<button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
<button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
</xpath>
- </field>
- </record>
-
+ <xpath expr="//field[@name='cost_method']" position="before">
+ <field name="procure_method" groups="base.group_user"/>
+ <field name="supply_method" groups="base.group_user"/>
+ </xpath>
+ <xpath expr="//group[@name='procurement_help']" position="inside">
+ <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
+ <p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_stock')]}">
+ When you sell this service, nothing special will be trigered
+ to deliver the customer, as you set the procurement method as
+ 'Make to Stock'.
+ </p>
+ <p attrs="{'invisible': [('type','<>','product'),('procure_method','<>','make_to_stock')]}">
+ When you sell this product, OpenERP will <b>use the available
+ inventory</b> for the delivery order.
+ <br/><br/>
+ If there are not enough quantities available, the delivery order
+ will wait for new products. To fulfill the inventory, you should
+ create others rules like orderpoints.
+ </p>
+ <p attrs="{'invisible': [('type','<>','consu'),('procure_method','<>','make_to_stock')]}">
+ When you sell this product, a delivery order will be created.
+ OpenERP will consider that the <b>required quantities are always
+ available</b> as it's a consumable (as a result of this, the quantity
+ on hand may become negative).
+ </p>
+ </group>
+ </xpath>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="product_template_form_view_procurement">
+ <field name="name">product.template.procurement</field>
+ <field name="model">product.template</field>
+ <field name="inherit_id" ref="product.product_template_form_view"/>
+ <field name="arch" type="xml">
+ <xpath expr="//field[@name='type']" position="after">
+ <field name="procure_method"/>
+ <field name="supply_method"/>
+ </xpath>
+ </field>
+ </record>
</data>
</openerp>
=== modified file 'product/product.py'
--- product/product.py 2012-10-03 10:10:55 +0000
+++ product/product.py 2012-10-03 10:57:24 +0000
@@ -280,10 +280,14 @@
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
+<<<<<<< TREE
'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."),
'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."),
+=======
+ '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."),
+ '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."),
+>>>>>>> MERGE-SOURCE
'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."),
- 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -307,7 +311,7 @@
'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
help='Coefficient to convert Unit of Measure to UOS\n'
' uos = uom * coeff'),
- 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+ 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
@@ -348,11 +352,14 @@
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
'list_price': lambda *a: 1,
'cost_method': lambda *a: 'standard',
- 'supply_method': lambda *a: 'buy',
'standard_price': lambda *a: 0.0,
'sale_ok': lambda *a: 1,
'produce_delay': lambda *a: 1,
+<<<<<<< TREE
'procure_method': lambda *a: 'make_to_stock',
+=======
+ 'purchase_ok': lambda *a: 1,
+>>>>>>> MERGE-SOURCE
'uom_id': _get_uom_id,
'uom_po_id': _get_uom_id,
'uos_coeff' : lambda *a: 1.0,
=== modified file 'product/product_demo.xml'
--- product/product_demo.xml 2012-09-18 11:29:41 +0000
+++ product/product_demo.xml 2012-10-03 10:57:24 +0000
@@ -70,8 +70,6 @@
<field name="standard_price">20.5</field>
<field name="list_price">30.75</field>
<field name="type">service</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
<field name="uom_id" ref="product_uom_hour"/>
<field name="uom_po_id" ref="product_uom_hour"/>
<field name="description">This type of service include basic monitoring of products.</field>
@@ -84,8 +82,6 @@
<field name="standard_price">25.5</field>
<field name="list_price">38.25</field>
<field name="type">service</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
<field name="uom_id" ref="product_uom_hour"/>
<field name="uom_po_id" ref="product_uom_hour"/>
<field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
@@ -97,9 +93,7 @@
<field name="categ_id" ref="product_category_4"/>
<field name="list_price">450.0</field>
<field name="standard_price">300.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="sale_delay">4.0</field>
@@ -115,9 +109,8 @@
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">500.0</field>
<field name="list_price">750.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
+
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="sale_delay">4.0</field>
@@ -133,9 +126,7 @@
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">600.0</field>
<field name="list_price">900.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="sale_delay">7.0</field>
@@ -148,7 +139,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">800.0</field>
<field name="list_price">1200.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -158,7 +149,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">880.0</field>
<field name="list_price">1350.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -168,7 +159,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">10.0</field>
<field name="list_price">13.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -178,8 +169,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">10.0</field>
<field name="list_price">13.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -189,7 +179,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">12.50</field>
<field name="list_price">14</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -199,7 +189,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">14</field>
<field name="list_price">16.50</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -209,8 +199,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">18</field>
<field name="list_price">12.50</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -220,7 +209,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">78.0</field>
<field name="list_price">85.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -230,7 +219,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">87.0</field>
<field name="list_price">95.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -240,7 +229,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">80.0</field>
<field name="list_price">85.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -250,9 +239,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">20.0</field>
<field name="list_price">25.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -262,7 +249,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">860.0</field>
<field name="list_price">975.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -272,9 +259,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1020.0</field>
<field name="list_price">1150.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -284,9 +269,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1100.0</field>
<field name="list_price">1250.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">On demand hard-disk having capacity based on requirement.</field>
@@ -297,7 +280,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1700.0</field>
<field name="list_price">1950.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -307,7 +290,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1790.0</field>
<field name="list_price">2000.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -317,7 +300,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">2010.0</field>
<field name="list_price">2100.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -327,7 +310,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1910.0</field>
<field name="list_price">1980.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -337,7 +320,7 @@
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">876.0</field>
<field name="list_price">885.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -347,7 +330,7 @@
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">2870.0</field>
<field name="list_price">2950.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">17" Monitor
@@ -361,7 +344,7 @@
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">3000.0</field>
<field name="list_price">3245.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">17" Monitor
@@ -375,9 +358,7 @@
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">3300.0</field>
<field name="list_price">3645.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Custom Laptop based on customer's requirement.</field>
@@ -388,7 +369,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">390.0</field>
<field name="list_price">405.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -399,7 +380,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">90.0</field>
<field name="list_price">100.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -410,7 +391,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">126.0</field>
<field name="list_price">145.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -420,7 +401,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">134.0</field>
<field name="list_price">150.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">.</field>
@@ -431,7 +412,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">57.0</field>
<field name="list_price">62.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
@@ -442,8 +423,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">60.0</field>
<field name="list_price">65.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Headset for laptop PC with USB connector.</field>
@@ -455,7 +435,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">38.0</field>
<field name="list_price">45.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -466,7 +446,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">18.40</field>
<field name="list_price">20.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_dozen"/>
<field name="uom_po_id" ref="product_uom_dozen"/>
</record>
@@ -477,7 +457,7 @@
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">21.60</field>
<field name="list_price">24.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_dozen"/>
<field name="uom_po_id" ref="product_uom_dozen"/>
</record>
@@ -488,8 +468,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">4258.0</field>
<field name="list_price">4410.0</field>
- <field name="type">product</field>
- <field name="procure_method">make_to_order</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">All in one hi-speed printer with fax and scanner.</field>
@@ -501,7 +480,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">60.0</field>
<field name="list_price">65.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -512,7 +491,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">66.0</field>
<field name="list_price">70.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -569,8 +548,6 @@
<field name="standard_price">155.0</field>
<field name="list_price">173.0</field>
<field name="type">consu</field>
- <field name="procure_method">make_to_order</field>
- <field name="supply_method">produce</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description_sale">Full featured image editing software.</field>
@@ -582,7 +559,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">55.0</field>
<field name="list_price">60.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -593,7 +570,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">35.0</field>
<field name="list_price">40.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -604,7 +581,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">55.0</field>
<field name="list_price">70.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
@@ -615,7 +592,7 @@
<field name="categ_id" ref="product_category_6"/>
<field name="standard_price">13.0</field>
<field name="list_price">18.0</field>
- <field name="type">product</field>
+ <field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-10-03 10:10:55 +0000
+++ product/product_view.xml 2012-10-03 10:57:24 +0000
@@ -58,7 +58,7 @@
<field name="arch" type="xml">
<form string="Product" version="7.0">
<sheet>
- <field name="image_medium" widget="image" class="oe_avatar oe_right"/>
+ <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Product Name"/>
@@ -101,18 +101,16 @@
<page string="Procurements" groups="base.group_user">
<group name="procurement">
<group>
- <field name="procure_method" groups="base.group_user"/>
- <field name="supply_method" groups="base.group_user" invisible="1"/>
<field name="cost_method" groups="product.group_costing_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
</group>
<group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
- <p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_stock')]}">
+ <p attrs="{'invisible': [('type','<>','service')]}">
When you sell this service, nothing special will be trigered
to deliver the customer, as you set the procurement method as
'Make to Stock'.
</p>
- <p attrs="{'invisible': [('type','<>','product'),('procure_method','<>','make_to_stock')]}">
+ <p attrs="{'invisible': [('type','<>','product')]}">
When you sell this product, OpenERP will <b>use the available
inventory</b> for the delivery order.
<br/><br/>
@@ -120,7 +118,7 @@
will wait for new products. To fulfill the inventory, you should
create others rules like orderpoints.
</p>
- <p attrs="{'invisible': [('type','<>','consu'),('procure_method','<>','make_to_stock')]}">
+ <p attrs="{'invisible': [('type','<>','consu')]}">
When you sell this product, a delivery order will be created.
OpenERP will consider that the <b>required quantities are always
available</b> as it's a consumable (as a result of this, the quantity
@@ -704,8 +702,6 @@
</group>
<group string="Procurement">
<field name="type"/>
- <field name="procure_method"/>
- <field name="supply_method"/>
</group>
<group string="Base Prices">
=== modified file 'project_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml 2012-09-17 14:47:40 +0000
+++ project_mrp/project_mrp_view.xml 2012-10-03 10:57:24 +0000
@@ -31,10 +31,10 @@
</field>
</field>
</record>
- <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+ <record id="product_product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.project_mrp.inherit</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='supply_method']" position="attributes">
<attribute name="invisible">False</attribute>
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2012-09-24 09:56:16 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2012-10-03 10:57:24 +0000
@@ -180,7 +180,7 @@
<record model="ir.ui.view" id="product_normal_form_view_inherit">
<field name="name">product.form.inherit</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<field name="procure_method" position="before">
<field name="purchase_requisition"/>
=== modified file 'stock/stock_demo.yml'
--- stock/stock_demo.yml 2012-06-28 09:30:01 +0000
+++ stock/stock_demo.yml 2012-10-03 10:57:24 +0000
@@ -31,7 +31,6 @@
name: Ice Cream
type: product
categ_id: product.product_category_1
- supply_method: buy
list_price: 100.0
standard_price: 70.0
uom_id: product.product_uom_kgm
=== modified file 'stock_no_autopicking/stock_no_autopicking_view.xml'
--- stock_no_autopicking/stock_no_autopicking_view.xml 2012-08-09 06:05:16 +0000
+++ stock_no_autopicking/stock_no_autopicking_view.xml 2012-10-03 10:57:24 +0000
@@ -5,7 +5,7 @@
<record model="ir.ui.view" id="view_product_form_auto_pick">
<field name="name">product.normal.auto_pick.form</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view" />
+ <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<field name="product_manager" position="after">
<field name="auto_pick" />
=== modified file 'warning/warning_view.xml'
--- warning/warning_view.xml 2012-08-31 13:50:10 +0000
+++ warning/warning_view.xml 2012-10-03 10:57:24 +0000
@@ -41,7 +41,7 @@
<record id="product_warning_form_view" model="ir.ui.view">
<field name="name">product.warning.form.inherit</field>
<field name="model">product.product</field>
- <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Warnings">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
