Feedback + Bug Fixes + Fall 5171

dev/odoo-server-dev-aa.conf

@@ -16,7 +16,7 @@ timezone = Europe/Vienna
 #dbfilter_test = ['.*',]
 show_debug = 1
 
-workers = 4
+workers = 0
 server_wide_modules = web,base_sparse_field,queue_job
 
 portal_url = https://dev-portal.tzaustria.info/

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

@@ -307,11 +307,12 @@ class SaleOrder(models.Model):
                     invoices[group_key] = invoice
                 elif group_key in invoices:
                     vals = {}
-                    if order.name not in invoices[group_key].origin.split(', '):
+                    if order.name == "siehe Detail" or order.name not in invoices[group_key].origin.split(', '):
-                        vals['origin'] = invoices[group_key].origin + ', ' + order.name
+                        vals['origin'] = "siehe Detail"
-                    if order.client_order_ref and order.client_order_ref not in invoices[group_key].name.split(
+                    if order.client_order_ref and (order.client_order_ref == "siehe Detail" or (
-                            ', ') and order.client_order_ref != invoices[group_key].name:
+                            order.client_order_ref not in invoices[group_key].name.split(
-                        vals['name'] = invoices[group_key].name + ', ' + order.client_order_ref
+                            ', ') and order.client_order_ref != invoices[group_key].name)):
+                        vals['name'] = "siehe Detail"
                     invoices[group_key].write(vals)
                 if line.qty_to_invoice > 0:
                     line.invoice_line_create(invoices[group_key].id, line.qty_to_invoice)

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

@@ -57,6 +57,18 @@
         </field>
     </record>
 
+    <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"/>
+                <field name="ref"/>
+            </field>
+        </field>
+    </record>
+
     <record id="res_partner_portal_action" model="ir.actions.act_window">
         <field name="name">Neue Portalkunden</field>
         <field name="type">ir.actions.act_window</field>
@@ -123,18 +135,4 @@
               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_custom/views/sale_views.xml

@@ -116,12 +116,13 @@
     </record>
 
     <record id="view_sales_order_filter_assembly" model="ir.ui.view">
-        <field name="name">view.sales.order.filter.assembly</field>
+        <field name="name">view_sales_order_filter_assembly</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="assembly_state" string="PG Status" filter_domain="[('assembly_state','ilike',self)]"/>
+                <field name="origin"/>
+                <field name="assembly_state" string="PG Status"/>
             </field>
             <filter name="customer" position="after">
                 <filter string="PG Status" domain="[]" context="{'group_by':'assembly_state'}"/>

ext/custom-addons/dp_reports_account/models/account_invoice.py

@@ -26,5 +26,5 @@ class AccountInvoice(models.Model):
                 category['price_subtotal'] = price_subtotal
                 sale_order = self.env['sale.order'].search([('name', '=', category['name'])])
                 if sale_order:
-                    category['confirmation_nr'] = sale_order.confirmation_nr
+                    category['order_id'] = sale_order
         return res

ext/custom-addons/dp_reports_account/reports/invoice.xml

@@ -106,9 +106,20 @@
                                         <strong>
                                             <t t-esc="layout_category['name']"/>
                                             -
-                                            <t t-esc="o.partner_id.name"/>
+                                            <t t-esc="o.partner_id.ref"/>
-                                            <t t-if="layout_category['confirmation_nr']">-
+                                            <t t-if="layout_category['order_id']">
-                                                <t t-esc="layout_category['confirmation_nr']"/>
+                                                <t t-if="layout_category['order_id'].origin">
+                                                    -
+                                                    <t t-esc="layout_category['order_id'].origin"/>
+                                                </t>
+                                                <t t-if="layout_category['order_id'].client_order_ref">
+                                                    -
+                                                    <t t-esc="layout_category['order_id'].client_order_ref"/>
+                                                </t>
+                                                <t t-if="layout_category['order_id'].confirmation_nr">
+                                                    -
+                                                    <t t-esc="layout_category['order_id'].confirmation_nr"/>
+                                                </t>
                                             </t>
                                         </strong>
                                     </td>

ext/custom-addons/dp_show_company/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/dp_show_company/__manifest__.py

