From 3544a0301407b961bb50110fad21509a2af449db Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Fri, 6 Apr 2018 14:12:31 +0200 Subject: [PATCH] Feedback + Bug Fixes + Fall 5171 --- dev/odoo-server-dev-aa.conf | 2 +- ext/custom-addons/dp_custom/models/sale.py | 11 +-- .../dp_custom/views/res_partner_views.xml | 26 +++---- .../dp_custom/views/sale_views.xml | 5 +- .../models/account_invoice.py | 2 +- .../dp_reports_account/reports/invoice.xml | 17 ++++- ext/custom-addons/dp_show_company/LICENSE | 27 +++++++ ext/custom-addons/dp_show_company/__init__.py | 0 .../dp_show_company/__manifest__.py | 26 +++++++ .../static/description/icon.png | Bin 0 -> 2225 bytes .../static/src/img/favicon.ico | Bin 0 -> 26622 bytes .../static/src/js/web_client.js | 71 ++++++++++++++++++ .../dp_show_company/static/src/xml/base.xml | 12 +++ .../dp_show_company/views/assets.xml | 10 +++ .../dp_show_company/views/web.xml | 12 +++ setup/connect-demo.sh | 3 + setup/lib/config.py | 2 + setup/lib/environments.py | 3 + 18 files changed, 203 insertions(+), 26 deletions(-) create mode 100644 ext/custom-addons/dp_show_company/LICENSE create mode 100644 ext/custom-addons/dp_show_company/__init__.py create mode 100644 ext/custom-addons/dp_show_company/__manifest__.py create mode 100644 ext/custom-addons/dp_show_company/static/description/icon.png create mode 100644 ext/custom-addons/dp_show_company/static/src/img/favicon.ico create mode 100644 ext/custom-addons/dp_show_company/static/src/js/web_client.js create mode 100644 ext/custom-addons/dp_show_company/static/src/xml/base.xml create mode 100644 ext/custom-addons/dp_show_company/views/assets.xml create mode 100644 ext/custom-addons/dp_show_company/views/web.xml create mode 100755 setup/connect-demo.sh 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 0000000000000000000000000000000000000000..8387d76554e8c52cf9256f9dc3f0358744f26f8e GIT binary patch literal 2225 zcmV;i2u}BjP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{005UN6GXZYpd*5GTM;9mttz230kztuXpqw7k0!Bk-aY#xp76VI(r5cRu^;~ayve)o z`g`Zx^W&a#fjsiaBab}t$Rm%O1kLpVeEvYW6vi3`uOQG;0ObG{0Vo1c82h&o0Amac z3c?@*S0U*yqwkfR@9k}wxT6U4cv@TwO0Ihd_zE+s0W3~qx(I+C0Dmlq7KS=I_l!7} zKyTgFVuQ>r%)AM}k_@~e0>V*g^6nEy_W#{61lHC*zVOz(@Q;XTTbxQ}8r@Rz)3ZS& zWmHv*uYVgrD}aS_u|F~Rxp~p~Etyp9j1aiKq51x($uAP{`7AJ$L(HQ2c*n0^$q53h zH*Q%^B!4qkQa7zM67L?n@v*0LTWzfb*3>sW3C6Qo?6!4_uvy>L)jpPW1XkAt_Yi1X zwmZHI^f6pDCl2o&)-j*ZLSB8aH5bT>NlcZ%#Od1F#}{UW1m=L+PAiE<*z}~U&aU*- zwyAL%@~(l<7h7pnh8*XaFap9!FwQXWfgpT=8DER{LkXyoMaHiIe05GFFc!o9Lv@ac zXy*qvN_NFtJFh=jX&BV3{)i0V8i3s*Y`&yQme(Jw6oO7q@eT+-><+cH&MJW(Pm9Z4 zeElo|RjR9SJhcDGnZh}u=o1-;O0F@mV{EuIG?SZBv$1&H`D6wj(ulmjlk;q zU@I~GK$+=Kcc{&lI%p(v2*A$K;nElE`ghfJO^pQnPW=EPY+Z`Pm9Za&u|S1*#O2GBu;T% zBf=R5{?Hw2>q$r7eZGKO&Nu!Bpd$WvxC|B6}U~Iy8e=SmQtMC9E zfUYC$R~UFrF$|4b2_%9~8S0sf6R-?sXkJ!^*4kBLdwU?`Q6-b{G8}}0XkkbhDwIXW zDlG*1{DE>c0B5*PIf=l|&OIZHSoY|)G5MSp0;Mq4s9}_Dr#3slmSlot_GlrH!7G&g z@EjZoI2ewg@!BW+&7GXjkN$ zP9V?c50t9~0|^8sJp#MB+Q&dRs(hvIdps?!oR>bsP%9BeVgjR&z)829_9`QbW1UDj zi}el7_s6PcZxc$~o=mxlZ34SH_MKG^paDFSOc_MB!IZoMO1iEB7 zuXu=3X&J~QdDC<$9qJCXeK(!CjdUI!yxjNpvWluOfVIk>Jj*Mp?ps{E?nE*@92wd3 zHf~uj1Wu}w7i%_r%x-VX^m!H?i%itH6kBA0LH<;%Te|RgT3qgu|NJ!3x&T~~aD7on zm6@Sqv4i~=ddeyubQ5T`@^$W&jBhPlS@qw0OV+(HThi$D2P+Hj8hw>O8xnm~hU?3^ zO7v!}<)48*B5Y5$%jm;mTT}85HNuFG1qz~tn{<{Z&-$ek47^5!U86Tjdv#U$`}~1& zQ-~mef|#axF()pah?fK#*PaY9@k<0cl?s_Yf1q5F@hB4-)pY!n_vF&GCl-~iYYM>L z#XAuO&I!UGOY}3uJMmQkEX4vMS<1vqh-oE&O4zt_iwFlzc5TmONpi-oewsY6i9R)x zdSw8)fAv#BA}5=yHzBz|9(m-EM;>|Pk)!w@TDLdXvm#rS00000NkvXXu0mjf$QcM^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c33e99bbdd94ba4a177804b29d9dfa9769712e6 GIT binary patch literal 26622 zcmeHQJ#X7a7-r!D2D-RQyA|q~wQCk<$Py_=48%4H{{Yo?Q6O8#sK^j>>)xeX|A2mg zf^1&BdT<5--RzNrVD@>AN8|2zCyUg3G$ot@nlDe}@$PxQU!IsO`wIUK4>SDzG5hbA zEc-sovS--Pl>LK^?dg*cNC+eZ5&{WRy21XTDP4>ii zif#Pv@bKHsL819be>;Bl-Py_TPXWwA_~zuv+1pn?H6LAnuTZ!t-L&*Egn?B1bQ^G_ zUSXr{dJGrnA#9(vZCbxyLY~y7j%g!H`K7+DruXQN{OhlD`A2r~^P3;EFIa}#T;TzX z+V}zGci=~qPg%~NIq~<8w12HyR+h*d<*XfMq1h74(tn3-1bNklPoaCpXa_F8hjo>) z$LM8@`&NA_xu*>X%j2}Kep=fmpT1HS$6fNCz61BX^5ZzX?3+ytV>i5{OjPpG<(~Ws zk85<*7Yu_s3q9&m=0d#D_Snp2w2llf#|H=Bgs$tNU5~A%vll0?Ctcis)q7}tuKP5^ z+pG2=eV)!+>wJX|k-nEie@igze7ux_O2fL#0 zHZO#!_9vzs6s%u_&X;KS)CA_6q_-{xs@`MkQV~lAwePa|g}lri(xPTP#Luh+mX@i~JjgSn&*qi-komX+_P#+9`!2S3CzGPPcxedtT=OcHnK@TG~N zR6c?}UD>{p9Cu&(s^@gWnZ(#?{YH+_CC1#Q508(Wx9P{d2J&a;yFIP%x#Mnn?91mQ zd-a&ud<(#^_ zmn$n0x`sXbY)t?rZyWvH)rb_on`AKWCi%y@$;6{{amgPE6mlxPa=L!`J0P$vt#fi)eo9M zW}ThtR~8(t4j_Y;50;24TMZ=AMZVlus(#8Lr~3VRjPumSw)^=JVvh9?v#-{%k(Gx) zCOcm@XOBwe$YG2V?eP{=iZUuwqa+qQlv z>KZosbO*me>N%gubIOHUuY~(i?qk#(z3ZVmcs2(7?0gvY>2>pLu0vv7LfcsDd4a*N zYqi!#pr)?SnC})_s7;A3gYHs%6B82 zK89o9_X`EvSDm}md0LNa@UB*k)i{JD<1*}vaUS8})kx;$+gGgfnqy;pfetzO-U&seJCv@vd65F3lO{g=N>snr^m z&M%^_Z`AusD$L6md*%1%M8TFexo>`=!e`Yz$1jwtHNki*-rrSvK52ioZ2aJ#g}{l zxzfB_?A>MAe#z7O-5F%8 + + + +
  • +
    + +
    +
    • +     + +     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()), }