[MERGE] forward port branch saas-15 up to 6b1b507deb

addons/account/report/account_invoice_report.py

@@ -109,7 +109,7 @@ class AccountInvoiceReport(models.Model):
                     1 AS nbr,
                     ai.type, ai.state, pt.categ_id, ai.date_due, ai.account_id, ail.account_id AS account_line_id,
                     ai.partner_bank_id,
-                    SUM ((invoice_type.sign * ail.quantity) / u.factor * u2.factor) AS product_qty,
+                    SUM ((invoice_type.sign_qty * ail.quantity) / u.factor * u2.factor) AS product_qty,
                     SUM(ail.price_subtotal_signed * invoice_type.sign) AS price_total,
                     SUM(ABS(ail.price_subtotal_signed)) / CASE
                             WHEN SUM(ail.quantity / u.factor * u2.factor) <> 0::numeric
@@ -138,7 +138,11 @@ class AccountInvoiceReport(models.Model):
                          WHEN ai.type::text = ANY (ARRAY['in_refund'::character varying::text, 'in_invoice'::character varying::text])
                             THEN -1
                             ELSE 1
-                        END) AS sign
+                        END) AS sign,(CASE
+                         WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                            THEN -1
+                            ELSE 1
+                        END) AS sign_qty
                     FROM account_invoice ai
                 ) AS invoice_type ON invoice_type.id = ai.id
         """

odoo/addons/base/res/res_country_data.xml

@@ -1786,6 +1786,13 @@
             <field name="currency_id" ref="ZWD" />
             <field eval="263" name="phone_code" />
         </record>
+        <record id="xk" model="res.country">
+            <field name="name">Kosovo</field>
+            <field name="code">xk</field>
+            <field file="base/static/img/country_flags/xk.png" name="image" type="base64" />
+            <field name="currency_id" ref="EUR" />
+            <field eval="383" name="phone_code" />
+        </record>
 
         <record id="europe" model="res.country.group">
             <field name="name">Europe</field>