odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] backport of revision 8862 

mrp, sale_stock: minor usability improvements + properties in sale order lines

bzr revid: mat@openerp.com-20130823092231-w5aet41ivk4f7nd9
This commit is contained in:
Martin Trigaux 2013-08-23 11:22:31 +02:00
parent 569d854403
commit 4bc20f2e2f
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/mrp/mrp_view.xml
View File

@ -189,7 +189,7 @@
<field name="time_stop" widget="float_time"/>
</group>
<group string="Costing Information">
<field name="product_id" on_change="on_change_product_cost(product_id)"/>
<field name="product_id" on_change="on_change_product_cost(product_id)" context="{'default_supply_method':'produce'}"/>
<field name="costs_hour"/>
<field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
<field name="costs_cycle"/>
@ -248,7 +248,7 @@
<field name="model">mrp.routing.workcenter</field>
<field name="arch" type="xml">
<form string="Routing Work Centers" version="7.0">
<group col="4" string="General Information">
<group col="4">
<field colspan="4" name="name"/>
<field name="sequence"/>
<field name="workcenter_id"/>
@ -280,7 +280,7 @@
</group>
<notebook>
<page string="Work Center Operations">
<field name="workcenter_lines"/>
<field name="workcenter_lines" string="Operation"/>
</page>
<page string="Notes">
<field name="note"/>
@ -1006,7 +1006,7 @@
<!-- Menu for Resource for MRP-->
<record id="mrp_workcenter_action" model="ir.actions.act_window">
<field name="name">Work Center</field>
<field name="name">Work Centers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workcenter</field>
<field name="view_type">form</field>

4
addons/mrp/res_config.py
View File

@ -37,7 +37,7 @@ class mrp_config_settings(osv.osv_memory):
* Repair quotation report
* Notes for the technician and for the final customer.
This installs the module mrp_repair."""),
'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
'module_mrp_operations': fields.boolean("Allow detailed planning of work orders",
help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
This installs the module mrp_operations."""),
'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
@ -61,7 +61,7 @@ class mrp_config_settings(osv.osv_memory):
help="""Routings allow you to create and manage the manufacturing operations that should be followed
within your work centers in order to produce a product. They are attached to bills of materials
that will define the required raw materials."""),
'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
'group_mrp_properties': fields.boolean("Allow several bill of materials per product using properties",
implied_group='product.group_mrp_properties',
help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""),
'module_product_manufacturer': fields.boolean("Define manufacturers on products ",

2
addons/mrp_repair/mrp_repair_view.xml
View File

@ -31,7 +31,7 @@
<button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
<button name="action_invoice_create" states="2binvoiced" string="Create Invoice" class="oe_highlight"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
<button name="action_cancel" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none'), ('state', 'not in',('confirmed','2binvoiced','ready','under_repair', 'invoice_except'))]}"/>

2
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
View File

@ -21,7 +21,7 @@
</field>
</record>
<act_window name="Make Invoice"
<act_window name="Create Invoice"
res_model="mrp.repair.make_invoice"
src_model="mrp.repair"
view_mode="form"

2
addons/product_manufacturer/product_manufacturer_view.xml
View File

@ -9,7 +9,7 @@
<field name="arch" type="xml">
<group name="procurement" position="inside">
<group string="Manufacturer">
<field name="manufacturer" />
<field name="manufacturer" context="{'default_supplier':True, 'default_customer':False}"/>
<field name="manufacturer_pname"/>
<field name="manufacturer_pref"/>
</group>

1
addons/sale/security/sale_security.xml
View File

@ -36,6 +36,7 @@
<record id="group_mrp_properties" model="res.groups">
<field name="name">Properties on lines</field>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
<field name="category_id" ref="base.module_category_hidden"/>
</record>

1
addons/sale_stock/sale_stock.py
View File

@ -306,6 +306,7 @@ class sale_order(osv.osv):
'move_id': move_id,
'company_id': order.company_id.id,
'note': line.name,
'property_ids': [(6, 0, [x.id for x in line.property_ids])],
}
def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):