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

ext/custom-addons/dp_custom/models/product.py

@@ -136,7 +136,7 @@ class ProductTemplate(models.Model):
     def _get_specified_fields(self):
         return ['default_code', 'name', 'length', 'width', 'thickness', 'surface', 'active', 'weight', 'is_internal',
                 'xcat_id', 'notes', 'material_type_id', 'intrastat_id', 'sale_ok', 'assembly_line_ids', 'list_price',
-                'height', 'categ_id', 'can_be_sold_unconfigured', 'image', 'tax']
+                'height', 'categ_id', 'can_be_sold_unconfigured', 'image', 'tax', 'manufacturing_number']
 
 
 class ProductCategory(models.Model):

ext/custom-addons/dp_dmi/account.payment.term_w_ids_line_id.csv

@@ -1,68 +0,0 @@
-"id","name","line_ids/days","line_ids/sequence","line_ids/option","line_ids/value","line_ids/value_amount","code","line_ids/id"
-"pmt_1","10 Tage 2% Skonto sonst 30 Tage netto","10","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","7","__export__.account_payment_term_line_3656"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3657"
-"pmt_2","10 Tage 3% Skonto sonst 20 Tage netto","10","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","8","__export__.account_payment_term_line_3658"
-"","","20","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3659"
-"pmt_3","10 Tage 3% Skonto sonst 30 Tage netto","10","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","57","__export__.account_payment_term_line_3660"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3661"
-"pmt_4","10 Tage netto","10","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","27","__export__.account_payment_term_line_3662"
-"pmt_5","14 Tage 2,5% Skonto sonst 28 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","2.5","30","__export__.account_payment_term_line_3663"
-"","","28","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3664"
-"pmt_6","14 Tage 2% Skonto sonst 18 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","29","__export__.account_payment_term_line_3665"
-"","","18","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3666"
-"pmt_7","14 Tage 2% Skonto sonst 30 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","9","__export__.account_payment_term_line_3667"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3668"
-"pmt_8","14 Tage 2% Skonto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","28","__export__.account_payment_term_line_3669"
-"","","15","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3670"
-"pmt_9","14 Tage 3% Skonto sonst 14 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","31","__export__.account_payment_term_line_3671"
-"","","14","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3672"
-"pmt_10","14 Tage 3% Skonto sonst 21 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","10","__export__.account_payment_term_line_3673"
-"","","21","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3674"
-"pmt_11","14 Tage 3% Skonto sonst 30 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","11","__export__.account_payment_term_line_3675"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3676"
-"pmt_12","14 Tage netto","14","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","32","__export__.account_payment_term_line_3677"
-"pmt_13","20 Tage netto","20","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","33","__export__.account_payment_term_line_3678"
-"pmt_14","21 Tage 4% Skonto sonst 30 Tage netto","21","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","12","__export__.account_payment_term_line_3679"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3680"
-"pmt_15","21 Tage netto","21","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","34","__export__.account_payment_term_line_3681"
-"pmt_16","25 Tage netto","25","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","56","__export__.account_payment_term_line_3682"
-"pmt_17","30 Tage 3% Skonto sonst 90 Tage netto","30","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","13","__export__.account_payment_term_line_3683"
-"","","90","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3684"
-"pmt_18","30 Tage 3% Skonto","30","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","37","__export__.account_payment_term_line_3685"
-"","","31","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3686"
-"pmt_19","30 Tage 4% Skonto sonst 45 Tage netto","30","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","14","__export__.account_payment_term_line_3687"
-"","","45","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3688"
-"pmt_20","30 Tage netto","30","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","38","__export__.account_payment_term_line_3689"
-"pmt_21","3 Tage netto","3","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","35","__export__.account_payment_term_line_3690"
-"pmt_22","5 Tage netto","5","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","39","__export__.account_payment_term_line_3691"
-"pmt_23","60 Tage netto","60","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","40","__export__.account_payment_term_line_3692"
-"pmt_24","8 Tage 2% Skonto sonst 14 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","15","__export__.account_payment_term_line_3693"
-"","","14","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3694"
-"pmt_25","8 Tage 2% Skonto sonst 20 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","16","__export__.account_payment_term_line_3695"
-"","","20","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3696"
-"pmt_26","8 Tage 2% Skonto sonst 21 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","17","__export__.account_payment_term_line_3697"
-"","","8","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","","__export__.account_payment_term_line_3698"
-"","","21","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3699"
-"pmt_27","8 Tage 2% Skonto sonst 30 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","18","__export__.account_payment_term_line_3700"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3701"
-"pmt_28","8 Tage 3% Skonto sonst 14 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","19","__export__.account_payment_term_line_3702"
-"","","14","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3703"
-"pmt_29","8 Tage 3% Skonto sonst 30 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","20","__export__.account_payment_term_line_3704"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3705"
-"pmt_30","8 Tage 4% Skonto sonst 14 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","21","__export__.account_payment_term_line_3706"
-"","","14","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3707"
-"pmt_31","8 Tage 4% Skonto sonst 30 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","22","__export__.account_payment_term_line_3708"
-"","","30","2","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3709"
-"pmt_32","8 Tage netto","8","1","Tag(e) nach der Rechnungserstellung","Saldo","0.0","41","__export__.account_payment_term_line_3710"
-"pmt_33","Bei Bankeinzug innerhalb von 14 Tagen 4% Skonto, sonst Ende nächsten Monats","14","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","4","__export__.account_payment_term_line_3711"
-"","","0","9","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3712"
-"pmt_34","Bei Bankeinzug innerhalb von 8 Tagen 4% Skonto, sonst Ende nächsten Monats","8","1","Tag(e) nach der Rechnungserstellung","Prozent","4.0","5","__export__.account_payment_term_line_3713"
-"","","0","2","Letzter Tag des Folgemonats","Saldo","0.0","","__export__.account_payment_term_line_3714"
-"pmt_35","Bei Bezahlung am 25. des Folgemonates abzüglich 3% Skonto, sonst Ende nächsten Monats","25","1","Tag(e) nach dem Ende des Rechnungserstellungsmonats","Prozent","3.0","6","__export__.account_payment_term_line_3715"
-"","","0","2","Letzter Tag des Folgemonats","Saldo","0.0","","__export__.account_payment_term_line_3716"
-"pmt_36","Vorauskassa","0","9","Tag(e) nach der Rechnungserstellung","Saldo","0.0","1","__export__.account_payment_term_line_3717"
-"pmt_37","Vorauskassa 2% Skonto","0","1","Tag(e) nach der Rechnungserstellung","Prozent","2.0","2","__export__.account_payment_term_line_3718"
-"","","0","9","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3719"
-"pmt_38","Vorauskassa 3% Skonto","0","1","Tag(e) nach der Rechnungserstellung","Prozent","3.0","54","__export__.account_payment_term_line_3720"
-"","","0","9","Tag(e) nach der Rechnungserstellung","Saldo","0.0","","__export__.account_payment_term_line_3721"
-"pmt_39","Vorauskassa 4% Skonto","0","1","Tag(e) nach der Rechnungserstellung","Saldo","4.0","7","__export__.account_payment_term_line_3722"

