Upgrade to Incoterm 2020

#051526
This commit is contained in:
Raimon Esteve 2022-05-24 09:59:18 +02:00
parent b4e18596a3
commit f2ab52318e
7 changed files with 31 additions and 86 deletions

View File

@ -3,11 +3,8 @@
from trytond.pool import Pool
from . import incoterm
from . import party
def register():
Pool.register(
incoterm.Category,
incoterm.Incoterm,
party.Party,
party.PartyIncoterm,

View File

@ -2,28 +2,18 @@
# this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields
__all__ = ['Category', 'Incoterm']
class Category(ModelSQL, ModelView):
'Incoterm Category'
__name__ = 'incoterm.category'
name = fields.Char('Name', required=True, translate=True)
__all__ = ['Incoterm']
class Incoterm(DeactivableMixin, ModelSQL, ModelView):
'Incoterm'
__name__ = 'incoterm'
name = fields.Char('Name', required=True, translate=True)
code = fields.Char('Code', required=True)
category = fields.Many2One('incoterm.category', 'Category')
place_required = fields.Boolean('Place required',
name = fields.Char("Name", required=True, translate=True)
code = fields.Char("Code", required=True)
description = fields.Char("Description")
place_required = fields.Boolean("Place required",
help="Make place required for this incoterm")
@staticmethod
def default_place_required():
return False
def get_rec_name(self, name):
return '%s - %s' % (self.code, self.name)

View File

@ -6,33 +6,7 @@
<menuitem parent="ir.menu_administration" name="Incoterms"
id="menu_incoterm"/>
<record model="ir.ui.view" id="category_view_tree">
<field name="model">incoterm.category</field>
<field name="type">tree</field>
<field name="name">category_list</field>
</record>
<record model="ir.ui.view" id="category_view_form">
<field name="model">incoterm.category</field>
<field name="type">form</field>
<field name="name">category_form</field>
</record>
<record model="ir.action.act_window" id="act_category_form">
<field name="name">Categories</field>
<field name="res_model">incoterm.category</field>
</record>
<record model="ir.action.act_window.view" id="act_category_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="category_view_tree"/>
<field name="act_window" ref="act_category_form"/>
</record>
<record model="ir.action.act_window.view" id="act_category_form_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="category_view_form"/>
<field name="act_window" ref="act_category_form"/>
</record>
<menuitem parent="menu_incoterm" action="act_category_form"
id="menu_category_form"/>
<!-- incoterm -->
<record model="ir.ui.view" id="incoterm_view_tree">
<field name="model">incoterm</field>
<field name="type">tree</field>
@ -60,75 +34,72 @@
<menuitem parent="menu_incoterm" action="act_incoterm_form"
id="menu_incoterm_form"/>
<!-- Incoterms 2010 -->
<record model="incoterm.category" id="incoterm_2010">
<field name="name">Incoterms 2010</field>
</record>
<!-- Incoterms data -->
<record model="incoterm" id="incoterm_exw">
<field name="name">Ex Works</field>
<field name="code">EXW</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_fca">
<field name="name">Free Carrier</field>
<field name="code">FCA</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_cpt">
<field name="name">Carriage Paid To</field>
<field name="code">CPT</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_cip">
<field name="name">Carriage and Insurance Paid To</field>
<field name="code">CIP</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_dap">
<field name="name">Delivered at Place</field>
<field name="code">DAP</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_dat">
<field name="name">Delivered at terminal</field>
<field name="code">DAT</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<record model="incoterm" id="incoterm_dpu">
<field name="name">Delivered at Place Unloaded</field>
<field name="code">DPU</field>
<field name="place_required" eval="True"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_ddp">
<field name="name">Delivered Duty Paid</field>
<field name="code">DDP</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="name">Delivered Duty Paid</field>
<field name="code">DDP</field>
<field name="place_required" eval="True"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_fas">
<field name="name">Free Alongside Ship</field>
<field name="code">FAS</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_fob">
<field name="name">Free on Board</field>
<field name="code">FOB</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_cfr">
<field name="name">Cost and Freight</field>
<field name="code">CFR</field>
<field name="place_required" eval="True"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
<record model="incoterm" id="incoterm_cif">
<field name="name">Cost, Insurance and Freight</field>
<field name="code">CIF</field>
<field name="place_required" eval="False"/>
<field name="category" ref="incoterm_2010"/>
<field name="description">Incoterm 2020</field>
</record>
</data>
</tryton>

View File

@ -1,7 +0,0 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form col="4">
<label name="name"/>
<field name="name" colspan="3"/>
</form>

View File

@ -1,6 +0,0 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<tree>
<field name="name"/>
</tree>

View File

@ -1,15 +1,15 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form col="4">
<label name="category"/>
<field name="category" xexpand="1"/>
<label name="active"/>
<field name="active" xexpand="0" width="100"/>
<form col="6">
<label name="name"/>
<field name="name"/>
<label name="code"/>
<field name="code"/>
<label name="active"/>
<field name="active" xexpand="0" width="100"/>
<label name="place_required"/>
<field name="place_required"/>
<label name="description"/>
<field name="description" xexpand="1"/>
</form>

View File

@ -4,6 +4,6 @@
<tree>
<field name="code"/>
<field name="name"/>
<field name="category"/>
<field name="description"/>
<field name="active" tree_invisible="1"/>
</tree>