Port to v10

purchase_usability/purchase.py

@@ -1,48 +1,20 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
-##############################################################################
+# © 2015-2016 Akretion (http://www.akretion.com)
-#
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
-#    Purchase Usability Extension module for Odoo
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
-from openerp import models, fields, api
+from odoo import models, fields, api
-
-
-class PurchaseOrderLine(models.Model):
-    _inherit = 'purchase.order.line'
-    _order = 'order_id, sequence, id'
-
-    sequence = fields.Integer(string='Sequence', default=10)
 
 
 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')
+    currency_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')
     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(
+    @api.multi
-        compute='_purchase_stats', string='# of Purchase Order')
+    def _purchase_invoice_count(self):
-    supplier_invoice_count = fields.Integer(
+        poo = self.env['purchase.order']
-        compute='_purchase_stats', string='# Supplier Invoices')
+        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

purchase_usability/purchase_view.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-   Copyright (C) 2014 Akretion (http://www.akretion.com/)
+  © 2014-2016 Akretion (http://www.akretion.com/)
-   @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-   The licence is in the file __openerp__.py
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<openerp>
+<odoo>
-<data>
+
 
 <record id="purchase_order_form" model="ir.ui.view">
     <field name="name">usability.purchase.order.form</field>
@@ -16,6 +16,7 @@
     <field name="priority">1000</field>
     <field name="inherit_id" ref="purchase.purchase_order_form"/>
     <field name="arch" type="xml">
+        <!-- So far, I consider the shortcut icon are enough
         <notebook position="inside">
             <page string="Deliveries" states="approved,except_picking,except_invoice,done">
                 <field name="picking_ids" nolabel="1"/>
@@ -24,13 +25,12 @@
                 <field name="invoice_ids" nolabel="1" context="{'form_view_ref': 'account.invoice_supplier_form'}"/>
             </page>
         </notebook>
+        -->
+        <!--
         <page string="Deliveries &amp; Invoices" position="attributes">
             <attribute name="string">Other Information</attribute>
-        </page>
+        </page> -->
-        <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="before">
+        <field name="fiscal_position_id" position="attributes">
-            <field name="sequence" invisible="1"/>
-        </xpath>
-        <field name="fiscal_position" position="attributes">
             <attribute name="widget">selection</attribute>
         </field>
     </field>
@@ -40,13 +40,9 @@
     <field name="name">usability.purchase.order.tree</field>
     <field name="model">purchase.order</field>
     <field name="inherit_id" ref="purchase.purchase_order_tree"/>
-    <field name="priority">100</field>  <!-- to be after addition of payment_method -->
     <field name="arch" type="xml">
-        <field name="amount_total" position="after">
+        <field name="state" position="after">
-            <field name="currency_id" groups="base.group_multi_currency"/>
+            <field name="is_shipped" invisible="not context.get('show_purchase', False)"/>
-        </field>
-        <field name="state" position="before">
-            <field name="shipped"/>
         </field>
     </field>
 </record>
@@ -56,17 +52,18 @@
     <field name="model">purchase.order</field>
     <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
     <field name="arch" type="xml">
-        <filter name="not_invoiced" position="after">
+        <filter name="not_invoiced" position="before">
-            <filter name="shipped" string="Fully Received" domain="[('shipped', '=', True)]"/>
+            <filter name="shipped" string="Fully Received" domain="[('is_shipped', '=', True)]"/>
-            <filter name="not_shipped" string="Not Fully Received" domain="[('shipped', '=', False)]"/>
+            <filter name="not_shipped" string="Not Fully Received" domain="[('is_shipped', '=', False)]"/>
+            <separator/>
         </filter>
     </field>
 </record>
 
 <!-- Do not show cancelled quotations by default in "Requests for Quotation" -->
 <record id="purchase.purchase_rfq" model="ir.actions.act_window">
-    <field name="context">{'search_default_draft': True}</field>
+    <field name="context">{'search_default_draft': 1, 'search_default_todo': 1}</field>
 </record>
 
-</data>
+
-</openerp>
+</odoo>