ext/custom-addons/dp_reports_sale/reports/sale.xml

@@ -54,11 +54,11 @@
                 </div>
                 <div class="row mt32"/>
                 <div class="row height-20">
-                    <div class="col-xs-3" style="padding-right: 5px">
+                    <div class="col-xs-3" style="padding-right: 4px">
                         <strong>
-                            <span class="col-xs-8" style="padding: 0px;width: 60%;">Kundennr.:</span>
+                            <span class="col-xs-8" style="padding: 0px;width: 58%;">Kundennr.:</span>
                         </strong>
-                        <span class="col-xs-4" style="padding: 0px;width: 40%;" t-field="o.partner_id.ref"/>
+                        <span class="col-xs-4" style="padding: 0px;width: 42%;" t-field="o.partner_id.ref"/>
                     </div>
                     <strong>
                         <span class="col-xs-2">Ansprechpartner:</span>
@@ -70,11 +70,11 @@
                     <span class="col-xs-2" t-field="o.positions"/>
                 </div>
                 <div class="row height-20">
-                    <div class="col-xs-3" style="padding-right: 5px">
+                    <div class="col-xs-3" style="padding-right: 4px">
                         <strong>
-                            <span class="col-xs-8" style="padding: 0px;width: 60%;">Angebotsdatum:</span>
+                            <span class="col-xs-8" style="padding: 0px;width: 58%;">Angebotsdatum:</span>
                         </strong>
-                        <span class="col-xs-4" style="padding: 0px;width: 40%;" t-field="o.date_order"
+                        <span class="col-xs-4" style="padding: 0px;width: 42%;" t-field="o.date_order"
                               t-options='{"widget": "date"}'/>
                     </div>
                     <strong>
