diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 9cab91b8..d419779e 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -6,9 +6,38 @@
                 <t t-set="o" t-value="o.with_context({'lang':o.partner_id.lang})" />
                 <div class="page">
                     <div class="row">
-                        <div name="invoice_address" class="col-xs-5 col-xs-offset-7">
-                            <address t-field="o.partner_id"
-                                t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        <div name="invoice_address" class="col-xs-6 col-xs-offset-6">
+                            <table>
+                                <tr t-if="o.partner_id.name">
+                                    <td colspan="4"><strong t-field="o.partner_id.name"/></td>
+                                </tr>
+                                <tr t-if="o.partner_id.street">
+                                    <td colspan="4"><span t-field="o.partner_id.street"/></td>
+                                </tr>
+                                <tr t-if="o.partner_id.street2">
+                                    <td colspan="4"><span t-field="o.partner_id.street2"/></td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span t-if="o.partner_id.city and o.partner_id.zip">
+                                            <span t-field="o.partner_id.city"/> - <span t-field="o.partner_id.zip"/>,
+                                        </span>
+                                        <span t-if="o.partner_id.city and not o.partner_id.zip">
+                                            <span t-field="o.partner_id.city"/>,
+                                        </span>
+                                        <span t-if="not o.partner_id.city and o.partner_id.zip">
+                                            <span t-field="o.partner_id.zip"/>,
+                                        </span>
+                                        <span t-if="o.partner_id.state_id">
+                                            <span t-field="o.partner_id.state_id.name"/>,
+                                        </span>
+                                        <span t-if="o.partner_id.country_id">
+                                            <span t-field="o.partner_id.country_id.name"/>
+                                        </span>
+                                    </td>
+                                </tr>
+                            </table>
+
                             <div t-if="o.partner_id.vat" class="mt16"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.partner_id.vat"/></div>
                         </div>
                     </div>
diff --git a/addons/l10n_in/views/report_invoice.xml b/addons/l10n_in/views/report_invoice.xml
index 028748cc..993a12d7 100644
--- a/addons/l10n_in/views/report_invoice.xml
+++ b/addons/l10n_in/views/report_invoice.xml
@@ -26,10 +26,15 @@
             </t>
         </xpath>
         <xpath expr="//table[@name='invoice_line_table']" position="replace">
+
+            <!-- Is there a HSN code in at least one product? -->
+            <t t-set="hsn_code" t-value="any([l.product_id.l10n_in_hsn_code for l in o.invoice_line_ids])"/>
+
             <table class="table table-condensed" name="invoice_line_table">
                 <thead>
                     <tr>
                         <th>Description</th>
+                        <th t-if="hsn_code">HSN</th>
                         <th class="hidden">Source Document</th>
                         <th class="text-right">Quantity</th>
                         <th class="text-right">Unit Price</th>
@@ -38,17 +43,18 @@
                             <th class="text-right">Taxes</th>
                         </t>
                         <th class="text-right">Amount</th>
-                        <t t-if="o.company_id.country_id.code == 'IN'">
+                        <!-- <t t-if="o.company_id.country_id.code == 'IN'">
                             <th class="text-right" t-if="is_cgst">CGST</th>
                             <th class="text-right" t-if="is_cgst">SGST</th>
                             <th class="text-right" t-if="is_igst">IGST</th>
                             <th class="text-right" t-if="is_cess">CESS</th>
-                        </t>
+                        </t> -->
                     </tr>
                 </thead>
                 <tbody class="invoice_tbody">
                     <tr t-foreach="o.invoice_line_ids" t-as="l">
-                        <td><span t-field="l.name"/><t t-if="l.product_id.l10n_in_hsn_code"><h6><strong class="ml16">HSN/SAC Code:</strong> <span t-field="l.product_id.l10n_in_hsn_code"/></h6></t></td>
+                        <td><span t-field="l.name"/></td>
+                        <td t-if="hsn_code"><span t-field="l.product_id.l10n_in_hsn_code"/></td>
                         <td class="hidden"><span t-field="l.origin"/></td>
                         <td class="text-right">
                             <span t-field="l.quantity"/>
@@ -69,7 +75,7 @@
                             <span t-field="l.price_subtotal"
                                 t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                         </td>
-                        <t t-if="o.company_id.country_id.code == 'IN'">
+                        <!-- <t t-if="o.company_id.country_id.code == 'IN'">
                             <td class="text-right" t-if="is_cgst">
                                 <t t-foreach="tax_datas[l.id]" t-as="tax_data">
                                     <t t-if="tag_cgst_id in tax_data['tag_ids']">
@@ -100,7 +106,7 @@
                                 </t>
                                 <t t-esc="total_cess" t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"/>
                             </td>
-                        </t>
+                        </t> -->
                     </tr>
                     <tr t-foreach="range(max(5-len(o.invoice_line_ids),0))" t-as="l">
                         <td>&amp;nbsp;</td>
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index e7b325ea..2fd296fe 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -275,11 +275,36 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-xs-6" name="company_address">
-                    <span t-field="company.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
-                        style="border-bottom: 1px solid black; display:inline-block;"/>
-                </div>
+                 <table style="margin-left:16px;">
+                    <tr t-if="company.partner_id.name">
+                        <td colspan="4"><strong t-field="company.partner_id.name"/></td>
+                    </tr>
+                    <tr t-if="company.partner_id.street">
+                        <td colspan="4"><span t-field="company.partner_id.street"/></td>
+                    </tr>
+                    <tr t-if="company.partner_id.street2">
+                        <td colspan="4"><span t-field="company.partner_id.street2"/></td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span t-if="company.partner_id.city and company.partner_id.zip">
+                                <span t-field="company.partner_id.city"/> - <span t-field="company.partner_id.zip"/>,
+                            </span>
+                            <span t-if="company.partner_id.city and not company.partner_id.zip">
+                                <span t-field="company.partner_id.city"/>,
+                            </span>
+                            <span t-if="not company.partner_id.city and company.partner_id.zip">
+                                <span t-field="company.partner_id.zip"/>,
+                            </span>
+                            <span t-if="company.partner_id.state_id">
+                                <span t-field="company.partner_id.state_id.name"/>,
+                            </span>
+                            <span t-if="company.partner_id.country_id">
+                                <span t-field="company.partner_id.country_id.name"/>
+                            </span>
+                        </td>
+                    </tr>
+                </table>
             </div>
         </div>