pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] base: add vat_label on res.country

Browse Source 
That allows to display the 'vat' field under the right label in reports.
This commit is contained in:
qdp-odoo
2017-09-18 21:57:48 +02:00
parent 09e44c02f2
commit ec96c0b3c2
12 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/report_invoice.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<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 t-if="o.partner_id.vat" class="mt16">VAT: <span t-field="o.partner_id.vat"/></div>
<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>
addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
+2 -2
View File
@@ -15,13 +15,13 @@
<strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong>
<div t-field="o.partner_invoice_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
<p t-if="o.partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.partner_id.vat"/></p>
</div>
<div t-if="o.address_id != o.partner_invoice_id">
<strong>Shipping address :</strong>
<div t-field="o.address_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
<p t-if="o.partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.partner_id.vat"/></p>
</div>
</div>
<div class="col-xs-5 col-xs-offset-1">
addons/pos_restaurant/static/src/xml/printbill.xml
+1 -1
View File
@@ -54,7 +54,7 @@
<div>Tel:<t t-esc='receipt.company.phone' /></div>
</t>
<t t-if='receipt.company.vat'>
<div>VAT:<t t-esc='receipt.company.vat' /></div>
<div><t t-esc="receipt.company.country_id.vat_label or 'TIN'"/>:<t t-esc='receipt.company.vat' /></div>
</t>
<t t-if='receipt.company.email'>
<div><t t-esc='receipt.company.email' /></div>
addons/purchase/report/purchase_order_templates.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="col-xs-5 col-xs-offset-1">
<div t-field="o.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
<p t-if="o.partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.partner_id.vat"/></p>
</div>
</div>
addons/purchase/report/purchase_quotation_templates.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="col-xs-5 col-xs-offset-1">
<div t-field="o.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
<p t-if="o.partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.partner_id.vat"/></p>
</div>
</div>
addons/sale/report/invoice_report_templates.xml
+1 -1
View File
@@ -100,7 +100,7 @@
<div class="col-xs-5 col-xs-offset-1" groups="sale.group_delivery_invoice_address">
<div t-field="o.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
<div t-if="o.partner_id.vat" class="mt16">VAT: <span t-field="o.partner_id.vat"/></div>
<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>
</xpath>
</template>
addons/sale/report/sale_report_templates.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<div class="col-xs-5 col-xs-offset-1">
<div t-field="doc.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
<p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
<p t-if="doc.partner_id.vat"><t t-esc="doc.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="doc.partner_id.vat"/></p>
</div>
</div>
addons/stock/report/report_stockpicking_operations.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<div t-if="o.partner_id" name="partner_header">
<div t-field="o.partner_id"
t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.sudo().partner_id.vat">VAT: <span t-field="o.sudo().partner_id.vat"/></p>
<p t-if="o.sudo().partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'TIN'"/>: <span t-field="o.sudo().partner_id.vat"/></p>
</div>
</div>
</div>
addons/web/views/report_templates.xml
+4 -4
View File
@@ -157,7 +157,7 @@
<li t-if="company.phone"><i class="fa fa-phone"/> <span t-field="company.phone"/></li>
<li t-if="company.email"><i class="fa fa-at"/> <span t-field="company.email"/></li>
<li t-if="company.website"><i class="fa fa-globe"/> <span t-field="company.website"/></li>
<li t-if="company.vat"><i class="fa fa-building-o"/> VAT: <span t-field="company.vat"/></li>
<li t-if="company.vat"><i class="fa fa-building-o"/><t t-esc="company.country_id.vat_label or 'TIN'"/>: <span t-field="company.vat"/></li>
</ul>
<div t-field="company.report_footer"/>
<div class="text-muted">
@@ -196,7 +196,7 @@
<li t-if="company.phone">Tel: <span t-field="company.phone"/></li>
<li t-if="company.email">Mail: <span t-field="company.email"/></li>
<li t-if="company.website">Web: <span t-field="company.website"/></li>
<li t-if="company.vat">VAT: <span t-field="company.vat"/></li>
<li t-if="company.vat"><t t-esc="company.country_id.vat_label or 'TIN'"/>: <span t-field="company.vat"/></li>
</ul>
<div t-field="company.report_footer"/>
<div>
@@ -215,7 +215,7 @@
<div class="col-xs-5 col-xs-offset-1" name="company_address">
<ul class="list-unstyled">
<strong><li t-if="company.name"><span t-field="company.name"/></li></strong>
<li t-if="company.vat">VAT: <span t-field="company.vat"/></li>
<li t-if="company.vat"><t t-esc="company.country_id.vat_label or 'TIN'"/>: <span t-field="company.vat"/></li>
<li t-if="company.phone">Tel: <span t-field="company.phone"/></li>
<li t-if="company.email"><span t-field="company.email"/></li>
<li t-if="company.website"><span t-field="company.website"/></li>
@@ -281,7 +281,7 @@
<li t-if="company.phone">Phone: <span t-field="company.phone"/></li>
<li t-if="company.email">Email: <span t-field="company.email"/></li>
<li t-if="company.website">Web: <span t-field="company.website"/></li>
<li t-if="company.vat">VAT: <span t-field="company.vat"/></li>
<li t-if="company.vat"><t t-esc="company.country_id.vat_label or 'TIN'"/>: <span t-field="company.vat"/></li>
</ul>
<div name="financial_infos">
odoo/addons/base/res/res_country.py
+1
View File
@@ -64,6 +64,7 @@ class Country(models.Model):
('after', 'After Address'),
], string="Customer Name Position", default="before",
help="Determines where the customer/company name should be placed, i.e. after or before the address.")
vat_label = fields.Char(string='Vat Label', translate=True, help="Use this field if you want to change vat label.")
_sql_constraints = [
('name_uniq', 'unique (name)',
odoo/addons/base/res/res_country_data.xml
+28
View File
@@ -84,6 +84,7 @@
<field file="base/static/img/country_flags/at.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="43" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="au" model="res.country">
<field name="name">Australia</field>
@@ -142,6 +143,7 @@
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
<field name="currency_id" ref="EUR" />
<field eval="32" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="bf" model="res.country">
<field name="name">Burkina Faso</field>
@@ -156,6 +158,7 @@
<field file="base/static/img/country_flags/bg.png" name="image" type="base64" />
<field name="currency_id" ref="BGN" />
<field eval="359" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="bh" model="res.country">
<field name="name">Bahrain</field>
@@ -391,6 +394,7 @@
<field file="base/static/img/country_flags/cy.png" name="image" type="base64" />
<field name="currency_id" ref="CYP" />
<field eval="357" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="cz" model="res.country">
<field name="name">Czech Republic</field>
@@ -398,6 +402,7 @@
<field file="base/static/img/country_flags/cz.png" name="image" type="base64" />
<field name="currency_id" ref="CZK" />
<field eval="420" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="de" model="res.country">
<field name="name">Germany</field>
@@ -406,6 +411,7 @@
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
<field name="currency_id" ref="EUR" />
<field eval="49" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="dj" model="res.country">
<field name="name">Djibouti</field>
@@ -420,6 +426,7 @@
<field file="base/static/img/country_flags/dk.png" name="image" type="base64" />
<field name="currency_id" ref="DKK" />
<field eval="45" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="dm" model="res.country">
<field name="name">Dominica</field>
@@ -455,6 +462,7 @@
<field file="base/static/img/country_flags/ee.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="372" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="eg" model="res.country">
<field name="name">Egypt</field>
@@ -483,6 +491,7 @@
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
<field name="currency_id" ref="EUR" />
<field eval="34" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="et" model="res.country">
<field name="name">Ethiopia</field>
@@ -498,6 +507,7 @@
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR" />
<field eval="358" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="fj" model="res.country">
<field name="name">Fiji</field>
@@ -534,6 +544,7 @@
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
<field name="currency_id" ref="EUR" />
<field eval="33" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="ga" model="res.country">
<field name="name">Gabon</field>
@@ -623,6 +634,7 @@
<field file="base/static/img/country_flags/gr.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="30" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="gs" model="res.country">
<field name="name">South Georgia and the South Sandwich Islands</field>
@@ -685,6 +697,7 @@
<field file="base/static/img/country_flags/hr.png" name="image" type="base64" />
<field name="currency_id" ref="HRK" />
<field eval="385" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="ht" model="res.country">
<field name="name">Haiti</field>
@@ -699,6 +712,7 @@
<field file="base/static/img/country_flags/hu.png" name="image" type="base64" />
<field name="currency_id" ref="HUF" />
<field eval="36" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="id" model="res.country">
<field name="name">Indonesia</field>
@@ -713,6 +727,7 @@
<field file="base/static/img/country_flags/ie.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="353" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="il" model="res.country">
<field name="name">Israel</field>
@@ -770,6 +785,7 @@
<field file="base/static/img/country_flags/it.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="39" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="je" model="res.country">
<field name="name">Jersey</field>
@@ -934,6 +950,7 @@
<field file="base/static/img/country_flags/lt.png" name="image" type="base64" />
<field name="currency_id" ref="EUR"/>
<field eval="370" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="lu" model="res.country">
<field name="name">Luxembourg</field>
@@ -941,6 +958,7 @@
<field file="base/static/img/country_flags/lu.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="352" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="lv" model="res.country">
<field name="name">Latvia</field>
@@ -948,6 +966,7 @@
<field file="base/static/img/country_flags/lv.png" name="image" type="base64" />
<field name="currency_id" ref="EUR"/>
<field eval="371" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="ly" model="res.country">
<field name="name">Libya</field>
@@ -1073,6 +1092,7 @@
<field file="base/static/img/country_flags/mt.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="356" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="mu" model="res.country">
<field name="name">Mauritius</field>
@@ -1165,6 +1185,7 @@
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
<field name="currency_id" ref="EUR" />
<field eval="31" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="no" model="res.country">
<field name="name">Norway</field>
@@ -1257,6 +1278,7 @@
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="PLN" />
<field eval="48" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="pm" model="res.country">
<field name="name">Saint Pierre and Miquelon</field>
@@ -1291,6 +1313,7 @@
<field file="base/static/img/country_flags/pt.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="351" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="pw" model="res.country">
<field name="name">Palau</field>
@@ -1325,6 +1348,7 @@
<field file="base/static/img/country_flags/ro.png" name="image" type="base64" />
<field name="currency_id" ref="RON" />
<field eval="40" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="rs" model="res.country">
<field name="name">Serbia</field>
@@ -1381,6 +1405,7 @@
<field file="base/static/img/country_flags/se.png" name="image" type="base64" />
<field name="currency_id" ref="SEK" />
<field eval="46" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="sg" model="res.country">
<field name="name">Singapore</field>
@@ -1402,6 +1427,7 @@
<field file="base/static/img/country_flags/si.png" name="image" type="base64" />
<field name="currency_id" ref="EUR" />
<field eval="386" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="sj" model="res.country">
<field name="name">Svalbard and Jan Mayen</field>
@@ -1415,6 +1441,7 @@
<field file="base/static/img/country_flags/sk.png" name="image" type="base64" />
<field name="currency_id" ref="SKK" />
<field eval="421" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="sl" model="res.country">
<field name="name">Sierra Leone</field>
@@ -1626,6 +1653,7 @@
<field file="base/static/img/country_flags/gb.png" name="image" type="base64" />
<field name="currency_id" ref="GBP" />
<field eval="0" name="phone_code" />
<field name="vat_label">VAT</field>
</record>
<record id="um" model="res.country">
<field name="name">USA Minor Outlying Islands</field>
odoo/addons/base/res/res_country_view.xml
+1
View File
@@ -31,6 +31,7 @@
</group>
<group>
<field name="phone_code"/>
<field name="vat_label"/>
</group>
<group string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
<field name="address_view_id"/>