Merge lp:~julie-w/unifield-server/US-5116 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2018-04-27 09:58:55 +0000
+++ bin/addons/account/account_move_line.py	2018-09-20 14:23:18 +0000
@@ -445,6 +445,19 @@
             res[line_id] = (invoice_id, invoice_names[invoice_id])
         return res
 
+    def _get_purchase_order_id(self, cr, uid, ids, name, arg, context=None):
+        """
+        Returns a dict with key = id of the JI, and value = id of the related PO,
+        in case the JI is linked to an invoice which is linked to a PO
+        """
+        if context is None:
+            context = {}
+        res = {}
+        for aml in self.browse(cr, uid, ids, fields_to_fetch=['invoice'], context=context):
+            po = aml.invoice and aml.invoice.purchase_ids and aml.invoice.purchase_ids[0]  # only one PO can be linked to an SI
+            res[aml.id] = po and po.id or False
+        return res
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -563,6 +576,8 @@
                                    "this field will contain the basic amount(without tax)."),
         'invoice': fields.function(_invoice, method=True, string='Invoice',
                                    type='many2one', relation='account.invoice', fnct_search=_invoice_search),
+        'purchase_order_id': fields.function(_get_purchase_order_id, method=True, string='Purchase Order',
+                                             type='many2one', relation='purchase.order', readonly=True, store=False),
         'account_tax_id':fields.many2one('account.tax', 'Tax'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         #TODO: remove this
 
=== modified file 'bin/addons/account_override/account_analytic_line.py'
--- bin/addons/account_override/account_analytic_line.py	2014-04-07 16:30:45 +0000
+++ bin/addons/account_override/account_analytic_line.py	2018-09-20 14:23:18 +0000
@@ -53,6 +53,10 @@
         'journal_id': fields.many2one('account.analytic.journal', 'Journal Code', required=True, ondelete='restrict', select=True, readonly=True),
         'journal_type': fields.related('journal_id', 'type', 'Journal type', readonly=True),
         'move_id': fields.many2one('account.move.line', 'Entry Sequence', ondelete='restrict', select=True, readonly=True, domain="[('account_id.user_type.code', 'in', ['expense', 'income'])]"), # UF-1719: Domain added for search view
+        'invoice_id': fields.related('move_id', 'invoice', type='many2one', relation='account.invoice',
+                                     string='Invoice', readonly=True, store=False),
+        'purchase_order_id': fields.related('move_id', 'purchase_order_id', type='many2one', relation='purchase.order',
+                                            string='Purchase Order', readonly=True, store=False),
     }
 
 account_analytic_line()
 
=== modified file 'bin/addons/finance/account_analytic_line_view.xml'
--- bin/addons/finance/account_analytic_line_view.xml	2016-02-24 10:22:18 +0000
+++ bin/addons/finance/account_analytic_line_view.xml	2018-09-20 14:23:18 +0000
@@ -66,6 +66,8 @@
                             <field name="move_id"/>
                             <field name="is_reversal" readonly="True"/>
                             <field name="reversal_origin"/>
+                            <field name="invoice_id" invisible="1"/>
+                            <field name="purchase_order_id" invisible="1"/>
                         </group>
                     </group>
                 </form>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-09-03 09:00:00 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-09-20 14:23:18 +0000
@@ -75022,6 +75022,7 @@
 #: field:wizard.import.cheque.lines,line_id:0
 #: field:wizard.invoice.date,invoice_id:0
 #: field:wizard.invoice.line,invoice_id:0
+#: field:account.analytic.line,invoice_id:0
 #: report:allocation.invoices.report:0
 #: selection:res.request,ref_doc1:0
 #: selection:res.request,ref_doc2:0
@@ -83984,7 +83985,7 @@
 msgid "L2"
 msgstr "L2"
 
-#. modules: tender_flow, purchase_allocation_report, return_claim, order_line_number, msf_doc_import, analytic_distribution, finance, sales_followup, service_purchasing, purchase_override, specific_rules, base, delete_button, res_currency_functional, msf_cross_docking, purchase, register_accounting, documents_done, sale, transport_mgmt, procurement, sourcing, msf_audittrail, sync_so, msf_tools
+#. modules: tender_flow, purchase_allocation_report, return_claim, order_line_number, msf_doc_import, analytic_distribution, finance, sales_followup, service_purchasing, purchase_override, specific_rules, base, delete_button, res_currency_functional, msf_cross_docking, purchase, register_accounting, documents_done, sale, transport_mgmt, procurement, sourcing, msf_audittrail, sync_so, msf_tools, account_override, account
 #: field:analytic.distribution.wizard,purchase_id:0
 #: selection:res.request,ref_doc1:0
 #: selection:res.request,ref_doc2:0
@@ -84038,6 +84039,8 @@
 #: model:process.node,name:tender_flow.process_node_tender_po
 #: model:ir.model,name:transport_mgmt.model_purchase_order
 #: field:automated.import.files.available,po_id:0
+#: field:account.move.line,purchase_order_id:0
+#: field:account.analytic.line,purchase_order_id:0
 msgid "Purchase Order"
 msgstr "Bon de Commande"
 
 
=== modified file 'bin/addons/res_currency_functional/account_move_line_view.xml'
--- bin/addons/res_currency_functional/account_move_line_view.xml	2018-08-16 12:38:52 +0000
+++ bin/addons/res_currency_functional/account_move_line_view.xml	2018-09-20 14:23:18 +0000
@@ -67,6 +67,7 @@
                         <field name="revaluation_reference" invisible="1"/>
                         <field name="revaluation_date" invisible="1"/>
                         <field name="invoice" invisible="1"/>
+                        <field name="purchase_order_id" invisible="1"/>
                         <field name="cheque_number" invisible="1"/>
                     </group>