Merge branch 'develop' of ssh://gitlab.datenpol.at:122/odoo/tz-austria into develop

ext/custom-addons/dp_custom/views/res_partner_views.xml

@@ -123,4 +123,18 @@
               name="Branchen"
               action="res_partner_sector_action"/>
 
+    <record id="res_partner_filter_tz" model="ir.ui.view">
+    <field name="name">res_partner_filter_tz</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_res_partner_filter"/>
+    <field name="arch" type="xml">
+        <field name="name" position="after">
+            <field name="portal_id" string="Portal-ID" filter_domain="[('portal_id','ilike', self)]"/>
+         </field>
+        <field name="name" position="after">
+            <field name="ref" string="Interne Ref:" filter_domain="[('ref','ilike', self)]"/>
+         </field>
+     </field>
+    </record>
+
 </odoo>

ext/custom-addons/dp_dmi/delivery.carrier.csv

@@ -1,2 +1,17 @@
 "id","name","delivery_type","product_id/id","fixed_price"
-"carrier_lkw","LKW","fixed","dp_custom.product_transport","0.0"
+"c_1","LKW","fixed","dp_custom.product_transport","0.0"
+"c_2","OEBB","fixed","dp_custom.product_transport","0.0"
+"c_3","DPD","fixed","dp_custom.product_transport","0.0"
+"c_4","SCH","fixed","dp_custom.product_transport","0.0"
+"c_5","Dachser","fixed","dp_custom.product_transport","0.0"
+"c_6","Weiss","fixed","dp_custom.product_transport","0.0"
+"c_7","Spedition","fixed","dp_custom.product_transport","0.0"
+"c_8","Abholung","fixed","dp_custom.product_transport","0.0"
+"c_9","Container","fixed","dp_custom.product_transport","0.0"
+"c_10","Post","fixed","dp_custom.product_transport","0.0"
+"c_11","Sonstige","fixed","dp_custom.product_transport","0.0"
+"c_12","Bus","fixed","dp_custom.product_transport","0.0"
+"c_13","Luft","fixed","dp_custom.product_transport","0.0"
+"c_14","Würth","fixed","dp_custom.product_transport","0.0"
+"c_15","Klein-LKW","fixed","dp_custom.product_transport","0.0"
+"c_16","Düring","fixed","dp_custom.product_transport","0.0"