@@ -83,11 +83,11 @@
                     <span class="col-xs-3" t-field="res_company.email"/>
                 </div>
                 <div class="row">
-                    <div class="col-xs-3" style="padding-right: 5px">
+                    <div class="col-xs-3" style="padding-right: 4px">
                         <strong>
-                            <span class="col-xs-8" style="padding: 0px;width: 60%;">Lieferdatum:</span>
+                            <span class="col-xs-8" style="padding: 0px;width: 58%;">Lieferdatum:</span>
                         </strong>
-                        <span class="col-xs-4" style="padding: 0px;width: 40%;" t-field="o.earliest_scheduled_date"
+                        <span class="col-xs-4" style="padding: 0px;width: 42%;" t-field="o.earliest_scheduled_date"
                               t-options='{"widget": "date"}'/>
                     </div>
                     <strong>

ext/custom-addons/tz_carrier_show_integration/LICENSE

@@ -0,0 +1,27 @@
+Odoo Proprietary License v1.0
+
+This software and associated files (the "Software") may only be used (executed,
+modified, executed after modifications) if you have purchased a valid license
+from the authors, typically via Odoo Apps, or if you have received a written
+agreement from the authors of the Software (see the COPYRIGHT file).
+
+You may develop Odoo modules that use the Software as a library (typically by
+depending on it, importing it and using its resources), but without copying any
+source code or material from the Software. You may distribute those modules
+under the license of your choice, provided that this license is compatible with
+the terms of the Odoo Proprietary License (For example: LGPL, MIT,
+or proprietary licenses similar to this one).
+
+It is forbidden to publish, distribute, sublicense, or sell copies of the Software
+or modified copies of the Software.
+
+The above copyright notice and this permission notice must be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

ext/custom-addons/tz_carrier_show_integration/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models

ext/custom-addons/tz_carrier_show_integration/__manifest__.py

@@ -0,0 +1,17 @@
+# Copyright 2018-Today TZAustria
+# License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses).
+
+# noinspection PyStatementEffect
+{
+    'name': 'TZ Carrier Show Integration_Level',
+    'summary' : 'unhides the field integration_level and adds none to the value-list',
+    'version': '11.0.1.0.0',
+    'license': 'OPL-1',
+    'author': 'TZAustria',
+    'support': 'andreas.osim@glaser-co.at',
+    'website': 'https://www.tzaustria.at',
+    'depends': ['delivery',],
+    'data': ['views/delivery_carrier.xml',],
+    'installable': True,
+    'auto_install': False,
+}

ext/custom-addons/tz_carrier_show_integration/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import delivery_carrier

ext/custom-addons/tz_carrier_show_integration/models/delivery_carrier.py

@@ -0,0 +1,11 @@
+# Copyright 2018-Today datenpol gmbh (<http://www.datenpol.at>)
+# License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses).
+
+from odoo import api, fields, models
+
+class DeliveryCarrier(models.Model):
+    _inherit = 'delivery.carrier'
+
+    integration_level = fields.Selection([('none', 'NONE'), ('rate', 'Get Rate'),
+            ('rate_and_ship', 'Get Rate and Create Shipment')], string="Integration Level", default='none', help="Action while validating Delivery Orders")
+

ext/custom-addons/tz_carrier_show_integration/views/delivery_carrier.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018-Today datenpol gmbh(<http://www.datenpol.at>)
+     License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses). -->
+
+<odoo>
+
+    <record id="view_delivery_carrier_tz" model="ir.ui.view">
+        <field name="name">view_delivery_carrier_tz</field>
+        <field name="model">delivery.carrier</field>
+        <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
+        <field name="arch" type="xml">
+            <field name="delivery_type" position="replace">
+                <group>
+                    <label for="delivery_type"/>
+                    <div>
+                        <field name="delivery_type" widget="radio"/>
+                        <button string="Install more Providers" name="install_more_provider" type="object" class="oe_link oe_edit_only"/>
+                    </div>
+                    <field name="integration_level" widget="radio"/>
+                </group>
+            </field>
+        </field>
+    </record>
+
+</odoo>

setup/lib/config.py

@@ -149,6 +149,7 @@ class Config(object):
             'dp_style',
             'dp_show_company',
             'mass_editing',
+            'tz_carrier_show_integration',
             'base_partner_sequence'
         ]