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

[jftempo]

=== modified file 'bin/addons/sale/report/sale_donation_stock_moves_report.py'
--- bin/addons/sale/report/sale_donation_stock_moves_report.py	2017-08-22 14:01:48 +0000
+++ bin/addons/sale/report/sale_donation_stock_moves_report.py	2017-09-08 14:23:21 +0000
@@ -30,12 +30,14 @@
         super(sale_donation_stock_moves_report_parser, self).__init__(cr, uid, name, context=context)
         self.cr = cr
         self.uid = uid
+        self.user_company = self._get_user_company()
         self.localcontext.update({
             'time': time,
             'getMoves': self._get_moves,
             'isQtyOut': self._is_qty_out,
             'getQty': self._get_qty,
-            'getInstance': self._get_instance,
+            'computeCurrency': self._compute_currency,
+            'userCompany': self.user_company,
         })
 
     def _get_moves(self, report):
@@ -71,11 +73,36 @@
 
         return qty
 
-    def _get_instance(self):
-        '''
-        Return user's current instance
-        '''
-        return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id.instance_id.name
+    def _get_user_company(self):
+        '''
+        Return user's current company
+        '''
+        return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id
+
+    def _compute_currency(self, move):
+        '''
+        Compute an amount of a given currency to the instance's currency
+        '''
+        currency_obj = self.pool.get('res.currency')
+
+        if not move.price_currency_id:
+            if move.price_unit is None:
+                return round(move.product_id.standard_price, 2)
+            if move.type == 'in':
+                from_currency_id = move.partner_id.property_product_pricelist_purchase.currency_id.id
+            else:
+                from_currency_id = move.partner_id.property_product_pricelist.currency_id.id
+        else:
+            from_currency_id = move.price_currency_id.id
+
+        context = {'date': move.date}
+        to_currency_id = self.user_company['currency_id'].id
+
+        if from_currency_id == to_currency_id:
+            return round(move.price_unit, 2)
+
+        return round(currency_obj.compute(self.cr, self.uid, from_currency_id, to_currency_id, move.price_unit, round=False, context=context), 2)
+
 
 class sale_donation_stock_moves_report_xls(SpreadsheetReport):
     def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse,

=== modified file 'bin/addons/sale/report/sale_donation_stock_moves_report_xls.mako'
--- bin/addons/sale/report/sale_donation_stock_moves_report_xls.mako	2017-08-07 09:12:29 +0000
+++ bin/addons/sale/report/sale_donation_stock_moves_report_xls.mako	2017-09-08 14:23:21 +0000
@@ -107,13 +107,13 @@
         ## Qty Out
         <Column ss:AutoFitWidth="1" ss:Width="54.25"  />
         ## Unit Price
-        <Column ss:AutoFitWidth="1" ss:Width="57.25"  />
+        <Column ss:AutoFitWidth="1" ss:Width="57.75"  />
         ## Currency (FX)
         <Column ss:AutoFitWidth="1" ss:Width="65.75"  />
         ## Total Value
         <Column ss:AutoFitWidth="1" ss:Width="67.25"  />
         ## Instance
-        <Column ss:AutoFitWidth="1" ss:Width="97.25"  />
+        <Column ss:AutoFitWidth="1" ss:Width="150.75"  />
 
         <%
             headers_list = [
@@ -165,22 +165,10 @@
                 <Cell ss:StyleID="line_right"><Data ss:Type="Number">${getQty(o)|x}</Data></Cell>
                 <Cell ss:StyleID="line_right"><Data ss:Type="Number">0.00</Data></Cell>
                 % endif
-                % if o.price_unit:
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.price_unit, 2)|x}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.product_id.standard_price, 2)|x}</Data></Cell>
-                % endif
-                % if o.price_currency_id.name:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.price_currency_id.name|x}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.product_id.currency_id.name or ''|x}</Data></Cell>
-                % endif
-                % if o.price_unit:
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.price_unit, 2) * getQty(o)|x}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.product_id.standard_price, 2) * getQty(o)|x}</Data></Cell>
-                % endif
-                <Cell ss:StyleID="line_right"><Data ss:Type="String">${getInstance()|x}</Data></Cell>
+                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${computeCurrency(o)|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${userCompany['currency_id'].name|x}</Data></Cell>
+                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${computeCurrency(o) * getQty(o)|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${userCompany['instance_id'].name|x}</Data></Cell>
             </Row>
         % endfor
 

=== modified file 'bin/addons/sale/wizard/sale_donation_stock_moves_view.xml'
--- bin/addons/sale/wizard/sale_donation_stock_moves_view.xml	2017-08-07 11:54:12 +0000
+++ bin/addons/sale/wizard/sale_donation_stock_moves_view.xml	2017-09-08 14:23:21 +0000
@@ -10,7 +10,7 @@
                     <separator colspan="4" string="Request parameters" />
                     <field name="start_date" />
                     <field name="end_date" />
-                    <field name="partner_id" domain="[('customer', '=', True)]" on_change="partner_onchange(partner_id, move_id)" />
+                    <field name="partner_id" on_change="partner_onchange(partner_id, move_id)" />
                     <field name="partner_type" />
                     <field name="product_id" />
                     <field name="move_id" domain="[('reason_type_id.name', 'in', ['In-Kind Donation', 'Donation before expiry', 'Donation (standard)']),('state', '=', 'done'),