@@ -0,0 +1,26 @@
+# -*- coding: 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).
+
+
+# noinspection PyStatementEffect
+{
+    'name': 'Dp Show Company',
+    'version': '11.0.1.0.0',
+    'license': 'OPL-1',
+    'author': 'datenpol gmbh',
+    'website': 'https://www.datenpol.at',
+    'depends': [
+        'web',
+        'web_responsive',
+    ],
+    'data': [
+        'views/assets.xml',
+        'views/web.xml',
+    ],
+    "qweb": [
+        'static/src/xml/base.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}

ext/custom-addons/dp_show_company/static/src/js/web_client.js

@@ -0,0 +1,71 @@
+odoo.define('dp_show_company.ShowCompanyMenu', function (require) {
+"use strict";
+
+    var rpc = require("web.rpc");
+    var Widget = require('web.Widget');
+    var session = require('web.session');
+
+
+    var ShowCompanyMenu = Widget.extend({
+        template: 'ShowCompanyMenu',
+
+        init: function (parent) {
+            this._super(parent);
+            this.widgets = [];
+            this.load = $.Deferred();
+        },
+        /**
+         * @override
+         * @returns {Deferred}
+         */
+        start: function () {
+            var self = this;
+            var session = this.getSession();
+            return this._super.apply(this, arguments).then(function () {
+                if (!session.uid) {
+                    return $.when();
+                }
+                var company_id = session.company_id;
+                var company_name = '';
+                var records = rpc.query({
+                    model: 'res.company',
+                    method: 'search_read',
+                    args: [[['id', '=', session.company_id]], ['name']],
+                }).then(function (companies){
+                    self.$('.oe_topbar_name').text(companies[0].name);
+                });
+
+            });
+        },
+    });
+
+    return ShowCompanyMenu;
+
+});
+
+odoo.define('dp_show_company.WebClient', function (require) {
+"use strict";
+
+    var WebClient = require('web.WebClient');
+    var ShowCompanyMenu = require('dp_show_company.ShowCompanyMenu');
+
+    WebClient.include({
+        show_application: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+
+            // Create the user menu (rendered client-side)
+            this.show_company_menu = new ShowCompanyMenu(this);
+            var $show_company_menu_placeholder = $('body').find('.oe_show_company_menu').show();
+            var show_company_menu_loaded = this.show_company_menu.appendTo($show_company_menu_placeholder);
+
+            // Start the menu once both systray and user menus are rendered
+            // to prevent overflows while loading
+            return $.when(show_company_menu_loaded).then(function() {
+                self.bind_hashchange();
+            });
+        },
+    });
+});
+
+

ext/custom-addons/dp_show_company/static/src/xml/base.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+
+    <t t-name="ShowCompanyMenu">
+        <li class="o_user_menu">
+            <div class="badge" style="margin: 8px 8px;padding: 3px 7px;font-size: inherit;">
+                <span class="oe_topbar_name"/>
+            </div>
+        </li>
+    </t>
+
+</templates>

ext/custom-addons/dp_show_company/views/assets.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="assets_backend" name="dp_show_company assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/dp_show_company/static/src/js/web_client.js"></script>
+        </xpath>
+    </template>
+
+</odoo>

ext/custom-addons/dp_show_company/views/web.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="webclient_bootstrap" inherit_id="web_responsive.webclient_bootstrap" name="App Drawer - Web Client">
+        <xpath expr="//div[hasclass('o_menu_systray')]" position="inside">
+            <ul class="nav navbar-nav navbar-right navbar-systray-item oe_show_company_menu">
+                <span class="oe_topbar_name"/>
+            </ul>
+        </xpath>
+    </template>
+
+</odoo>

setup/connect-demo.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ssh -p 3333 odoo-demo@5.9.67.35

setup/lib/config.py

@@ -140,6 +140,8 @@ class Config(object):
             'dp_sale_filter_partner_addresses',
             'website_form_project',
             'contacts',
+            'dp_style',
+            'dp_show_company'
 
         ]
 

setup/lib/environments.py

@@ -53,6 +53,9 @@ ENVIRONMENTS = {
     'test': Environment('https://erp.tzaustria.info', '443', 'odoo-test', 'admin', config = ConfigTZA()),
     'test-glaser': Environment('https://erp.tzaustria.info',  '443', 'odoo-test', 'glaser-admin', config = ConfigGlaser()),
 
+    'demo': Environment('https://solutions.tzaustria.info', '443', 'odoo-demo', 'admin', config = ConfigTZA()),
+    'demo-glaser': Environment('https://solutions.tzaustria.info',  '443', 'odoo-demo', 'glaser-admin', config = ConfigGlaser()),
+
     'prod': Environment('http://localhost', '9002', 'odoo-prod', 'admin', config = ConfigTZA()),
     'prod-glaser': Environment('http://localhost',  '9002', 'odoo-prod', 'glaser-admin', config = ConfigGlaser()),
 }