Merge lp:~unifield-team/unifield-server/us-1322 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2015-11-30 15:23:17 +0000
+++ bin/addons/base/rng/view.rng	2017-01-16 10:07:36 +0000
@@ -81,6 +81,7 @@
             <rng:optional><rng:attribute name="hide_delete_button"/></rng:optional>
             <rng:optional><rng:attribute name="hide_edit_button"/></rng:optional>
             <rng:optional><rng:attribute name="hide_save_button"/></rng:optional>
+            <rng:optional><rng:attribute name="show_add_button"/></rng:optional>
             <rng:ref name="container"/>
         </rng:element>
     </rng:define>
@@ -147,6 +148,7 @@
             <rng:optional><rng:attribute name="hide_new_button"/></rng:optional>
             <rng:optional><rng:attribute name="hide_delete_button"/></rng:optional>
             <rng:optional><rng:attribute name="hide_edit_button"/></rng:optional>
+            <rng:optional><rng:attribute name="show_add_button"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>

=== modified file 'bin/addons/product_list/product_list.py'
--- bin/addons/product_list/product_list.py	2016-08-23 12:54:03 +0000
+++ bin/addons/product_list/product_list.py	2017-01-16 10:07:36 +0000
@@ -272,6 +272,24 @@
                     lambda self, cr, uid, ids, c=None: ids, ['name'], 20,
                 ),
             },
+            write_relate=False,
+        ),
+        'desc': fields.related(
+            'name',
+            'name',
+            string='Product Description',
+            readonly=True,
+            type='char',
+            size=64,
+            store={
+                'product.product': (
+                    _get_product, ['name'], 10,
+                ),
+                'product.list.line': (
+                    lambda self, cr, uid, ids, c=None: ids, ['name'], 20,
+                ),
+            },
+            write_relate=False,
         ),
         'comment': fields.char(
             size=256,

=== modified file 'bin/addons/product_list/product_list_view.xml'
--- bin/addons/product_list/product_list_view.xml	2016-01-13 15:55:27 +0000
+++ bin/addons/product_list/product_list_view.xml	2017-01-16 10:07:36 +0000
@@ -118,6 +118,30 @@
                   sequence="2"
                   action="action_product_list"
                   parent="base.menu_product" />
+
+        <record id="product_list_line_list_view" model="ir.ui.view">
+            <field name="name">product.list.line.list.view</field>
+            <field name="model">product.list.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products" show_add_button="1" hide_new_button="True">
+                    <field name="name" />
+                    <field name="comment" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="product_list_line_search_view" model="ir.ui.view">
+            <field name="name">product.list.line.search.view</field>
+            <field name="model">product.list.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Products">
+                    <field name="ref" />
+                    <field name="desc" />
+                </search>
+            </field>
+        </record>
                   
     </data>
 </openerp>