[IMP]purchase:improve purchase and stock wizard configration
bzr revid: pja@tinyerp.com-20120606123722-w9f6gt62y1kio2j2
This commit is contained in:
Jalpesh Patel (OpenERP)
parent
77830468b7
commit
74bd52202e
|
|
@ -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."""),
|
||||
|
|
@ -89,5 +83,16 @@ class account_config_settings(osv.osv_memory):
|
|||
implied_group='purchase.group_analytic_accounting',
|
||||
help="Allows you to specify an analytic account on purchase orders."),
|
||||
}
|
||||
class stock_config_settings(osv.osv_memory):
|
||||
_inherit = 'stock.config.settings'
|
||||
_columns = {
|
||||
'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:
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<separator string="Invoicing" 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,8 @@
|
|||
<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 +57,22 @@
|
|||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_stock_config" model="ir.ui.view">
|
||||
<field name="name">stock settings</field>
|
||||
<field name="model">stock.config.settings</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="stock.view_stock_config_settings"/>
|
||||
<field name="priority" eval="18"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="module_claim" position="after">
|
||||
<separator string="Products" colspan="4"/>
|
||||
<group>
|
||||
<field name="module_product_manufacturer"/>
|
||||
</group>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -14,27 +14,33 @@
|
|||
</header>
|
||||
<sheet layout="auto">
|
||||
<separator string="Traceability" colspan="4"/>
|
||||
<field name="group_stock_production_lot"/>
|
||||
<field name="module_product_expiry"
|
||||
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
|
||||
<group>
|
||||
<field name="group_stock_production_lot"/>
|
||||
<field name="module_product_expiry"
|
||||
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
|
||||
<newline/>
|
||||
<field name="group_stock_tracking_lot"/>
|
||||
|
||||
</group>
|
||||
<separator string="Logistics" colspan="4"/>
|
||||
<field name="group_stock_multiple_locations"/>
|
||||
<field name="module_stock_location"/>
|
||||
<field name="module_stock_invoice_directly"/>
|
||||
<field name="decimal_precision"/>
|
||||
|
||||
<group>
|
||||
<field name="group_stock_multiple_locations"/>
|
||||
<field name="module_stock_location"/>
|
||||
<field name="module_stock_invoice_directly"/>
|
||||
<field name="decimal_precision"/>
|
||||
</group>
|
||||
<separator string="Products" colspan="4"/>
|
||||
<field name="group_stock_packaging"/>
|
||||
<field name="group_stock_inventory_valuation"/>
|
||||
<field name="group_uom"/>
|
||||
<field name="group_uos"/>
|
||||
<field name="group_product_variant"/>
|
||||
|
||||
<group>
|
||||
<field name="group_stock_packaging"/>
|
||||
<field name="group_stock_inventory_valuation"/>
|
||||
<field name="group_uom"/>
|
||||
<field name="group_uos"/>
|
||||
<field name="group_product_variant"/>
|
||||
</group>
|
||||
<separator string="Partners" colspan="4"/>
|
||||
<field name="module_claim_from_delivery"/>
|
||||
<group name="module_claim">
|
||||
<field name="module_claim_from_delivery"/>
|
||||
</group>
|
||||
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
|||
Loading…
Reference in New Issue