[FIX] product: move config wizard stuff into sale and purchase
bzr revid: rco@openerp.com-20120322130320-zbz4zdqfuqju2lj4
This commit is contained in:
parent
867f6d87d6
commit
71b448ea5d
|
@ -23,6 +23,5 @@ import pricelist
|
||||||
import report
|
import report
|
||||||
import partner
|
import partner
|
||||||
import wizard
|
import wizard
|
||||||
import res_config
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
from osv import fields, osv
|
|
||||||
|
|
||||||
class sale_config_settings(osv.osv_memory):
|
|
||||||
_inherit = 'sale.config.settings'
|
|
||||||
|
|
||||||
_columns = {
|
|
||||||
'group_sale_pricelist':fields.boolean("Pricelist per Customer",
|
|
||||||
implied_group='product.group_sale_pricelist',
|
|
||||||
help="""Allows to manage different prices based on rules per category of customers.
|
|
||||||
Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
|
|
||||||
'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
|
|
||||||
implied_group='product.group_purchase_pricelist',
|
|
||||||
help="""Allows to manage different prices based on rules per category of Supplier.
|
|
||||||
Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
|
|
||||||
'group_sale_uom':fields.boolean("UOM per product",
|
|
||||||
implied_group='product.group_uom',
|
|
||||||
help="""Allows you to select and maintain different unit of measures per product."""),
|
|
||||||
'group_stock_packaging':fields.boolean("Manage packaging by products",
|
|
||||||
implied_group='product.group_packaging',
|
|
||||||
help=""" Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
|
|
||||||
}
|
|
|
@ -33,6 +33,13 @@ class purchase_config_settings(osv.osv_memory):
|
||||||
('picking', 'Based on Receptions'),
|
('picking', 'Based on Receptions'),
|
||||||
('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
|
('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
|
||||||
], 'Invoicing Method', required=True, default_model='purchase.order'),
|
], 'Invoicing Method', required=True, default_model='purchase.order'),
|
||||||
|
'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
|
||||||
|
implied_group='product.group_purchase_pricelist',
|
||||||
|
help="""Allows to manage different prices based on rules per category of Supplier.
|
||||||
|
Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
|
||||||
|
'group_sale_uom':fields.boolean("UOM per product",
|
||||||
|
implied_group='product.group_uom',
|
||||||
|
help="""Allows you to select and maintain different unit of measures per product."""),
|
||||||
'module_purchase_analytic_plans': fields.boolean('Purchase analytic plan',
|
'module_purchase_analytic_plans': fields.boolean('Purchase analytic plan',
|
||||||
help ="""Allows the user to maintain several analysis plans. These let you split
|
help ="""Allows the user to maintain several analysis plans. These let you split
|
||||||
lines on a purchase order between several accounts and analytic plans.
|
lines on a purchase order between several accounts and analytic plans.
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
<separator string="Purchase Order" colspan="4"/>
|
<separator string="Purchase Order" colspan="4"/>
|
||||||
<group colspan="2" col="2">
|
<group colspan="2" col="2">
|
||||||
<field name="group_purchase_pricelist_per_supplier"/>
|
<field name="group_purchase_pricelist"/>
|
||||||
<field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
|
<field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
|
||||||
<field name="group_purchase_taxes_global_on_order" invisible="1"/>
|
<field name="group_purchase_taxes_global_on_order" invisible="1"/>
|
||||||
<field name="group_purchase_taxes_on_order_line" invisible="1"/>
|
<field name="group_purchase_taxes_on_order_line" invisible="1"/>
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
<field name="module_purchase_analytic_plans"/>
|
<field name="module_purchase_analytic_plans"/>
|
||||||
</group>
|
</group>
|
||||||
<group colspan="4" col="4">
|
<group colspan="4" col="4">
|
||||||
<field name="group_sale_uom_per_product"/>
|
<field name="group_sale_uom"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="module_purchase_double_validation"/>
|
<field name="module_purchase_double_validation"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
|
|
|
@ -53,6 +53,13 @@ class sale_configuration(osv.osv_memory):
|
||||||
'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
|
'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
|
||||||
'default_picking_policy' : fields.boolean("Deliver all products at once",
|
'default_picking_policy' : fields.boolean("Deliver all products at once",
|
||||||
help = "You can set picking policy on sale order that will allow you to deliver all products at once."),
|
help = "You can set picking policy on sale order that will allow you to deliver all products at once."),
|
||||||
|
'group_sale_pricelist':fields.boolean("Pricelist per Customer",
|
||||||
|
implied_group='product.group_sale_pricelist',
|
||||||
|
help="""Allows to manage different prices based on rules per category of customers.
|
||||||
|
Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
|
||||||
|
'group_sale_uom':fields.boolean("UOM per product",
|
||||||
|
implied_group='product.group_uom',
|
||||||
|
help="""Allows you to select and maintain different unit of measures per product."""),
|
||||||
'group_sale_delivery_address': fields.boolean("Specify delivery and invoice addresses",
|
'group_sale_delivery_address': fields.boolean("Specify delivery and invoice addresses",
|
||||||
implied_group='sale.group_delivery_invoice_address',
|
implied_group='sale.group_delivery_invoice_address',
|
||||||
help="Allows you to specify different delivery and invoice addresses on a sale order."),
|
help="Allows you to specify different delivery and invoice addresses on a sale order."),
|
||||||
|
|
Loading…
Reference in New Issue