diff --git a/addons/account/__init__.py b/addons/account/__init__.py index 90fbdb83980..bc27e14380c 100644 --- a/addons/account/__init__.py +++ b/addons/account/__init__.py @@ -19,10 +19,10 @@ # ############################################################################## +import partner import account import installer import project -import partner import account_invoice import account_bank_statement import account_bank diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml index 4b3436c8a51..8ceb8a91885 100644 --- a/addons/account/account_bank_view.xml +++ b/addons/account/account_bank_view.xml @@ -9,7 +9,6 @@ Partner Bank Accounts - Journal res.partner.bank - form @@ -26,7 +25,6 @@ Partner Bank Accounts - Add currency on tree res.partner.bank - tree diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index d2661674bae..c92d4eda602 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -3,7 +3,6 @@ account.installer.form account.installer - form
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 064ba419ebd..012bde42eff 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1351,11 +1351,11 @@ class account_invoice_line(osv.osv): 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'), 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), 'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."), - 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')), + 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')), 'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float", digits_compute= dp.get_precision('Account'), store=True), - 'quantity': fields.float('Quantity', required=True), - 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')), + 'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True), + 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount')), 'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), 'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index d04030c909e..5aca260bc12 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -6,7 +6,6 @@ account.invoice.calendar account.invoice - calendar @@ -18,7 +17,6 @@ account.invoice.graph account.invoice - graph @@ -30,7 +28,6 @@ account.invoice.line.tree account.invoice.line - tree @@ -47,7 +44,6 @@ account.invoice.line.form account.invoice.line - form @@ -78,7 +74,6 @@ account.invoice.tax.tree account.invoice.tax - tree @@ -94,7 +89,6 @@ account.invoice.tax.form account.invoice.tax - form @@ -120,7 +114,6 @@ account.invoice.tree account.invoice - tree @@ -146,10 +139,9 @@ account.invoice.supplier.form account.invoice - form 2 - +
@@ -273,7 +269,6 @@ request.quotation.select purchase.order - search @@ -299,7 +294,6 @@ purchase.order.list.select purchase.order - search @@ -327,9 +321,8 @@ purchase.order.tree purchase.order - tree - + @@ -391,7 +384,6 @@ purchase.order.line.form purchase.order.line - form @@ -428,7 +420,6 @@ purchase.order.line.tree purchase.order.line - tree @@ -448,7 +439,6 @@ purchase.order.line.form2 purchase.order.line - form @@ -492,7 +482,6 @@ purchase.order.line.search purchase.order.line - search @@ -558,7 +547,6 @@ procurement.order.form.inherit procurement.order - form diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index f92dbd8a48a..dedee77e8a1 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -274,10 +274,10 @@ [[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] - [[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]] + [[ formatLang(line.price_unit, digits=get_digits(dp='Product Price') ) ]] - [[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]] + [[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]] @@ -293,7 +293,7 @@ Net Total : - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]] + [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]] @@ -306,7 +306,7 @@ Taxes : - [[ formatLang(o.amount_tax, dp='Purchase Price', currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]] @@ -319,7 +319,7 @@ Total : - [[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') , currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]] diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index f7d73bfb739..4ab6251c7a2 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -35,7 +35,6 @@ class purchase_report(osv.osv): 'name': fields.char('Year',size=64,required=False, readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'state': fields.selection([('draft', 'Request for Quotation'), - ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'), ('except_picking', 'Shipping Exception'), diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index aa915c620f5..842de65b68e 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -4,7 +4,6 @@ product.month.graph purchase.report - graph @@ -16,7 +15,6 @@ purchase.order.tree purchase.report - tree @@ -50,7 +48,6 @@ report.purchase.order.search purchase.report - search @@ -92,7 +89,6 @@ purchase.order.qty.amount.graph purchase.report - graph @@ -105,7 +101,6 @@ purchase.order.by.user.graph purchase.report - graph diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 4acbfaa49c4..6beac5a4cd0 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -59,21 +59,12 @@ class purchase_config_settings(osv.osv_memory): help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products. You can configure per product if you directly do a Request for Quotation to one supplier or if you want a purchase requisition to negotiate with several suppliers."""), - 'decimal_precision': fields.integer('specify decimal precision on price',help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."), } _defaults = { 'default_invoice_method': 'manual', } - def get_default_dp(self, cr, uid, fields, context=None): - dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase') - return {'decimal_precision': dp.digits} - - def set_default_dp(self, cr, uid, ids, context=None): - config = self.browse(cr, uid, ids[0], context) - dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase') - dp.write({'digits': config.decimal_precision}) diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 3682c9eefee..23d89f1a7f1 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -17,7 +17,6 @@ purchase settings purchase.config.settings - form
@@ -33,10 +32,6 @@
-
-
@@ -96,7 +91,6 @@ account settings account.config.settings - form diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index ffb09b669ae..ad1c26a84c1 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -4,7 +4,6 @@ stock.move.form stock.move - form @@ -15,7 +14,6 @@ Picking list stock.picking - form @@ -27,7 +25,6 @@ Incoming Picking Inherited stock.picking.in - form @@ -43,7 +40,6 @@ stock.picking.in.search stock.picking.in - search @@ -100,7 +96,6 @@ Purchase Picking Inherited purchase.order - form diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml index c15c8e4fe09..3093ec5a95a 100644 --- a/addons/purchase/wizard/purchase_line_invoice_view.xml +++ b/addons/purchase/wizard/purchase_line_invoice_view.xml @@ -7,7 +7,6 @@ Create invoices purchase.order.line_invoice - form diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml index 17b1f7eea5f..46aecf76244 100644 --- a/addons/purchase/wizard/purchase_order_group_view.xml +++ b/addons/purchase/wizard/purchase_order_group_view.xml @@ -4,7 +4,6 @@ Merger Purchase Orders purchase.order.group - form diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml index 498ceb2bd0a..d224b9800f7 100644 --- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml +++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml @@ -5,7 +5,6 @@ purchase.order.line.form.inherit purchase.order.line - form diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml index d093dcc6937..0557963fcb1 100644 --- a/addons/purchase_double_validation/board_purchase_view.xml +++ b/addons/purchase_double_validation/board_purchase_view.xml @@ -14,7 +14,6 @@ board.purchase.form board.board - form diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml index efba6bf9d76..5ad03705035 100644 --- a/addons/purchase_double_validation/purchase_double_validation_installer.xml +++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml @@ -5,7 +5,6 @@ Purchase Application purchase.config.settings - form
diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml index e6b255e3245..8a22c3be868 100644 --- a/addons/purchase_double_validation/purchase_double_validation_view.xml +++ b/addons/purchase_double_validation/purchase_double_validation_view.xml @@ -3,7 +3,6 @@ purchase.order.list.select.inherit - form purchase.order diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 9d9350e3257..cf0294730a7 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -69,7 +69,7 @@ class purchase_requisition(osv.osv): purchase_order_obj = self.pool.get('purchase.order') for purchase in self.browse(cr, uid, ids, context=context): for purchase_id in purchase.purchase_ids: - if str(purchase_id.state) in('draft','wait'): + if str(purchase_id.state) in('draft'): purchase_order_obj.action_cancel(cr,uid,[purchase_id.id]) self.write(cr, uid, ids, {'state': 'cancel'}) self.cancel_send_note(cr, uid, ids, context=context) diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index 797494e9442..0a442c3f9aa 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -4,7 +4,6 @@ purchase.order.form.inherit - form purchase.order @@ -16,7 +15,6 @@ purchase.order.list.select.inherit - form purchase.order @@ -28,7 +26,6 @@ purchase.requisition.form - form purchase.requisition @@ -112,7 +109,6 @@ purchase.requisition.tree - tree purchase.requisition @@ -131,7 +127,6 @@ purchase.requisition.list.select purchase.requisition - search @@ -183,7 +178,6 @@ product.form.inherit - form product.product @@ -197,7 +191,6 @@ procurement.form.inherit - form procurement.order diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml index aab257827c2..9e8c0893d30 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml @@ -4,7 +4,6 @@ Purchase Requisition purchase.requisition.partner - form diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index 73cf99bec34..4f02c8f8c75 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -40,7 +40,6 @@ report.intrastat.code.tree report.intrastat.code - tree @@ -51,7 +50,6 @@ report.intrastat.code.form report.intrastat.code - form @@ -76,7 +74,6 @@ report.intrastat.view report.intrastat - tree @@ -96,7 +93,6 @@ report.intrastat.search report.intrastat - search diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml index 04c21037e8e..bfbf2b2d79b 100644 --- a/addons/report_webkit/company_view.xml +++ b/addons/report_webkit/company_view.xml @@ -4,7 +4,6 @@ res.company.form.inherit res.company - form diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml index 0a052b8de20..30407f89385 100644 --- a/addons/report_webkit/header_view.xml +++ b/addons/report_webkit/header_view.xml @@ -3,9 +3,8 @@ res.company.header.img ir.header_img - form - + @@ -19,9 +18,8 @@ res.company.header.html ir.header_webkit - form - + diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml index fed94c92d70..e9f9ebd2234 100644 --- a/addons/report_webkit/ir_report_view.xml +++ b/addons/report_webkit/ir_report_view.xml @@ -4,7 +4,6 @@ ir.actions.report.xml.inherit ir.actions.report.xml - form diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml index 3d4b5bce6bb..f4ae735916e 100644 --- a/addons/report_webkit/wizard/report_webkit_actions_view.xml +++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml @@ -5,7 +5,6 @@ Report Webkit actions wizard report.webkit.actions - form diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 5b388469f3c..58f7789dc07 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -7,7 +7,6 @@ resource.resource.search resource.resource - search @@ -28,7 +27,6 @@ resource.calendar.search resource.calendar - search @@ -41,7 +39,6 @@ resource.calendar.leaves.search resource.calendar.leaves - search @@ -60,7 +57,6 @@ resource.calendar.form resource.calendar - form @@ -78,7 +74,6 @@ resource.calendar.tree resource.calendar - tree @@ -101,7 +96,6 @@ resource.calendar.attendance.tree resource.calendar.attendance - tree @@ -116,7 +110,6 @@ resource.calendar.attendance.form resource.calendar.attendance - form @@ -135,7 +128,6 @@ resource.calendar.leaves.calendar resource.calendar.leaves - calendar @@ -164,7 +156,6 @@ resource.resource.form resource.resource - form @@ -187,7 +178,6 @@ resource.resource.tree resource.resource - tree @@ -212,7 +202,6 @@ resource.calendar.leaves.form resource.calendar.leaves - form @@ -241,7 +230,6 @@ resource.calendar.leaves.tree resource.calendar.leaves - tree diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index c989beba2d4..702bc0c61cc 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -14,7 +14,6 @@ turnover.by.month.tree account.invoice.report - tree @@ -27,7 +26,6 @@ turnover.by.month.graph account.invoice.report - graph @@ -49,7 +47,6 @@ board.sales.form board.board - form diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml index fd4289a5bf6..032c264ebd6 100644 --- a/addons/sale/company_view.xml +++ b/addons/sale/company_view.xml @@ -4,7 +4,6 @@ res.company.mrp.config res.company - form 24 diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml index 2fe0a8cbfd3..181bd8183d7 100644 --- a/addons/sale/edi/sale_order_action_data.xml +++ b/addons/sale/edi/sale_order_action_data.xml @@ -37,7 +37,7 @@ Automated Sale Order Notification Mail - ${object.user_id.user_email or ''} + ${object.user_id.email or ''} ${object.company_id.name} Order (Ref ${object.name or 'n/a' }) ${object.partner_invoice_id.email} @@ -60,7 +60,7 @@ % if object.client_order_ref:   Your reference: ${object.client_order_ref}
% endif -   Your contact: ${object.user_id.name} +   Your contact: ${object.user_id.name}

@@ -139,7 +139,7 @@ Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confi % if object.client_order_ref: | Your reference: ${object.client_order_ref}
% endif - | Your contact: ${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''} + | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''} You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link: ${ctx.get('edi_web_url_view') or 'n/a'} @@ -166,7 +166,7 @@ Thank you for choosing ${object.company_id.name}! -- -${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''} +${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''} ${object.company_id.name} % if object.company_id.street: ${object.company_id.street or ''} diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 8fecc17e62c..9f7ba06db95 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -266,13 +266,13 @@ [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] - [[ formatLang(line.price_unit ) ]] + [[ formatLang(line.price_unit , digits=get_digits(dp='Product Price'))]] - [[ formatLang(line.discount) ]] + [[ formatLang(line.discount, digits=get_digits(dp='Discount'))]] - [[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] @@ -288,7 +288,7 @@ Net Total : - [[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.pricelist_id.currency_id) ]] @@ -301,7 +301,7 @@ Taxes : - [[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]] @@ -314,7 +314,7 @@ Total : - [[ formatLang(o.amount_total, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]] diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 1ac6d425530..2a60a9157dd 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -6,7 +6,6 @@ sale.report.tree sale.report - tree @@ -34,7 +33,6 @@ sale.report.graph sale.report - graph @@ -47,7 +45,6 @@ sale.report.search sale.report - search diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 50c8a32cfa6..0a2e3a49f62 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -98,17 +98,7 @@ class sale_configuration(osv.osv_memory): 'module_project_timesheet': fields.boolean("Project Timesheet"), 'module_project_mrp': fields.boolean("Project MRP"), 'module_project': fields.boolean("Project"), - 'decimal_precision': fields.integer("Decimal precision on prices:",help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."), } - def _check_decimal(self, cr, uid, ids, context=None): - for decimal in self.browse(cr, uid, ids, context=context): - if decimal.decimal_precision > 20: - return False - return True - - _constraints = [ - (_check_decimal, 'Digits must be between 0 to 20 ', ['decimal_precision']), - ] def default_get(self, cr, uid, fields, context=None): ir_model_data = self.pool.get('ir.model.data') @@ -139,14 +129,6 @@ class sale_configuration(osv.osv_memory): 'time_unit': _get_default_time_unit, } - def get_default_dp(self, cr, uid, fields, context=None): - dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_sale') - return {'decimal_precision': dp.digits} - - def set_default_dp(self, cr, uid, ids, context=None): - config = self.browse(cr, uid, ids[0], context) - dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_sale') - dp.write({'digits': config.decimal_precision}) def set_sale_defaults(self, cr, uid, ids, context=None): ir_values = self.pool.get('ir.values') diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 37dcd47b7fd..e07fcccedb2 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -5,7 +5,6 @@ sale settings sale.config.settings - form

@@ -96,10 +95,6 @@
-
-
@@ -143,7 +138,6 @@ account settings account.config.settings - form diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index d5062441d3f..f076bfda67c 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -27,7 +27,6 @@ res.partner.kanban.saleorder.inherit res.partner - kanban @@ -45,7 +44,6 @@ res.partner.view.buttons res.partner - form diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 722b22ba602..566b1ea2caa 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -247,19 +247,19 @@ class sale_order(osv.osv): fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."), 'note': fields.text('Terms and conditions'), - 'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount', + 'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount', store = { 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10), 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10), }, multi='sums', help="The amount without tax."), - 'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Taxes', + 'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Taxes', store = { 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10), 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10), }, multi='sums', help="The tax amount."), - 'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Total', + 'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Total', store = { 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10), 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10), @@ -1114,8 +1114,8 @@ class sale_order_line(osv.osv): 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), 'invoiced': fields.boolean('Invoiced', readonly=True), 'procurement_id': fields.many2one('procurement.order', 'Procurement'), - 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), - 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')), + 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}), + 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')), 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}), 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."), @@ -1127,7 +1127,7 @@ class sale_order_line(osv.osv): 'product_uos': fields.many2one('product.uom', 'Product UoS'), 'product_packaging': fields.many2one('product.packaging', 'Packaging'), 'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True), - 'discount': fields.float('Discount', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}), + 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}), 'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'), 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True, @@ -1205,7 +1205,7 @@ class sale_order_line(osv.osv): pu = 0.0 if uosqty: pu = round(line.price_unit * line.product_uom_qty / uosqty, - self.pool.get('decimal.precision').precision_get(cr, uid, 'Sale Price')) + self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')) fpos = line.order_id.fiscal_position or False account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id) if not account_id: diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 2257240dd10..a4a049fdbc5 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -17,7 +17,6 @@ sale.shop sale.shop - form