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

[IMP] account: update incoterms list

Browse Source 
Purpose of this commit is to update incoterms list
base on new incoterms guidlines and add incoterms in RFQ/PO
and invoices/venderbills reports

task-2179236

closes odoo/odoo#43883

Related: odoo/upgrade#922
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Mitali Patel
2020-03-17 13:01:57 +00:00
committed by Yannick Tivisse
parent 0a1b2bf8d9
commit b47aa1b005
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/data/account_incoterms_data.xml
+3 -19
View File
@@ -33,25 +33,9 @@
<field name="code">CIP</field>
<field name="name">CARRIAGE AND INSURANCE PAID TO</field>
</record>
<record id="incoterm_DAF" model="account.incoterms">
<field name="code">DAF</field>
<field name="name">DELIVERED AT FRONTIER</field>
</record>
<record id="incoterm_DES" model="account.incoterms">
<field name="code">DES</field>
<field name="name">DELIVERED EX SHIP</field>
</record>
<record id="incoterm_DEQ" model="account.incoterms">
<field name="code">DEQ</field>
<field name="name">DELIVERED EX QUAY</field>
</record>
<record id="incoterm_DDU" model="account.incoterms">
<field name="code">DDU</field>
<field name="name">DELIVERED DUTY UNPAID</field>
</record>
<record id="incoterm_DAT" model="account.incoterms">
<field name="code">DAT</field>
<field name="name">DELIVERED AT TERMINAL</field>
<record id="incoterm_DPU" model="account.incoterms">
<field name="code">DPU</field>
<field name="name">DELIVERED AT PLACE UNLOADED</field>
</record>
<record id="incoterm_DAP" model="account.incoterms">
<field name="code">DAP</field>
addons/account/views/report_invoice.xml
+3
View File
@@ -178,6 +178,9 @@
<p t-if="o.fiscal_position_id.note" name="note">
<span t-field="o.fiscal_position_id.note"/>
</p>
<p t-if="o.invoice_incoterm_id" name="note">
<strong>Incoterm: </strong><span t-field="o.invoice_incoterm_id.code"/> - <span t-field="o.invoice_incoterm_id.name"/>
</p>
<div id="qrcode" t-if="(o.company_id.qr_code) and (o.currency_id.name == 'EUR') and (o.invoice_partner_bank_id.acc_number != False)">
<p t-if="(o.invoice_partner_bank_id.qr_code_valid)">
<strong class="text-center">Scan me with your banking app.</strong><br /><br />
addons/purchase_stock/models/purchase.py
+5
View File
@@ -135,6 +135,11 @@ class PurchaseOrder(models.Model):
result['res_id'] = pick_ids.id
return result
def action_view_invoice(self):
result = super().action_view_invoice()
result['context']['default_invoice_incoterm_id'] = self.incoterm_id.id
return result
# --------------------------------------------------
# Business methods
# --------------------------------------------------
addons/purchase_stock/report/purchase_report_templates.xml
+14
View File
@@ -13,6 +13,12 @@
</t>
</t>
</xpath>
<xpath expr="//div[@t-if='o.date_order']" position="after">
<div t-if="o.incoterm_id" class="col-3 bm-2">
<strong>Incoterm:</strong>
<p t-field="o.incoterm_id.code" class="m-0"/>
</div>
</xpath>
</template>
<template id="report_purchasequotation_document" inherit_id="purchase.report_purchasequotation_document">
@@ -27,6 +33,14 @@
</t>
</t>
</xpath>
<xpath expr="//span[@t-field='o.name']/.." position="after">
<div id="informations" class="row mt16 mb16">
<div t-if="o.incoterm_id" class="col-3 bm-2">
<strong>Incoterm:</strong>
<p t-field="o.incoterm_id.code" class="m-0"/>
</div>
</div>
</xpath>
</template>
</odoo>