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

[jftempo]

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2016-12-05 15:18:05 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2016-12-15 08:33:29 +0000
@@ -541,7 +541,7 @@
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Details')}:</Data></Cell>
     <Cell ss:StyleID="sData"><Data ss:Type="String">${o.details or ''|x}</Data></Cell>
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Currency')}:</Data></Cell>
-    <Cell ss:StyleID="sData"><Data ss:Type="String">${get_same_and_default_currency(o)[1].name or ''|x}</Data></Cell>
+    <Cell ss:StyleID="sData"><Data ss:Type="String">${o.company_id.currency_id.name or ''|x}</Data></Cell>
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Tender Priority')}:</Data></Cell>
     <Cell ss:StyleID="sData"><Data ss:Type="String">${getSel(o, 'priority')|x}</Data></Cell>
    </Row>
 
=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.py'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2016-12-05 15:15:27 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2016-12-15 08:33:29 +0000
@@ -17,8 +17,6 @@
         super(tender_rfq_comparison, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'get_compare_lines': self.get_compare_lines,
-            'gen_line_link': self.gen_line_link,
-            'get_same_and_default_currency': self.get_same_and_default_currency,
         })
 
     def get_compare_lines(self, tender_obj):
@@ -85,42 +83,5 @@
 
         return lines
 
-    def get_same_and_default_currency(self, tender_obj):
-
-        if tender_obj == 'draft' or not tender_obj.rfq_ids:
-            return (True, self.localcontext['company'].currency_id)
-
-        current_cur = False
-
-        for rfq in tender_obj.rfq_ids:
-            next_cur = rfq.currency_id
-            if current_cur and current_cur.id != next_cur.id:
-                return (False, self.localcontext['company'].currency_id)
-            current_cur = rfq.currency_id
-        return (True, current_cur)
-
-    def gen_line_link(self, tender_obj):
-        link_line_supp = {}
-
-        same_cur, currency = self.get_same_and_default_currency(tender_obj)
-        cur_obj = self.pool.get('res.currency')
-
-        if tender_obj.rfq_ids:
-            # fine we have rfqs
-            for rfq in tender_obj.rfq_ids:
-                for line in rfq.order_line:
-                    data = {'notes': line.notes, 'price_unit': line.price_unit}
-                    if not same_cur:
-                        data['price_unit'] = cur_obj.compute(self.cr, self.uid, line.currency_id.id, currency.id, line.price_unit, round=True)
-
-                    link_line_supp.setdefault(line.product_id.id, {}).setdefault(rfq.partner_id.id, data)
-        elif tender_obj.supplier_ids:
-            for line in tender_obj.tender_line_ids:
-                link_line_supp[line.product_id.id] = {}
-                for supp in tender_obj.supplier_ids:
-                    link_line_supp[line.product_id.id][supp.id] = {}
-
-        return link_line_supp
-
 
 SpreadsheetReport('report.tender_rfq_comparison_xls', 'tender', 'tender_flow/report/tender_rfq_comparison_xls.mako', parser=tender_rfq_comparison)