[FIX] mess up relation filled in picking wizard + solve key error 'wizard_pick_id...

[odoo/odoo.git] / addons / stock / stock_incoterms.xml

diff --git a/addons/stock/stock_incoterms.xml b/addons/stock/stock_incoterms.xml
index 2b2ca6c..b044e49 100644 (file)
--- a/addons/stock/stock_incoterms.xml
+++ b/addons/stock/stock_incoterms.xml
@@ -1,53 +1,66 @@
-<?xml version="1.0"?>
-<terp>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
     <data>
-        <record model="stock.incoterms" id="incoterm_EXW">
+        <record id="incoterm_EXW" model="stock.incoterms">
             <field name="code">EXW</field>
             <field name="name">EX WORKS</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FCA">
+        <record id="incoterm_FCA" model="stock.incoterms">
             <field name="code">FCA</field>
             <field name="name">FREE CARRIER</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FAS">
+        <record id="incoterm_FAS" model="stock.incoterms">
             <field name="code">FAS</field>
             <field name="name">FREE ALONGSIDE SHIP</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FOB">
+        <record id="incoterm_FOB" model="stock.incoterms">
             <field name="code">FOB</field>
             <field name="name">FREE ON BOARD</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CFR">
+        <record id="incoterm_CFR" model="stock.incoterms">
             <field name="code">CFR</field>
             <field name="name">COST AND FREIGHT</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CIF">
+        <record id="incoterm_CIF" model="stock.incoterms">
             <field name="code">CIF</field>
             <field name="name">COST, INSURANCE AND FREIGHT</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CPT">
+        <record id="incoterm_CPT" model="stock.incoterms">
             <field name="code">CPT</field>
             <field name="name">CARRIAGE PAID TO</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CIP">
+        <record id="incoterm_CIP" model="stock.incoterms">
             <field name="code">CIP</field>
             <field name="name">CARRIAGE AND INSURANCE PAID TO</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DAF">
+        <record id="incoterm_DAF" model="stock.incoterms">
             <field name="code">DAF</field>
             <field name="name">DELIVERED AT FRONTIER</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DES">
+        <record id="incoterm_DES" model="stock.incoterms">
             <field name="code">DES</field>
             <field name="name">DELIVERED EX SHIP</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DEQ">
+        <record id="incoterm_DEQ" model="stock.incoterms">
             <field name="code">DEQ</field>
             <field name="name">DELIVERED EX QUAY</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DDU">
+        <record id="incoterm_DDU" model="stock.incoterms">
             <field name="code">DDU</field>
             <field name="name">DELIVERED DUTY UNPAID</field>
         </record>
+        <record id="incoterm_DDP" model="stock.incoterms">
+            <field name="code">DDP</field>
+            <field name="name">DELIVERED DUTY PAID</field>
+        </record>
+        <record id="incoterm_DAT" model="stock.incoterms">
+            <field name="code">DAT</field>
+            <field name="name">Delivered At Terminal</field>
+        </record>
+        <record id="incoterm_DAP" model="stock.incoterms">
+            <field name="code">DAP</field>
+            <field name="name">Delivered At Place</field>
+        </record>
+
     </data>
-</terp>
+</openerp>