Merge lp:~dorian-kemps/unifield-server/US-4950 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2019-04-30 15:23:48 +0000
+++ bin/addons/base/rng/view.rng	2019-05-13 07:25:28 +0000
@@ -488,7 +488,11 @@
             <rng:optional><rng:attribute name="filter_selector"/></rng:optional>
             <rng:optional><rng:attribute name="default_selector"/></rng:optional>
             <rng:optional><rng:attribute name="o2m_selectable"/></rng:optional>
+<<<<<<< TREE
             <rng:optional><rng:attribute name="required_error_msg"/></rng:optional>
+=======
+            <rng:optional><rng:attribute name="truncate"/></rng:optional>
+>>>>>>> MERGE-SOURCE
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="diagram"/>
 
=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-05-10 15:26:36 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-05-13 07:25:28 +0000
@@ -514,6 +514,7 @@
                     <field name="origin"/>
                     <field name="customer_ref"/>
                     <field name="dest_partner_names"/>
+                    <field name="details" truncate="15"/>
                     <field name="line_count"/>
                     <field name="shipped_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
 
=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2019-05-09 08:29:36 +0000
+++ bin/addons/sale/sale_view.xml	2019-05-13 07:25:28 +0000
@@ -89,6 +89,7 @@
                     <field name="date_order"/>
                     <field name="client_order_ref" groups="base.group_extended"/>
                     <field name="partner_id"/>
+                    <field name="details" truncate="15"/>
                     <field name="user_id" />
                     <field name="line_count"/>
                     <field name="picked_rate" widget="progressbar"/>
 
=== modified file 'bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml'
--- bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml	2019-04-05 08:34:04 +0000
+++ bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml	2019-05-13 07:25:28 +0000
@@ -12,6 +12,7 @@
                     <field name="date_order"/>
                     <field name="client_order_ref" />
                     <field name="partner_id"/>
+                    <field name="details" truncate="15"/>
                     <field name="user_id" />
                     <field name="line_count"/>
                     <field name="picked_rate" widget="progressbar"/>