X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fsale%2Fres_config.py;h=f4239b0e1a21b31155451f10b3bb6463165191f0;hb=7a75fa6ef5918e6a7291c8dec1faf978b1f82747;hp=95590f8f0c6db08d3ff981247efcee29c0a6cbdf;hpb=5766fec0bc5fe605aed70d1a6967354f06cd1975;p=odoo%2Fodoo.git diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 95590f8..f4239b0 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -19,134 +19,102 @@ # ############################################################################## -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. - This installs the modules project_timesheet and project_mrp."""), - 'timesheet': fields.boolean('Based on Timesheet', + 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('Manage Contracts', - help = """This installs the module account_analytic_analysis."""), - '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('Charge Delivery Costs', - help ="""Allows you to add delivery methods in sale orders and delivery orders. - You can define your own carrier and delivery grids for prices. - This installs the module delivery."""), - '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_pricelist':fields.boolean("Pricelist per Customer", + '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("Manage Different UoM for Products", + 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_sale_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice", - implied_group='sale.group_delivery_invoice_address', - help="Allows you to specify different delivery and invoice addresses on a sale order."), - 'group_discount_per_so_line': fields.boolean("Discount per Line", + '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 sale order line."), - 'module_sale_layout': fields.boolean("Notes & Subtotals per Line", - help="""Allows to format sale order lines using notes, separators, titles and subtotals. - This installs the module sale_layout."""), - '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. - This installs the module warning."""), - 'module_sale_margin': fields.boolean("Display Margins for Users", + 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 through Journals", + '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("User Function by Contract", + '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_analytic_journal_billing_rate': fields.boolean("Billing Rates by Contract", - help="""Allows you to define the default invoicing rate for a specific journal on a given account. - This installs the module analytic_journal_billing_rate."""), - 'module_project_timesheet': fields.boolean("Project Timesheet"), - 'module_project_mrp': fields.boolean("Project MRP"), '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): ir_model_data = self.pool.get('ir.model.data') res = super(sale_configuration, self).default_get(cr, uid, fields, context) - # task_work, time_unit depend on other fields - res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet') 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: - product = ir_model_data.get_object(cr, uid, 'product', 'product_consultant') - res['time_unit'] = product.uom_id.id + 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': _get_default_time_unit, } def set_sale_defaults(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') 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: - product = ir_model_data.get_object(cr, uid, 'product', 'product_consultant') - product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) + 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!") 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_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None): - if not group_invoice_deli_orders: - return {'value': {'default_order_policy': 'manual'}} - if not group_invoice_so_lines: - return {'value': {'default_order_policy': 'picking'}} return {} def onchange_task_work(self, cr, uid, ids, task_work, context=None): @@ -161,14 +129,20 @@ class sale_configuration(osv.osv_memory): 'module_account_analytic_analysis': timesheet, }} - - class account_config_settings(osv.osv_memory): _inherit = 'account.config.settings' _columns = { - 'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales', + '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 sale orders."), + help="Allows you to specify an analytic account on sales orders."), } + 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: