From 0971fb48e4219f9883de201077ab2f8c6e58ee86 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Tue, 1 Mar 2016 17:48:52 +0100
Subject: [PATCH] Move view code from sale_usability_extension to
 sale_stock_usability (pickings_ids belongs to sale_stock !)

---
 sale_stock_usability/__openerp__.py      |  3 ++-
 sale_stock_usability/sale_stock_view.xml | 12 ++++++++++++
 sale_usability_extension/__openerp__.py  | 15 +++++++++------
 sale_usability_extension/sale_view.xml   |  3 ---
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/sale_stock_usability/__openerp__.py b/sale_stock_usability/__openerp__.py
index 841375b..cd4142b 100644
--- a/sale_stock_usability/__openerp__.py
+++ b/sale_stock_usability/__openerp__.py
@@ -26,7 +26,7 @@
     'version': '0.2',
     'category': 'Sales Management',
     'license': 'AGPL-3',
-    'summary': 'use management',
+    'summary': 'Small usability improvements to the sale_stock module',
     'description': """
 Sale Stock Usability
 ====================
@@ -34,6 +34,7 @@ Sale Stock Usability
 The usability enhancements include:
 
 * *To invoice* filter on pickings filters on invoice_state = 2binvoiced AND state = done
+* Add a tab with the list of related pickings in sale order form
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
diff --git a/sale_stock_usability/sale_stock_view.xml b/sale_stock_usability/sale_stock_view.xml
index e986110..181b8e0 100644
--- a/sale_stock_usability/sale_stock_view.xml
+++ b/sale_stock_usability/sale_stock_view.xml
@@ -21,6 +21,18 @@
     </field>
 </record>
 
+<record id="view_order_form_inherit" model="ir.ui.view">
+    <field name="name">sale_stock_usability.sale_order_form</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale_stock.view_order_form_inherit"/>
+    <field name="arch" type="xml">
+        <notebook position="inside">
+            <page string="Delivery Orders" states="progress,waiting_date,manual,invoice_except,shipping_except,done">
+                <field name="picking_ids" nolabel="1"/>
+            </page>
+        </notebook>
+    </field>
+</record>
 
 </data>
 </openerp>
diff --git a/sale_usability_extension/__openerp__.py b/sale_usability_extension/__openerp__.py
index 7685cc6..3189e80 100644
--- a/sale_usability_extension/__openerp__.py
+++ b/sale_usability_extension/__openerp__.py
@@ -1,8 +1,8 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Sale Usability Extension module for OpenERP
-#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    Sale Usability Extension module for Odoo
+#    Copyright (C) 2014-2016 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
@@ -26,12 +26,15 @@
     'version': '0.1',
     'category': 'Sale Management',
     'license': 'AGPL-3',
-    'summary': 'Show invoices and deliveries on sale orders',
+    'summary': 'Show invoices on sale orders',
     'description': """
 Sale Usability Extension
 ========================
 
-Display Invoices and Delivery Orders on Sale Order form view (in dedicated tabs).
+Several small usability improvements:
+
+* Display Invoices on Sale Order form view (in dedicated tab).
+* Display currency in tree view
 
 Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for any help or question about this module.
     """,
@@ -41,5 +44,5 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
     'data': [
         'sale_view.xml',
         ],
-    'active': False,
+    'installable': True,
 }
diff --git a/sale_usability_extension/sale_view.xml b/sale_usability_extension/sale_view.xml
index ba349df..c68f937 100644
--- a/sale_usability_extension/sale_view.xml
+++ b/sale_usability_extension/sale_view.xml
@@ -14,9 +14,6 @@
     <field name="inherit_id" ref="sale.view_order_form"/>
     <field name="arch" type="xml">
         <notebook position="inside">
-            <page string="Delivery Orders" states="progress,waiting_date,manual,invoice_except,shipping_except,done">
-                <field name="picking_ids" nolabel="1"/>
-            </page>
             <page string="Invoices" states="progress,waiting_date,manual,invoice_except,shipping_except,done">
                 <field name="invoice_ids" nolabel="1" context="{'form_view_ref': 'account.invoice_form'}"/>
             </page>