Merge branch 'master-account-discount' into 'master'

[IMP]: issues:104:Incorrect layout for billing orders and divide by zero issues

See merge request flectra-hq/flectra!143

addons/account_discount/models/account_invoice.py

@@ -54,6 +54,7 @@ class AccountInvoice(models.Model):
                 discount_value_ratio = \
                     (self.discount_amount * line.price_subtotal) / \
                     gross_amount
+                if discount_value_ratio:
                     discount_per_ratio = \
                         (discount_value_ratio * 100) / line.price_subtotal
                     line.write({'discount': discount_per_ratio})

addons/sale/report/invoice_report_templates.xml

@@ -23,6 +23,7 @@
                         <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
                         <th class="text-right">Taxes</th>
                         <th class="text-right">Amount</th>
+                        <th class="text-right">Total</th>
                     </tr>
                 </thead>
                 <tbody class="invoice_tbody">

addons/sales_discount/models/sale.py

@@ -54,6 +54,7 @@ class SaleOrder(models.Model):
                 discount_value_ratio = \
                     (self.discount_amount *
                      line.price_subtotal) / gross_amount
+                if discount_value_ratio:
                     discount_per_ratio = \
                         (discount_value_ratio * 100) / line.price_subtotal
                     line.write({'discount': discount_per_ratio})