X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fsale%2Fres_config.py;h=f4239b0e1a21b31155451f10b3bb6463165191f0;hb=7a75fa6ef5918e6a7291c8dec1faf978b1f82747;hp=e33b6226ca48d3ba4b1d5a09d0521fb38b0e6dc0;hpb=0b34ded139f2a46393fc4eaf454bfbaf12a1b721;p=odoo%2Fodoo.git diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index e33b622..f4239b0 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). +# OpenERP, Open Source Business Applications +# Copyright (C) 2004-2012 OpenERP S.A. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,175 +19,130 @@ # ############################################################################## -from osv import fields, osv -import pooler -from tools.translate import _ +import logging + +from openerp.osv import fields, osv +from openerp import pooler +from openerp.tools.translate import _ + +_logger = logging.getLogger(__name__) class sale_configuration(osv.osv_memory): _inherit = 'sale.config.settings' _columns = { - 'group_invoice_so_lines': fields.boolean('Based on Sales Orders', + 'group_invoice_so_lines': fields.boolean('Generate invoices based on the sales order lines', implied_group='sale.group_invoice_so_lines', - help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."), - 'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders', - implied_group='sale.group_invoice_deli_orders', - help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."), - 'task_work': fields.boolean('Based on Tasks\' Work', - help="""Lets you transfer the entries under tasks defined for Project Management to - the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways - and to automatically creates project tasks from procurement lines. - It installs the project_timesheet and project_mrp modules."""), - 'module_account_analytic_analysis': fields.boolean('Based on Timesheet', - help = """For modifying account analytic view to show important data to project manager of services companies. - You can also view the report of account analytic summary user-wise as well as month wise. - It installs the account_analytic_analysis module."""), - 'default_order_policy': fields.selection( - [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')], - 'Main Method Based On', required=True, default_model='sale.order', - help="You can generate invoices based on sales orders or based on shippings."), - 'module_delivery': fields.boolean('Do you charge the delivery?', - help =""" - Allows you to add delivery methods in sale orders and delivery orders. - You can define your own carrier and delivery grids for prices. - It installs the delivery module. - """), - 'time_unit': fields.many2one('product.uom','Working Time Unit'), - '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."), - 'group_sale_delivery_address':fields.boolean("Multiple Address", group='base.group_user', implied_group='base.group_sale_delivery_address', - help="Allows you to set different delivery address and invoice address. It assigns Multiple Address group to all employees."), - 'group_sale_disc_per_sale_order_line':fields.boolean("Discounts per sale order lines ", group='base.group_user', implied_group='base.group_sale_disc_per_sale_order_line', - help="This allows you to apply discounts per sale order lines, it assigns Discounts per sale order lines group to all employees."), - 'module_sale_layout':fields.boolean("Notes & subtotals per line",help="Allows to format sale order lines using notes, separators, titles and subtotals. It installs the sale_layout module."), - 'module_warning': fields.boolean("Alerts by products or customers", - help="""To raise user specific warning messages on different products used in Sales Orders, Purchase Orders, Invoices and Deliveries. - It installs the warning module."""), - 'module_sale_margin': fields.boolean("Display Margin For Users", - help="""This adds the 'Margin' on sales order. - This gives the profitability by calculating the difference between the Unit Price and Cost Price. - It installs the sale_margin module."""), - 'module_sale_journal': fields.boolean("Invoice Journal", - help="""Allows you to categorize your sales and deliveries (picking lists) between different journals. - It installs the sale_journal module."""), - 'module_analytic_user_function' : fields.boolean("User function by contracts", - help="""Allows you to define what is the default function of a specific user on a given account. - This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled. - But the possibility to change these values is still available. - It installs analytic_user_function module."""), - 'module_analytic_journal_billing_rate' : fields.boolean("Billing rates by contracts", - help="""Allows you to define what is the default invoicing rate for a specific journal on a given account. - It installs analytic_journal_billing_rate module. - """), - 'tax_policy': fields.selection([ - ('no_tax', 'No Tax'), - ('global_on_order', 'Global On Order'), - ('on_order_line', 'On Order Lines'), - ], 'Taxes', required=True, - help=""" - If you want to apply global tax on sale order then select 'Global On Order' it will add 'Global On Order' group to employees. - If you want to apply different taxes for sale order lines then select 'On Order Lines' it will add 'On Order Lines' group to employees. - """), - 'group_sale_taxes_global_on_order':fields.boolean("Global on order", group='base.group_user', implied_group='base.group_sale_taxes_global_on_order'), - 'group_sale_taxes_on_order_line':fields.boolean("On order line", group='base.group_user', implied_group='base.group_sale_taxes_on_order_line'), - 'module_project_timesheet': fields.boolean("Project Timesheet"), - 'module_project_mrp': fields.boolean("Project mrp"), - + help="To allow your salesman to make invoices for sales order lines using the menu 'Lines to Invoice'."), + 'timesheet': fields.boolean('Prepare invoices based on timesheets', + help = """For modifying account analytic view to show important data to project manager of services companies. + You can also view the report of account analytic summary user-wise as well as month wise. + This installs the module account_analytic_analysis."""), + 'module_account_analytic_analysis': fields.boolean('Use contracts management', + help = """Allows to define your customer contracts conditions: invoicing + method (fixed price, on timesheet, advance invoice), the exact pricing + (650€/day for a developer), the duration (one year support contract). + You will be able to follow the progress of the contract and invoice automatically. + It installs the account_analytic_analysis module."""), + 'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'), + 'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers", + 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_uom':fields.boolean("Allow using different units of measures", + implied_group='product.group_uom', + help="""Allows you to select and maintain different units of measure for products."""), + 'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sales order lines", + implied_group='sale.group_discount_per_so_line', + help="Allows you to apply some discount per sales order line."), + 'module_warning': fields.boolean("Allow configuring alerts by customer or products", + help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer. +Example: Product: this product is deprecated, do not purchase more than 5. + Supplier: don't forget to ask for an express delivery."""), + 'module_sale_margin': fields.boolean("Display margins on sales orders", + help="""This adds the 'Margin' on sales order. + This gives the profitability by calculating the difference between the Unit Price and Cost Price. + This installs the module sale_margin."""), + 'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals", + help="""Allows you to categorize your sales and deliveries (picking lists) between different journals, + and perform batch operations on journals. + This installs the module sale_journal."""), + 'module_analytic_user_function': fields.boolean("One employee can have different roles per contract", + help="""Allows you to define what is the default function of a specific user on a given account. + This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled. + But the possibility to change these values is still available. + This installs the module analytic_user_function."""), + 'module_project': fields.boolean("Project"), + 'module_sale_stock': fields.boolean("Trigger delivery orders automatically from sales orders", + help="""Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock. + This installs the module sale_stock."""), } def default_get(self, cr, uid, fields, context=None): - data_obj = self.pool.get('ir.model.data') + ir_model_data = self.pool.get('ir.model.data') res = super(sale_configuration, self).default_get(cr, uid, fields, context) - if res.get('module_project_mrp') and res.get('module_project_timesheet'): - res.update({'task_work': True}) - if res.get('module_account_analytic_analysis'): - prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id - uom_id = self.pool.get('product.product').browse(cr, uid, prod_id).uom_id.id - res.update({'time_unit': uom_id}) - if res.get('group_sale_taxes_global_on_order'): - res.update({'tax_policy': 'global_on_order'}) - elif res.get('group_sale_taxes_on_order_line'): - res.update({'tax_policy': 'on_order_line'}) + if res.get('module_project'): + user = self.pool.get('res.users').browse(cr, uid, uid, context) + res['time_unit'] = user.company_id.project_time_mode_id.id else: - res.update({'tax_policy': 'no_tax'}) + try: + product = ir_model_data.get_object(cr, uid, 'product', 'product_product_consultant') + res['time_unit'] = product.uom_id.id + except ValueError: + # keep default value in that case + _logger.warning("Product with xml_id 'product.product_product_consultant' not found") return res - def get_default_sale_config(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') - default_picking_policy = ir_values.get_default(cr, uid, 'sale.order', 'picking_policy') - return { - 'default_picking_policy': default_picking_policy == 'one', - } + def _get_default_time_unit(self, cr, uid, context=None): + ids = self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=context) + return ids and ids[0] or False _defaults = { - 'default_order_policy': 'manual', - 'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False, - 'tax_policy': 'global_on_order', + 'time_unit': _get_default_time_unit, } - def _check_default_tax(self, cr, uid, context=None): - ir_values_obj = self.pool.get('ir.values') - for tax in ir_values_obj.get(cr, uid, 'default', False, ['product.product']): - if tax[1] == 'taxes_id': - return tax[2] - return False - def set_sale_defaults(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') - ir_values_obj = self.pool.get('ir.values') - data_obj = self.pool.get('ir.model.data') - menu_obj = self.pool.get('ir.ui.menu') - res = {} + ir_model_data = self.pool.get('ir.model.data') wizard = self.browse(cr, uid, ids)[0] - default_picking_policy = 'one' if wizard.default_picking_policy else 'direct' - ir_values.set_default(cr, uid, 'sale.order', 'picking_policy', default_picking_policy) - if wizard.time_unit: - prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id - product_obj = self.pool.get('product.product') - product_obj.write(cr, uid, prod_id, {'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) - - if wizard.task_work and wizard.time_unit: - company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id - self.pool.get('res.company').write(cr, uid, [company_id], { - 'project_time_mode_id': wizard.time_unit.id - }, context=context) + try: + product = ir_model_data.get_object(cr, uid, 'product', 'product_product_consultant') + product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) + except ValueError: + _logger.warning("Product with xml_id 'product.product_product_consultant' not found, UoMs not updated!") - return res + if wizard.module_project and wizard.time_unit: + user = self.pool.get('res.users').browse(cr, uid, uid, context) + user.company_id.write({'project_time_mode_id': wizard.time_unit.id}) + return {} def onchange_task_work(self, cr, uid, ids, task_work, context=None): - res = {'value': {}} - if task_work: - res['value'].update({'module_project_timesheet': True}) - res['value'].update({'module_project_mrp': True}) - else: - res['value'].update({'module_project_timesheet': False}) - res['value'].update({'module_project_mrp': False}) - - return res - - def onchange_tax_policy(self, cr, uid, ids, tax_policy, context=None): - res = {'value': {}} - if ids: - self.set_tax_policy(cr, uid, ids, context=context) - if tax_policy == 'global_on_order': - res['value'].update({'group_sale_taxes_global_on_order': True}) - res['value'].update({'group_sale_taxes_on_order_line': False}) - - elif tax_policy == 'on_order_line': - res['value'].update({'group_sale_taxes_on_order_line': True}) - res['value'].update({'group_sale_taxes_global_on_order': False}) - else: - res['value'].update({'group_sale_taxes_on_order_line': False, 'group_sale_taxes_global_on_order': False}) - return res + return {'value': { + 'module_project_timesheet': task_work, + 'module_project_mrp': task_work, + }} + + def onchange_timesheet(self, cr, uid, ids, timesheet, context=None): + return {'value': { + 'timesheet': timesheet, + 'module_account_analytic_analysis': timesheet, + }} + +class account_config_settings(osv.osv_memory): + _inherit = 'account.config.settings' + _columns = { + 'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales', + help="""This allows install module sale_analytic_plans."""), + 'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales', + implied_group='sale.group_analytic_accounting', + help="Allows you to specify an analytic account on sales orders."), + } - def set_default_taxes(self, cr, uid, ids, context=None): - ir_values_obj = self.pool.get('ir.values') - taxes = self._check_default_tax(cr, uid, context=context) - if taxes: - ir_values_obj.set(cr, uid, 'default', False, 'tax_id', ['sale.order'], taxes[0]) - ir_values_obj.set(cr, uid, 'default', False, 'tax_id', ['sale.order.line'], taxes) - ir_values_obj.set(cr, uid, 'default', False, 'taxes_id', ['product.product'], taxes) + def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None): + """ change group_analytic_account_for_sales following module_sale_analytic_plans """ + if not module_sale_analytic_plans: + return {} + return {'value': {'group_analytic_account_for_sales': module_sale_analytic_plans}} # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: