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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/msf_custom_settings/view/purchase_view.xml'
--- bin/addons/msf_custom_settings/view/purchase_view.xml	2016-04-19 08:57:07 +0000
+++ bin/addons/msf_custom_settings/view/purchase_view.xml	2016-10-28 15:13:29 +0000
@@ -40,6 +40,8 @@
                             <field name="partner_address_id"  attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}"/>
                             <field name="origin" attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" widget="char"/>
                             <field name="internal_type" string="Zone"  />
+                            <field name="customer_ref" widget="char" />
+                            <label colspan="2"></label>
                             <field name="pricelist_id" string="Currency" domain="[('type', '=', 'purchase'), ('in_search', '=', partner_type)]"
                             colspan="3" attrs="{'readonly': [('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}"/>
                         </group>
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-10-04 12:27:11 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-10-28 15:13:29 +0000
@@ -110,5 +110,9 @@
         <record id="us_1766_fix_fxa_aji_curr" model="patch.scripts">
             <field name="method">us_1766_fix_fxa_aji_curr</field>
         </record>
+
+        <record id="us_635_dest_partner_ids" model="patch.scripts">
+            <field name="method">us_635_dest_partner_ids</field>
+        </record>
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-25 09:13:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-10-28 15:13:29 +0000
@@ -53245,8 +53245,10 @@
 msgid "Child Nomenclatures"
 msgstr "Nomenclatures Enfant"
 
-#. module: product
+#. modules: sales_followup, product, res_currency_functional
 #: field:product.product,partner_ref:0
+#: view:purchase.order.line:0
+#: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:216
 msgid "Customer ref"
 msgstr "Réf. Client"
 
@@ -74617,6 +74619,7 @@
 "	Number of columns is not equal to %s"
 msgstr "\n"
 "	Le nombre de colonnes n'est pas égal à %s"
+<<<<<<< TREE
 
 #. module: specific_rules
 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
@@ -74689,3 +74692,32 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+=======
+
+#. module: purchase_override
+#: field:purchase.order.line,customer_ref:0
+msgid "Customer ref."
+msgstr "Ref. Client"
+
+#. module: purchase_override
+#: field:purchase.order,customer_ref:0
+msgid "Customer Ref."
+msgstr "Ref. Client"
+
+#. module: purchase_override
+#: field:purchase.order,line_count:0
+msgid "Line count"
+msgstr "# de lignes"
+
+#. module: purchase_override
+#: report:msf.purchase.order:0
+msgid "Source Document :"
+msgstr "Document source :"
+
+#. module: purchase_override
+#: report:msf.purchase.order:0
+msgid "Customer reference :"
+msgstr "Référence client :"
+
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-10-04 12:27:11 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-10-28 15:13:29 +0000
@@ -891,6 +891,26 @@
                     currency_id != %s""", (currency_id, tuple(journal_ids), currency_id))
 
 
+    def us_635_dest_partner_ids(self, cr, uid, *a, **b):
+        """
+        Fill many2many field dest_partner_ids
+        """
+        context = {}
+        po_obj = self.pool.get('purchase.order')
+        so_obj = self.pool.get('sale.order')
+
+        po_ids = po_obj.search(cr, uid, [], context=context)
+        for po_id in po_ids:
+            so_ids = po_obj.get_so_ids_from_po_ids(cr, uid, po_id, context=context)
+            for so in so_obj.browse(cr, uid, so_ids, context=context):
+                if not so.procurement_request:
+                    po_obj.write(cr, uid, po_id, {
+                        'dest_partner_ids': [(4, so.partner_id.id)],
+                    }, context=context)
+
+        return True
+
+
 patch_scripts()
 
 
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-10-26 07:22:24 +0000
+++ bin/addons/purchase_override/purchase.py	2016-10-28 15:13:29 +0000
@@ -236,12 +236,34 @@
         return res
 
     def _get_no_line(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Compute the number of Purchase order lines in each purchase order.
+        A split line is count as one line
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of purchase.order ID to compute
+        :param field_name: Name of the field to compute
+        :param args: Extra parameters
+        :param context: Context of the call
+        :return: A dictionnary with the purchase.order ID as keys and the number of Purchase
+                 order lines for each of them as value
+        """
+        pol_obj = self.pool.get('sale.order.line')
+
+        if context is None:
+            context =  {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         res = {}
-        for order in self.read(cr, uid, ids, ['order_line'], context=context):
-            if order['order_line']:
-                res[order['id']] = False
-            else:
-                res[order['id']] = True
+
+        for order_id in ids:
+            res[order_id] = pol_obj.search_count(cr, uid, [
+                ('order_id', '=', order_id),
+                ('is_line_split', '=', False),
+            ], context=context)
+
         return res
 
     def _po_from_x(self, cr, uid, ids, field_names, args, context=None):
@@ -336,6 +358,52 @@
 
         return res
 
+    def _get_customer_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return a concatenation of the PO's customer references from the project (case of procurement request)
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        so_obj = self.pool.get('sale.order')
+        for po_id in ids:
+            res[po_id] = ""
+
+            so_ids = self.get_so_ids_from_po_ids(cr, uid, po_id, context=context)
+            for so in so_obj.read(cr, uid, so_ids, ['client_order_ref'], context=context):
+                if so['client_order_ref']:
+                    if res[po_id]:
+                        res[po_id] += ';'
+                    res[po_id] += so['client_order_ref']
+
+        return res
+
+    def _get_line_count(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the number of line(s) for the PO
+        '''
+        pol_obj = self.pool.get('purchase.order.line')
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        line_number_by_order = {}
+
+        lines = pol_obj.search(cr, uid, [('order_id', 'in', ids)], context=context)
+        for l in pol_obj.read(cr, uid, lines, ['order_id', 'line_number'], context=context):
+            line_number_by_order.setdefault(l['order_id'][0], set())
+            line_number_by_order[l['order_id'][0]].add(l['line_number'])
+
+        res = {}
+        for po_id, ln in line_number_by_order.iteritems():
+            res[po_id] = len(ln)
+
+
+        return res
+
+
+
     _columns = {
         'order_type': fields.selection([('regular', 'Regular'), ('donation_exp', 'Donation before expiry'),
                                         ('donation_st', 'Standard donation'), ('loan', 'Loan'),
@@ -416,8 +484,25 @@
             string='Update in progress',
             readonly=True,
         ),
+<<<<<<< TREE
         # US-1765: register the 1st call of wkf_confirm_trigger to prevent recursion error
         'po_confirmed': fields.boolean('PO', readonly=True),
+=======
+        'customer_ref': fields.function(
+            _get_customer_ref,
+            method=True,
+            string='Customer Ref.',
+            type='text',
+            store=False,
+        ),
+        'line_count': fields.function(
+            _get_line_count,
+            method=True,
+            type='integer',
+            string="Line count",
+            store=False,
+        ),
+>>>>>>> MERGE-SOURCE
     }
 
     _defaults = {
@@ -3671,6 +3756,20 @@
 
         return res
 
+    def _get_customer_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the customer ref from "sale.order".client_order_ref
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            res[pol.id] = pol.procurement_id and pol.procurement_id.sale_id and pol.procurement_id.sale_id.client_order_ref or False
+
+        return res
+
+
     _columns = {
         'is_line_split': fields.boolean(string='This line is a split line?'), # UTP-972: Use boolean to indicate if the line is a split line
         'merged_id': fields.many2one('purchase.order.merged.line', string='Merged line'),
@@ -3712,6 +3811,13 @@
             string='SoQ updated',
             readonly=True,
         ),
+        'customer_ref': fields.function(
+            _get_customer_ref,
+            method=True,
+            type="text",
+            store=False,
+            string="Customer ref.",
+        ),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/purchase_override/purchase_view.xml'
--- bin/addons/purchase_override/purchase_view.xml	2016-08-03 12:08:12 +0000
+++ bin/addons/purchase_override/purchase_view.xml	2016-10-28 15:13:29 +0000
@@ -183,7 +183,9 @@
                       <field name="partner_id" string="Supplier" />
                       <field name="delivery_requested_date" />
                       <field name="origin" />
+                      <field name="customer_ref"/>
                       <field name="dest_partner_names" />
+                      <field name="line_count" />
                       <field name="shipped_rate" widget="progressbar" />
                       <field name="invoiced_rate" widget="progressbar" />
                       <field name="amount_total" />
 
=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
--- bin/addons/purchase_override/report/purchase_order.rml	2016-03-21 13:31:17 +0000
+++ bin/addons/purchase_override/report/purchase_order.rml	2016-10-28 15:13:29 +0000
@@ -93,10 +93,10 @@
 
         <para style="Standard">[[ setLang(objects[0].partner_id.lang) ]]</para>
 
-        <blockTable colWidths="72.0,600.0,100.0" style="Origin">
+        <blockTable colWidths="90.0,582.0,100.0" style="Origin">
             <tr>
                 <td>
-                    <para style="TextInformation">Origin ref. :</para>
+                    <para style="TextInformation">Source Document :</para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ getOrigin(objects[0].origin, 5)[0] ]]</para>
@@ -106,6 +106,17 @@
                 </td>
             </tr>
             <tr>
+                <td>
+                    <para style="TextInformation">Customer reference :</para>
+                </td>
+                <td>
+                    <para style="TextInformation">[[ objects[0].customer_ref ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformation"> </para>
+                </td>
+            </tr>
+            <tr>
                 [[ repeatIn(getOrigin(objects[0].origin, 5)[1:], 'orig') ]]
                 <td>
                     <para style="TextInformation"> </para>
 
=== modified file 'bin/addons/res_currency_functional/order_line_view.xml'
--- bin/addons/res_currency_functional/order_line_view.xml	2014-10-10 08:22:30 +0000
+++ bin/addons/res_currency_functional/order_line_view.xml	2016-10-28 15:13:29 +0000
@@ -83,8 +83,9 @@
                         <field name="from_fo" invisible="1" />
                         <field name="tender_id" invisible="1" />
                         <group colspan="2" col="3">
-                            <field name="origin" on_change="on_change_origin(origin, procurement_id, parent.partner_type)" attrs="{'required': [('from_fo', '=', True)], 'readonly': ['|', ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}" />
+                            <field name="origin" on_change="on_change_origin(origin, procurement_id, parent.partner_type)" attrs="{'required': [('from_fo', '=', True)], 'readonly': ['|', ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}" string="Source Document" />
                             <field name="select_fo" on_change="on_change_select_fo(select_fo)" nolabel="1" domain="[('state', 'in', ['sourced', 'progress']), '|', ('split_type_sale_order', '=', parent.partner_type == 'esc' and 'esc_split_sale_order' or 'local_purchase_split_sale_order'), ('procurement_request', '=', True)]" attrs="{'invisible': ['|', ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}" />
+                            <field name="customer_ref" string="Customer ref" widget="char" />
                             <field name="display_sync_ref" invisible="1" />
                             <field name="instance_sync_order_ref" attrs="{'required': [('display_sync_ref', '=', True)], 'invisible': [('display_sync_ref', '=', False)]}" domain="[('order_id.name', '=', origin)]" />
                         </group>
 
=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2016-08-22 13:55:25 +0000
+++ bin/addons/sourcing/procurement_order.py	2016-10-28 15:13:29 +0000
@@ -226,9 +226,11 @@
             purchase_domain.append(('pricelist_id', '=', procurement.rfq_id.pricelist_id.id))
 
         line = None
+        order_customer_id = None
         sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('procurement_id', '=', procurement.id)], context=context)
         if sale_line_ids:
             line = self.pool.get('sale.order.line').browse(cr, uid, sale_line_ids[0], context=context)
+            order_customer_id = line.order_partner_id.id
             if line.product_id.type in ('service', 'service_recep') and not line.order_id.procurement_request:
                 if ('order_type', '!=', 'direct') in purchase_domain:
                     purchase_domain.remove(('order_type', '!=', 'direct'))
@@ -334,6 +336,8 @@
             if values.get('priority') and values['priority'] in priority_sorted.keys() and values['priority'] != po.priority:
                 if priority_sorted[values['priority']] < priority_sorted[po.priority]:
                     write_values['priority'] = values['priority']
+            if order_customer_id: 
+                write_values['dest_partner_ids'] = [(4, order_customer_id)]
 
             self.pool.get('purchase.order').write(cr, uid, purchase_ids[0], write_values, context=dict(context, import_in_progress=True))
 
@@ -387,6 +391,8 @@
                     values.update({'location_id': input_id, })
             if categ:
                 values.update({'categ': categ})
+            if order_customer_id:
+                values['dest_partner_ids'] = [(4, order_customer_id)]
             purchase_id = super(procurement_order, self).create_po_hook(cr, uid, ids, context=context, *args, **kwargs)
 
             if ir_to_link: