Merge lp:~mallorymarcot/unifield-server/us-2726 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2018-05-15 07:18:42 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2018-08-02 12:00:46 +0000
@@ -149,6 +149,7 @@
                     <field name="requestor" />
                     <field name="ir_total_amount" string="Indicative Total Value"/>
                     <field name="functional_currency_id" />
+                    <field name="line_count"/>
                     <field name="state" />
                     <field name="warehouse_id" invisible="1" />
                 </tree>

=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2018-07-17 13:08:47 +0000
+++ bin/addons/sale/sale_order.py	2018-08-02 12:00:46 +0000
@@ -523,6 +523,29 @@
         return res
 
 
+    def _get_line_count(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the number of line(s) for the SO
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}.fromkeys(ids, 0)
+        line_number_by_order = {}
+
+        lines = self.pool.get('sale.order.line').search(cr, uid, [('order_id', 'in', ids)], context=context)
+        for l in self.pool.get('sale.order.line').read(cr, uid, lines, ['order_id', 'line_number', 'state'], context=context):
+            line_number_by_order.setdefault(l['order_id'][0], set())
+            if not l['state'].startswith('cancel'):
+                line_number_by_order[l['order_id'][0]].add(l['line_number'])
+
+        for so_id, ln in line_number_by_order.iteritems():
+            res[so_id] = len(ln)
+
+        return res
+
+
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
                             readonly=True, states={'draft': [('readonly', False)]}, select=True),
@@ -634,7 +657,8 @@
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
         'stock_take_date': fields.date(string='Date of Stock Take', required=False),
         'claim_name_goods_return': fields.char(string='Customer Claim Name', help='Name of the claim that created the IN-replacement/-missing which created the FO', size=512),
-        'draft_cancelled': fields.boolean(string='State', readonly=True)
+        'draft_cancelled': fields.boolean(string='State', readonly=True),
+        'line_count': fields.function(_get_line_count, method=True, type='integer', string="Line count", store=False),
     }
 
     _defaults = {

=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2018-03-08 13:55:31 +0000
+++ bin/addons/sale/sale_view.xml	2018-08-02 12:00:46 +0000
@@ -90,6 +90,7 @@
                     <field name="client_order_ref" groups="base.group_extended"/>
                     <field name="partner_id"/>
                     <field name="user_id" />
+                    <field name="line_count"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <!-- <field name="invoiced_rate" widget="progressbar"/> -->
                     <field name="amount_total" sum="Total Tax Included"/>

=== modified file 'bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml'
--- bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml	2017-10-11 16:16:09 +0000
+++ bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml	2018-08-02 12:00:46 +0000
@@ -13,6 +13,7 @@
                     <field name="client_order_ref" />
                     <field name="partner_id"/>
                     <field name="user_id" />
+                    <field name="line_count"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <!-- Remove invoiced rate because it's always N/A 
                     <field name="invoiced_rate" widget="progressbar"/>-->