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

[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-purchase_config_wizard_improvement-pja 

bzr revid: atp@tinyerp.com-20120609160404-in2a7xrf5yfa9wwh
This commit is contained in:
Atul Patel (OpenERP) 2012-06-09 21:34:04 +05:30
parent f535c29fbd c4b68a2382
commit 9c2f5f57fd
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/mrp/res_config.py
View File

@ -68,6 +68,13 @@ class mrp_config_settings(osv.osv_memory):
'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
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 sale order and the Bill of Material."""),
'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
help="""This allows you to define the following for a product:
* Manufacturer
* Manufacturer Product Name
* Manufacturer Product Code
* Product Attributes.
This installs the module product_manufacturer."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

27
addons/mrp/res_config_view.xml
View File

@ -12,18 +12,21 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
<group>
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
</group>
</sheet>
</form>
</field>

8
addons/purchase/res_config.py
View File

@ -48,13 +48,7 @@ class purchase_config_settings(osv.osv_memory):
help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
help="""This allows you to define the following for a product:
* Manufacturer
* Manufacturer Product Name
* Manufacturer Product Code
* Product Attributes.
This installs the module product_manufacturer."""),
'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
This installs the module purchase_double_validation."""),

8
addons/purchase/res_config_view.xml
View File

@ -15,7 +15,7 @@
<separator string="Invoicing Control" colspan="4"/>
<field name="default_invoice_method"/>
<field name="decimal_precision"/>
<group>
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
@ -23,9 +23,7 @@
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
</group>
</sheet>
</form>
</field>
@ -58,6 +56,8 @@
</group>
</field>
</record>
</data>
</openerp>