ODOO-10 added EGN

odoobgorg · Sep 14, 2016 · 42a4cab · 42a4cab
1 parent ace8495
commit 42a4cab
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 12 deletions.
diff --git a/l10n_bg/i18n/bg.po b/l10n_bg/i18n/bg.po
@@ -491,4 +491,9 @@ msgstr "Основание за неначисляване на ДДС"
 #. module: l10n_bg
 #: model:ir.ui.view,arch_db:l10n_bg.account_invoice_form_fields
 msgid "CommentTemplate2Group"
-msgstr "Начин на плащане"
+msgstr "Начин на плащане"
+
+#. module: l10n_bg
+#: model:ir.ui.view,arch_db:l10n_bg.report_invoice_bg
+msgid "<strong>EGN: </strong>"
+msgstr "<strong>ЕГН: </strong>"
diff --git a/l10n_bg/i18n/en_US.po b/l10n_bg/i18n/en_US.po
@@ -717,3 +717,8 @@ msgstr "Reason for not charging VAT"
 #: model:ir.ui.view,arch_db:l10n_bg.account_invoice_form_fields
 msgid "CommentTemplate2Group"
 msgstr "Payment method"
+
+#. module: l10n_bg
+#: model:ir.ui.view,arch_db:l10n_bg.report_invoice_bg
+msgid "<strong>EGN: </strong>"
+msgstr "<strong>EGN: </strong>"
diff --git a/l10n_bg/i18n/l10n_bg.pot b/l10n_bg/i18n/l10n_bg.pot
@@ -715,3 +715,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:l10n_bg.account_invoice_form_fields
 msgid "CommentTemplate2Group"
 msgstr ""
+
+#. module: l10n_bg
+#: model:ir.ui.view,arch_db:l10n_bg.report_invoice_bg
+msgid "<strong>EGN: </strong>"
+msgstr ""
diff --git a/l10n_bg/views/report_invoice.xml b/l10n_bg/views/report_invoice.xml
@@ -22,7 +22,7 @@
                                          <span t-field="o.number"/>
                                          <span t-if="o.type == 'out_invoice' and o.state == 'proforma2'"><span t-field="o.origin"/></span>
                                          <span style="font-size:18px;">
-                                            <span t-if="o.date_invoice"> от <span t-field="o.date_invoice"/></span>
+                                            <span t-if="o.date_invoice and o.state != 'proforma2'"> от <span t-field="o.date_invoice"/></span>
                                             <!--<span t-if="o.type == 'out_invoice' and o.state == 'proforma2'"> от <span t-usertime="%d.%m.%Y" /></span>-->
                                          </span>
                                      </h2>
@@ -103,34 +103,61 @@
                                 <td><strong>Address: </strong></td>
                                 <td><span t-field="o.company_id.street"/></td>
                             </tr>
-                            <tr>
-                                <td></td>
-                                <td></td>
+                            <tr t-if="o.partner_id.street2 or o.company_id.street2">
+                                <td/>
+                                <td/>
                                 <td><span t-if="o.partner_id.street2" t-field="o.partner_id.street2"/></td>
-                                <td></td>
+                                <td/>
                                 <td><span t-if="o.company_id.street2" t-field="o.company_id.street2"/></td>
                             </tr>
+
                             <tr>
                                 <td/>
-                                <td><strong>MOL: </strong></td>
-                                <td><span t-field="o.partner_id.bg_mol"/></td>
+                                <t t-if="o.partner_id.is_company">
+                                    <td><strong>MOL: </strong></td>
+                                    <td><span t-field="o.partner_id.bg_mol"/></td>
+                                </t>
+                                <t t-if="not o.partner_id.is_company">
+                                    <t t-if="o.partner_id.country_id == 23">
+                                        <td><strong>EGN: </strong></td>
+                                        <td><span t-field="o.partner_id.bg_egn"/></td>
+                                    </t>
+                                    <t t-if="o.partner_id.country_id != 23">
+                                        <td/>
+                                        <td/>
+                                    </t>
+                                </t>
                                 <td><strong>MOL: </strong></td>
                                 <td><span t-field="o.company_id.bg_mol"/></td>
                             </tr>
+
                             <tr>
                                 <td/>
-                                <td><strong>IdentNum </strong></td>
-                                <td><span t-field="o.partner_id.bg_uic"/></td>
+                                <t t-if="o.partner_id.is_company">
+                                    <td><strong>IdentNum </strong></td>
+                                    <td><span t-field="o.partner_id.bg_uic"/></td>
+                                </t>
+                                <t t-if="not o.partner_id.is_company">
+                                    <td/>
+                                    <td/>
+                                </t>
                                 <td><strong>IdentNum </strong></td>
                                 <td><span t-field="o.company_id.bg_uic"/></td>
                             </tr>
                             <tr>
                                 <td/>
-                                <td><span t-if="o.partner_id.vat"><strong>IN_DDS </strong></span></td>
-                                <td><span t-if="o.partner_id.vat" t-field="o.partner_id.vat"/></td>
+                                <t t-if="o.partner_id.is_company">
+                                    <td><span t-if="o.partner_id.vat"><strong>IN_DDS </strong></span></td>
+                                    <td><span t-if="o.partner_id.vat" t-field="o.partner_id.vat"/></td>
+                                </t>
+                                <t t-if="not o.partner_id.is_company">
+                                    <td/>
+                                    <td/>
+                                </t>
                                 <td><span t-if="o.company_id.vat"><strong>IN_DDS </strong></span></td>
                                 <td><span t-if="o.company_id.vat" t-field="o.company_id.vat"/></td>
                             </tr>
+
                         </tbody>
                     </table>
                     <br />