diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index 67918c95f73..a5170efdd1a 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -17,18 +17,6 @@ accounts - - - SAL - Sales - sale - - - PUR - Purchases - purchase - - diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml index 706ee32a440..1b04d0f6550 100644 --- a/addons/account/demo/account_invoice_demo.yml +++ b/addons/account/demo/account_invoice_demo.yml @@ -100,12 +100,12 @@ price_unit: 10.0 quantity: 1.0 product_id: product.product_product_39 - uos_id: product.product_uom_unit + uom_id: product.product_uom_unit - name: 'Zed+ Antivirus' price_unit: 4.0 quantity: 1.0 product_id: product.product_product_43 - uos_id: product.product_uom_unit + uom_id: product.product_uom_unit - !record {model: account.invoice, id: demo_invoice_january_wages}: company_id: base.main_company diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index f28383abcc5..48d81137f5b 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -7323,6 +7323,12 @@ msgstr "" #: model:ir.actions.act_window,help:account.action_account_operation_template msgid "Those can be used to quickly create a journal items when reconciling\n" " a bank statement or an account." + +#. module: account +#: field:account.analytic.line,product_uom_id:0 +#: field:account.invoice.line,uom_id:0 +#: field:account.move.line,product_uom_id:0 +msgid "Unit of Measure" msgstr "" #. module: account @@ -8387,4 +8393,3 @@ msgstr "" #: model:ir.ui.view,arch_db:account.view_bank_statement_form msgid "→ Count" msgstr "" - diff --git a/addons/account/models/account.py b/addons/account/models/account.py index c29e222b11a..b98390b8d04 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -224,7 +224,6 @@ class AccountJournal(models.Model): company_id = fields.Many2one('res.company', string='Company', required=True, index=1, default=lambda self: self.env.user.company_id, help="Company related to this journal") - analytic_journal_id = fields.Many2one('account.analytic.journal', string='Analytic Journal', help="Journal for analytic entries") refund_sequence = fields.Boolean(string='Dedicated Refund Sequence', help="Check this box if you don't want to share the same sequence for invoices and refunds made from this journal", default=True) inbound_payment_method_ids = fields.Many2many('account.payment.method', 'account_journal_inbound_payment_method_rel', 'journal_id', 'inbound_payment_method', diff --git a/addons/account/models/account_analytic_line.py b/addons/account/models/account_analytic_line.py index f429add6f41..a2f06c778d7 100644 --- a/addons/account/models/account_analytic_line.py +++ b/addons/account/models/account_analytic_line.py @@ -14,119 +14,24 @@ class AccountAnalyticLine(models.Model): general_account_id = fields.Many2one('account.account', string='Financial Account', ondelete='restrict', related='move_id.account_id', store=True, domain=[('deprecated', '=', False)]) move_id = fields.Many2one('account.move.line', string='Move Line', ondelete='cascade', index=True) - journal_id = fields.Many2one('account.analytic.journal', string='Analytic Journal', required=True, ondelete='restrict', index=True) code = fields.Char(size=8) ref = fields.Char(string='Ref.') currency_id = fields.Many2one('res.currency', related='move_id.currency_id', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True) amount_currency = fields.Monetary(related='move_id.amount_currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True) partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True) - # Compute the cost based on the price type define into company - # property_valuation_price_type property - @api.v7 - def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id, - unit=False, journal_id=False, context=None): - if context is None: - context = {} - if not journal_id: - j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'purchase')]) - journal_id = j_ids and j_ids[0] or False - if not journal_id: - return {} - product_obj = self.pool.get('product.product') - analytic_journal_obj = self.pool.get('account.analytic.journal') - product_price_type_obj = self.pool.get('product.price.type') - product_uom_obj = self.pool.get('product.uom') - j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context) - prod = product_obj.browse(cr, uid, prod_id, context=context) - result = 0.0 - if prod_id: - unit_obj = False - if unit: - unit_obj = product_uom_obj.browse(cr, uid, unit, context=context) - if not unit_obj or prod.uom_id.category_id.id != unit_obj.category_id.id: - unit = prod.uom_id.id - if j_id.type == 'purchase': - if not unit_obj or prod.uom_po_id.category_id.id != unit_obj.category_id.id: - unit = prod.uom_po_id.id - if j_id.type <> 'sale': - a = prod.property_account_expense_id.id - if not a: - a = prod.categ_id.property_account_expense_categ_id.id - else: - a = prod.property_account_income_id.id - if not a: - a = prod.categ_id.property_account_income_categ_id.id - - flag = False - # Compute based on pricetype - product_price_type_ids = product_price_type_obj.search(cr, uid, [('field', '=', 'standard_price')], context=context) - pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0] - if journal_id: - journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context) - if journal.type == 'sale': - product_price_type_ids = product_price_type_obj.search(cr, uid, [('field', '=', 'list_price')], context=context) - if product_price_type_ids: - pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0] - # Take the company currency as the reference one - if pricetype.field == 'list_price': - flag = True - ctx = context.copy() - if unit: - # price_get() will respect a 'uom' in its context, in order - # to return a default price for those units - ctx['uom'] = unit - amount_unit = prod.price_get(pricetype.field, context=ctx) - if amount_unit: - amount_unit = amount_unit[prod.id] - else: - amount_unit = 0.0 - - amount = amount_unit * quantity or 0.0 - cur_record = self.browse(cr, uid, id, context=context) - currency = cur_record.exists() and cur_record.currency_id or prod.company_id.currency_id - result = round(amount, currency.decimal_places) - if not flag: - result *= -1 - return {'value': { - 'amount': result, - 'general_account_id': a, - 'product_uom_id': unit - } - } - @api.v8 @api.onchange('product_id', 'product_uom_id') def on_change_unit_amount(self): product_price_type_obj = self.env['product.price.type'] - - journal_id = self.journal_id - if not journal_id: - journal_id = self.env['account.analytic.journal'].search([('type', '=', 'purchase')], limit=1) - if not journal_id or not self.product_id: - return {} - result = 0.0 unit = False if self.product_id: unit = self.product_uom_id.id if not self.product_uom_id or self.product_id.uom_id.category_id.id != self.product_uom_id.category_id.id: unit = self.product_id.uom_id.id - if journal_id.type == 'purchase': - if not self.product_uom_id or self.product_id.uom_po_id.category_id.id != self.product_uom_id.category_id.id: - unit = self.product_id.uom_po_id.id - if journal_id.type != 'sale': - account = self.product_id.property_account_expense_id.id or self.product_id.categ_id.property_account_expense_categ_id.id - if not account: - raise UserError(_('There is no expense account defined ' \ - 'for this product: "%s" (id:%d).') % \ - (self.product_id.name, self.product_id.id,)) - else: - account = self.product_id.property_account_income_id.id or self.product_id.categ_id.property_account_income_categ_id.id - if not account: - raise UserError(_('There is no income account defined ' \ - 'for this product: "%s" (id:%d).') % \ - (self.product_id.name, self.product_id.id,)) + account = self.product_id.property_account_income_id.id or self.product_id.categ_id.property_account_income_categ_id.id + if not account: account = False ctx = dict(self._context or {}) if unit: @@ -134,17 +39,13 @@ class AccountAnalyticLine(models.Model): # to return a default price for those units ctx['uom'] = unit - # Compute based on pricetype - amount_unit = 0.0 pricetype = False + amount_unit = 0.0 if self.product_id: - if journal_id.type == 'sale': - pricetype = product_price_type_obj.search([('field', '=', 'list_price')], limit=1) - else: - pricetype = product_price_type_obj.search([('field', '=', 'standard_price')], limit=1) + # Compute based on pricetype + pricetype = product_price_type_obj.search([('field', '=', 'list_price')], limit=1) amount_unit = self.product_id.with_context(ctx).price_get(pricetype.field)[self.product_id.id] - - amount = amount_unit * self.unit_amount + amount = amount_unit * self.unit_amount or 0.0 result = round(amount, self.currency_id.decimal_places) if pricetype and pricetype.field != 'list_price': result *= -1 diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index a93bd6c5809..34932b7c1a3 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -70,16 +70,6 @@ class AccountInvoice(models.Model): journal = self._default_journal() return journal.currency_id or journal.company_id.currency_id - @api.model - @api.returns('account.analytic.journal', lambda r: r.id) - def _get_journal_analytic(self, inv_type): - """ Return the analytic journal corresponding to the given invoice type. """ - journal_type = TYPE2JOURNAL.get(inv_type, 'sale') - journal = self.env['account.analytic.journal'].search([('type', '=', journal_type)], limit=1) - if not journal: - raise UserError(_("You must define an analytic journal of type '%s'!") % (journal_type,)) - return journal - @api.model def _get_reference_type(self): return [('none', _('Free Reference'))] @@ -604,7 +594,7 @@ class AccountInvoice(models.Model): 'price': line.price_subtotal, 'account_id': line.account_id.id, 'product_id': line.product_id.id, - 'uos_id': line.uos_id.id, + 'uom_id': line.uom_id.id, 'account_analytic_id': line.account_analytic_id.id, 'tax_ids': tax_ids, 'invoice_id': self.id, @@ -777,7 +767,7 @@ class AccountInvoice(models.Model): 'currency_id': line.get('currency_id', False), 'quantity': line.get('quantity', 1.00), 'product_id': line.get('product_id', False), - 'product_uom_id': line.get('uos_id', False), + 'product_uom_id': line.get('uom_id', False), 'analytic_account_id': line.get('account_analytic_id', False), 'invoice_id': line.get('invoice_id', False), 'tax_ids': line.get('tax_ids', False), @@ -983,8 +973,6 @@ class AccountInvoiceLine(models.Model): @api.multi def _get_analytic_line(self): ref = self.invoice_id.number - if not self.invoice_id.journal_id.analytic_journal_id: - raise UserError(_("No Analytic Journal! You have to define an analytic journal on the '%s' journal!") % (self.invoice_id.journal_id.name,)) return { 'name': self.name, 'date': self.invoice_id.date_invoice, @@ -992,9 +980,8 @@ class AccountInvoiceLine(models.Model): 'unit_amount': self.quantity, 'amount': self.price_subtotal_signed, 'product_id': self.product_id.id, - 'product_uom_id': self.uos_id.id, + 'product_uom_id': self.uom_id.id, 'general_account_id': self.account_id.id, - 'journal_id': self.invoice_id.journal_id.analytic_journal_id.id, 'ref': ref, } @@ -1028,7 +1015,7 @@ class AccountInvoiceLine(models.Model): help="Gives the sequence of this line when displaying the invoice.") invoice_id = fields.Many2one('account.invoice', string='Invoice Reference', ondelete='cascade', index=True) - uos_id = fields.Many2one('product.uom', string='Unit of Measure', + uom_id = fields.Many2one('product.uom', string='Unit of Measure', ondelete='set null', index=True) product_id = fields.Many2one('product.product', string='Product', ondelete='restrict', index=True) @@ -1109,7 +1096,7 @@ class AccountInvoiceLine(models.Model): if not self.product_id: if type not in ('in_invoice', 'in_refund'): self.price_unit = 0.0 - domain['uos_id'] = [] + domain['uom_id'] = [] else: if part.lang: product = self.product_id.with_context(lang=part.lang) @@ -1130,9 +1117,9 @@ class AccountInvoiceLine(models.Model): if product.description_sale: self.name += '\n' + product.description_sale - if not self.uos_id or product.uom_id.category_id.id != self.uos_id.category_id.id: - self.uos_id = product.uom_id.id - domain['uos_id'] = [('category_id', '=', product.uom_id.category_id.id)] + if not self.uom_id or product.uom_id.category_id.id != self.uom_id.category_id.id: + self.uom_id = product.uom_id.id + domain['uom_id'] = [('category_id', '=', product.uom_id.category_id.id)] if company and currency: if company.currency_id != currency: @@ -1140,9 +1127,9 @@ class AccountInvoiceLine(models.Model): self.price_unit = product.standard_price self.price_unit = self.price_unit * currency.with_context(dict(self._context or {}, date=self.date_invoice)).rate - if self.uos_id and self.uos_id.id != product.uom_id.id: + if self.uom_id and self.uom_id.id != product.uom_id.id: self.price_unit = self.env['product.uom']._compute_price( - product.uom_id.id, self.price_unit, self.uos_id.id) + product.uom_id.id, self.price_unit, self.uom_id.id) return {'domain': domain} @api.onchange('account_id') @@ -1155,20 +1142,20 @@ class AccountInvoiceLine(models.Model): else: self._set_taxes() - @api.onchange('uos_id') - def _onchange_uos_id(self): + @api.onchange('uom_id') + def _onchange_uom_id(self): warning = {} result = {} self._onchange_product_id() - if not self.uos_id: + if not self.uom_id: self.price_unit = 0.0 - if self.product_id and self.uos_id: - if self.product_id.uom_id.category_id.id != self.uos_id.category_id.id: + if self.product_id and self.uom_id: + if self.product_id.uom_id.category_id.id != self.uom_id.category_id.id: warning = { 'title': _('Warning!'), 'message': _('The selected unit of measure is not compatible with the unit of measure of the product.'), } - self.uos_id = self.product_id.uom_id.id + self.uom_id = self.product_id.uom_id.id if warning: result['warning'] = warning return result diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 61ec24fb777..160ac4f32ca 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1064,8 +1064,6 @@ class AccountMoveLine(models.Model): """ for obj_line in self: if obj_line.analytic_account_id: - if not obj_line.journal_id.analytic_journal_id: - raise UserError(_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, )) if obj_line.analytic_line_ids: obj_line.analytic_line_ids.unlink() vals_line = obj_line._prepare_analytic_line()[0] @@ -1085,7 +1083,6 @@ class AccountMoveLine(models.Model): 'product_uom_id': self.product_uom_id and self.product_uom_id.id or False, 'amount': (self.credit or 0.0) - (self.debit or 0.0), 'general_account_id': self.account_id.id, - 'journal_id': self.journal_id.analytic_journal_id.id, 'ref': self.ref, 'move_id': self.id, 'user_id': self.invoice_id.user_id.id or self._uid, diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 977482a888d..06c9788d633 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -135,20 +135,6 @@ class AccountChartTemplate(models.Model): @api.multi def _prepare_all_journals(self, acc_template_ref, company, journals_dict=None): - def _get_analytic_journal(journal_type): - # Get the analytic journal - data = False - try: - if journal['type'] == 'sale': - data = self.env.ref('account.analytic_journal_sale') - elif journal['type'] == 'purchase': - data = self.env.ref('account.exp') - elif journal['type'] == 'general': - pass - except ValueError: - pass - return data and data.id or False - def _get_default_account(journal_vals, type='debit'): # Get the default accounts default_account = False @@ -178,7 +164,6 @@ class AccountChartTemplate(models.Model): 'name': journal['name'], 'code': journal['code'], 'company_id': company.id, - 'analytic_journal_id': _get_analytic_journal(journal), 'default_credit_account_id': _get_default_account(journal, 'credit'), 'default_debit_account_id': _get_default_account(journal, 'debit'), 'refund_sequence': True, diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 8e5aaec22be..f2d0548819a 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -80,7 +80,7 @@ class AccountInvoiceReport(models.Model): ], 'account.invoice.line': [ 'account_id', 'invoice_id', 'price_subtotal', 'product_id', - 'quantity', 'uos_id', 'account_analytic_id', + 'quantity', 'uom_id', 'account_analytic_id', ], 'product.product': ['product_tmpl_id'], 'product.template': ['categ_id'], @@ -139,7 +139,7 @@ class AccountInvoiceReport(models.Model): JOIN res_partner partner ON ai.commercial_partner_id = partner.id LEFT JOIN product_product pr ON pr.id = ail.product_id left JOIN product_template pt ON pt.id = pr.product_tmpl_id - LEFT JOIN product_uom u ON u.id = ail.uos_id + LEFT JOIN product_uom u ON u.id = ail.uom_id LEFT JOIN product_uom u2 ON u2.id = pt.uom_id """ return from_str diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 31aa8dc143e..5dfbaeebf6f 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -17,8 +17,6 @@ access_account_bank_statement,account.bank.statement,model_account_bank_statemen access_account_bank_statement_line,account.bank.statement.line,model_account_bank_statement_line,account.group_account_user,1,1,1,1 access_account_analytic_line_manager,account.analytic.line manager,model_account_analytic_line,account.group_account_manager,1,0,0,0 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,base.group_user,1,0,0,0 -access_account_analytic_journal,account.analytic.journal,analytic.model_account_analytic_journal,account.group_account_user,1,0,0,0 -access_account_analytic_journal_user,account.analytic.journal,analytic.model_account_analytic_journal,base.group_user,1,1,1,0 access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,1 access_account_invoice_line_uinvoice,account.invoice.line,model_account_invoice_line,account.group_account_invoice,1,1,1,1 access_account_invoice_tax_uinvoice,account.invoice.tax,model_account_invoice_tax,account.group_account_invoice,1,1,1,1 @@ -31,7 +29,6 @@ access_account_journal_manager,account.journal,model_account_journal,account.gro access_account_journal_user,account.journal,model_account_journal,account.group_account_user,1,0,0,0 access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0 access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,1 -access_account_analytic_journal_manager,account.analytic.journal,analytic.model_account_analytic_journal,account.group_account_manager,1,1,1,1 access_res_currency_account_manager,res.currency account manager,base.model_res_currency,group_account_manager,1,1,1,1 access_res_currency_rate_account_manager,res.currency.rate account manager,base.model_res_currency_rate,group_account_manager,1,1,1,1 access_account_invoice_user,account.invoice user,model_account_invoice,base.group_user,1,0,0,0 diff --git a/addons/account/static/src/js/move_line_quickadd.js b/addons/account/static/src/js/move_line_quickadd.js index e77477a1c79..d60f0c3eaee 100644 --- a/addons/account/static/src/js/move_line_quickadd.js +++ b/addons/account/static/src/js/move_line_quickadd.js @@ -94,7 +94,6 @@ var QuickAddListView = ListView.extend({ else self.last_context["period_id"] = self.current_period; self.last_context["journal_type"] = self.current_journal_type; self.last_context["currency"] = self.current_journal_currency; - self.last_context["analytic_journal_id"] = self.current_journal_analytic; var compound_domain = new data.CompoundDomain(self.last_domain, domain); self.dataset.domain = compound_domain.eval(); return self.old_search(compound_domain, self.last_context, self.last_group_by); diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index 84f1533b237..f6dc9d4e267 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -9,7 +9,7 @@ price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 - uos_id: product.product_uom_unit + uom_id: product.product_uom_unit partner_id: base.res_partner_12 reference_type: none - diff --git a/addons/account/test/account_minimal_test.xml b/addons/account/test/account_minimal_test.xml index 9760eb53757..b59a6a5ec4e 100644 --- a/addons/account/test/account_minimal_test.xml +++ b/addons/account/test/account_minimal_test.xml @@ -223,7 +223,6 @@ sale - @@ -233,7 +232,6 @@ purchase - @@ -249,8 +247,6 @@ bank - - Cash - Test @@ -260,13 +256,11 @@ - Miscellaneous - Test TMIS general - diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 5054e9fe0ce..3383bfcc93a 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -128,52 +128,3 @@ data_dict = {'chart_account_id':ref('account.chart0'), 'target_move': 'all', 'account_report_id': ref('account_financial_report_balancesheet0')} from openerp.tools import test_reports test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account') -- - Print the Analytic Balance Report through the wizard -- - !python {model: account.analytic.account}: | - ctx={} - ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root')]}) - data_dict = {} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_balance',wiz_data=data_dict, context=ctx, our_module='account') - -- - Print the Cost Ledger Report through the wizard -- - !python {model: account.analytic.account}: | - ctx={} - ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root'),ref('analytic.analytic_absences'),ref('analytic.analytic_internal'),ref('analytic.analytic_our_super_product')]}) - data_dict = {} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_cost',wiz_data=data_dict, context=ctx, our_module='account') - -- - Print the Cost Ledger(Only Quantities) Report through the wizard -- - !python {model: account.analytic.account}: | - ctx={} - ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root'),ref('analytic.analytic_absences'),ref('analytic.analytic_internal'),ref('analytic.analytic_our_super_product')]}) - data_dict = {} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_cost_ledger_journal',wiz_data=data_dict, context=ctx, our_module='account') - -- - Print the Analytic Journal Report through the wizard -- - !python {model: account.analytic.journal}: | - ctx={} - ctx.update({'model': 'account.analytic.journal','active_ids': [ref('analytic.cose_journal_sale'), ref('account.exp'), ref('analytic.sit')]}) - data_dict = {} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_journal',wiz_data=data_dict, context=ctx, our_module='account') - -- - Print the Inverted Analytic Balance Report through the wizard -- - !python {model: account.analytic.account}: | - ctx={} - ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root')]}) - data_dict = {} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account') diff --git a/addons/account/tests/test_account_supplier_invoice.py b/addons/account/tests/test_account_supplier_invoice.py index 89c28ea2bd4..afe8ddc867a 100644 --- a/addons/account/tests/test_account_supplier_invoice.py +++ b/addons/account/tests/test_account_supplier_invoice.py @@ -11,8 +11,6 @@ class TestAccountSupplierInvoice(AccountingTestCase): }) analytic_account = self.env['account.analytic.account'].create({ 'name': 'test account', - 'state': 'open', - 'type': 'normal', }) # Should be changed by automatic on_change later diff --git a/addons/account/views/account_analytic_view.xml b/addons/account/views/account_analytic_view.xml index ec8c6949166..4675b45c86e 100644 --- a/addons/account/views/account_analytic_view.xml +++ b/addons/account/views/account_analytic_view.xml @@ -8,13 +8,10 @@ - - - + - - + - - - - - - - - - @@ -59,28 +45,16 @@ - - - - - - + - - - account.analytic.line.pivot @@ -103,7 +77,5 @@ - - diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index 5844364899f..4b99142eae1 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -44,7 +44,7 @@ - + @@ -65,7 +65,7 @@