diff --git a/dev/odoo-server-dev-aa.conf b/dev/odoo-server-dev-aa.conf index 38aad9b1..fa317cd4 100644 --- a/dev/odoo-server-dev-aa.conf +++ b/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/ diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py index b33a29a2..8858d86d 100644 --- a/ext/custom-addons/dp_custom/models/sale.py +++ b/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(', '): - vals['origin'] = invoices[group_key].origin + ', ' + order.name - if order.client_order_ref and order.client_order_ref not in invoices[group_key].name.split( - ', ') and order.client_order_ref != invoices[group_key].name: - vals['name'] = invoices[group_key].name + ', ' + order.client_order_ref + if order.name == "siehe Detail" or order.name not in invoices[group_key].origin.split(', '): + vals['origin'] = "siehe Detail" + if order.client_order_ref and (order.client_order_ref == "siehe Detail" or ( + order.client_order_ref not in invoices[group_key].name.split( + ', ') 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) diff --git a/ext/custom-addons/dp_custom/views/res_partner_views.xml b/ext/custom-addons/dp_custom/views/res_partner_views.xml index ad023422..99d44dde 100644 --- a/ext/custom-addons/dp_custom/views/res_partner_views.xml +++ b/ext/custom-addons/dp_custom/views/res_partner_views.xml @@ -57,6 +57,18 @@ + + res_partner_filter_tz + res.partner + + + + + + + + + Neue Portalkunden ir.actions.act_window @@ -123,18 +135,4 @@ name="Branchen" action="res_partner_sector_action"/> - - res_partner_filter_tz - res.partner - - - - - - - - - - - diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml index f18aa7ed..c4e3901a 100644 --- a/ext/custom-addons/dp_custom/views/sale_views.xml +++ b/ext/custom-addons/dp_custom/views/sale_views.xml @@ -116,12 +116,13 @@ - view.sales.order.filter.assembly + view_sales_order_filter_assembly sale.order - + + diff --git a/ext/custom-addons/dp_reports_account/models/account_invoice.py b/ext/custom-addons/dp_reports_account/models/account_invoice.py index 335c4d2f..6afef74e 100644 --- a/ext/custom-addons/dp_reports_account/models/account_invoice.py +++ b/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 diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml index deaf93f6..b37d9b86 100644 --- a/ext/custom-addons/dp_reports_account/reports/invoice.xml +++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml @@ -106,9 +106,20 @@ - - - - - + + + + - + + + + - + + + + - + + diff --git a/ext/custom-addons/dp_show_company/LICENSE b/ext/custom-addons/dp_show_company/LICENSE new file mode 100644 index 00000000..1a40586b --- /dev/null +++ b/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. \ No newline at end of file diff --git a/ext/custom-addons/dp_show_company/__init__.py b/ext/custom-addons/dp_show_company/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ext/custom-addons/dp_show_company/__manifest__.py b/ext/custom-addons/dp_show_company/__manifest__.py new file mode 100644 index 00000000..695b38b8 --- /dev/null +++ b/ext/custom-addons/dp_show_company/__manifest__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright 2018-Today datenpol gmbh() +# 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, +} diff --git a/ext/custom-addons/dp_show_company/static/description/icon.png b/ext/custom-addons/dp_show_company/static/description/icon.png new file mode 100644 index 00000000..8387d765 Binary files /dev/null and b/ext/custom-addons/dp_show_company/static/description/icon.png differ diff --git a/ext/custom-addons/dp_show_company/static/src/img/favicon.ico b/ext/custom-addons/dp_show_company/static/src/img/favicon.ico new file mode 100644 index 00000000..3c33e99b Binary files /dev/null and b/ext/custom-addons/dp_show_company/static/src/img/favicon.ico differ diff --git a/ext/custom-addons/dp_show_company/static/src/js/web_client.js b/ext/custom-addons/dp_show_company/static/src/js/web_client.js new file mode 100644 index 00000000..57f030b8 --- /dev/null +++ b/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(); + }); + }, + }); +}); + + diff --git a/ext/custom-addons/dp_show_company/static/src/xml/base.xml b/ext/custom-addons/dp_show_company/static/src/xml/base.xml new file mode 100644 index 00000000..5794a2e7 --- /dev/null +++ b/ext/custom-addons/dp_show_company/static/src/xml/base.xml @@ -0,0 +1,12 @@ + + + + +
  • +
    + +
    +
    • +     + +     diff --git a/ext/custom-addons/dp_show_company/views/assets.xml b/ext/custom-addons/dp_show_company/views/assets.xml new file mode 100644 index 00000000..253ff03f --- /dev/null +++ b/ext/custom-addons/dp_show_company/views/assets.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/ext/custom-addons/dp_show_company/views/web.xml b/ext/custom-addons/dp_show_company/views/web.xml new file mode 100644 index 00000000..a6de7e61 --- /dev/null +++ b/ext/custom-addons/dp_show_company/views/web.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/setup/connect-demo.sh b/setup/connect-demo.sh new file mode 100755 index 00000000..6e1048fb --- /dev/null +++ b/setup/connect-demo.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +ssh -p 3333 odoo-demo@5.9.67.35 diff --git a/setup/lib/config.py b/setup/lib/config.py index 8fabb116..9434772e 100644 --- a/setup/lib/config.py +++ b/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' ] diff --git a/setup/lib/environments.py b/setup/lib/environments.py index 61299200..3959ed8e 100644 --- a/setup/lib/environments.py +++ b/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()), }