From f90aa12a9fac31d82e6335585eb6cedf40d33bcd Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 22 Nov 2016 14:39:53 +0100 Subject: [PATCH] Port to v10 --- purchase_usability/purchase.py | 78 ++++++++-------------------- purchase_usability/purchase_view.xml | 41 +++++++-------- 2 files changed, 42 insertions(+), 77 deletions(-) diff --git a/purchase_usability/purchase.py b/purchase_usability/purchase.py index 821fabb..d8a35d1 100644 --- a/purchase_usability/purchase.py +++ b/purchase_usability/purchase.py @@ -1,48 +1,20 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Purchase Usability Extension module for Odoo -# Copyright (C) 2015 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2015-2016 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api - - -class PurchaseOrderLine(models.Model): - _inherit = 'purchase.order.line' - _order = 'order_id, sequence, id' - - sequence = fields.Integer(string='Sequence', default=10) +from odoo import models, fields, api class PurchaseOrder(models.Model): _inherit = 'purchase.order' state = fields.Selection(track_visibility='onchange') - location_id = fields.Many2one(track_visibility='onchange') picking_type_id = fields.Many2one(track_visibility='onchange') dest_address_id = fields.Many2one(track_visibility='onchange') - pricelist_id = fields.Many2one(track_visibility='onchange') - date_approve = fields.Date(track_visibility='onchange') - validator = fields.Many2one(track_visibility='onchange') - invoice_method = fields.Selection(track_visibility='onchange') + currency_id = fields.Many2one(track_visibility='onchange') payment_term_id = fields.Many2one(track_visibility='onchange') - fiscal_position = fields.Many2one(track_visibility='onchange') + fiscal_position_id = fields.Many2one(track_visibility='onchange') incoterm_id = fields.Many2one(track_visibility='onchange') partner_ref = fields.Char(track_visibility='onchange') @@ -50,25 +22,21 @@ class PurchaseOrder(models.Model): class ResPartner(models.Model): _inherit = 'res.partner' - @api.one - def _purchase_stats(self): - poo = self.env['purchase.order'] - aio = self.env['account.invoice'] - try: - self.purchase_order_count = poo.search_count( - [('partner_id', 'child_of', self.id)]) - except: - pass - try: - self.supplier_invoice_count = aio.search_count([ - ('partner_id', 'child_of', self.id), - ('type', '=', 'in_invoice')]) - except: - pass - # Fix an access right issue when accessing partner form without being # a member of the purchase/User group - purchase_order_count = fields.Integer( - compute='_purchase_stats', string='# of Purchase Order') - supplier_invoice_count = fields.Integer( - compute='_purchase_stats', string='# Supplier Invoices') + @api.multi + def _purchase_invoice_count(self): + poo = self.env['purchase.order'] + aio = self.env['account.invoice'] + for partner in self: + try: + partner.purchase_order_count = poo.search_count( + [('partner_id', 'child_of', partner.id)]) + except: + pass + try: + partner.supplier_invoice_count = aio.search_count([ + ('partner_id', 'child_of', partner.id), + ('type', '=', 'in_invoice')]) + except: + pass diff --git a/purchase_usability/purchase_view.xml b/purchase_usability/purchase_view.xml index e01cc15..5af068e 100644 --- a/purchase_usability/purchase_view.xml +++ b/purchase_usability/purchase_view.xml @@ -1,12 +1,12 @@ - - + + usability.purchase.order.form @@ -16,6 +16,7 @@ 1000 + + + selection @@ -40,13 +40,9 @@ usability.purchase.order.tree purchase.order - 100 - - - - - + + @@ -56,17 +52,18 @@ purchase.order - - - + + + + - {'search_default_draft': True} + {'search_default_draft': 1, 'search_default_todo': 1} - - + +