From 80f478905ec76a7cc2d6c7597502aae3fd7cb9cc Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Sun, 18 Dec 2016 06:51:27 +0100 Subject: [PATCH 01/12] [ADD] base_view_inheritance_extension --- base_view_inheritance_extension/README.rst | 83 ++++++++++++ base_view_inheritance_extension/__init__.py | 4 + .../__openerp__.py | 17 +++ .../demo/ir_ui_view.xml | 22 ++++ .../models/__init__.py | 4 + .../models/ir_ui_view.py | 124 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + .../test_base_view_inheritance_extension.py | 30 +++++ 9 files changed, 288 insertions(+) create mode 100644 base_view_inheritance_extension/README.rst create mode 100644 base_view_inheritance_extension/__init__.py create mode 100644 base_view_inheritance_extension/__openerp__.py create mode 100644 base_view_inheritance_extension/demo/ir_ui_view.xml create mode 100644 base_view_inheritance_extension/models/__init__.py create mode 100644 base_view_inheritance_extension/models/ir_ui_view.py create mode 100644 base_view_inheritance_extension/static/description/icon.png create mode 100644 base_view_inheritance_extension/tests/__init__.py create mode 100644 base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst new file mode 100644 index 000000000..ddfb8bafe --- /dev/null +++ b/base_view_inheritance_extension/README.rst @@ -0,0 +1,83 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +========================= +Extended view inheritance +========================= + +This module was written to make it simple to add custom operators for view inheritance. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/149/8.0 + +Change a python dictionary (context for example) +------------------------------------------------ + +.. code-block:: xml + + + $new_value + + +Note that views are subject to evaluation of xmlids anyways, so if you need to refer to some xmlid, say ``%(xmlid)s``. + +Move an element in the view +--------------------------- + +.. code-block:: xml + + + +This can also be used to wrap some element into another, create the target element first, then move the node youwant to wrap there. + +Known issues / Roadmap +====================== + +* add ``$value`` +* add ``$index`` +* add ``$value`` +* support ```` +* support an ``eval`` attribute for our new node types + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Holger Brunn + +Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list `_ or the `appropriate specialized mailinglist `_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues. + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/base_view_inheritance_extension/__init__.py b/base_view_inheritance_extension/__init__.py new file mode 100644 index 000000000..7eda98a23 --- /dev/null +++ b/base_view_inheritance_extension/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/base_view_inheritance_extension/__openerp__.py b/base_view_inheritance_extension/__openerp__.py new file mode 100644 index 000000000..bec0cfdfe --- /dev/null +++ b/base_view_inheritance_extension/__openerp__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Extended view inheritance", + "version": "8.0.1.0.0", + "author": "Therp BV,Odoo Community Association (OCA)", + "license": "AGPL-3", + "category": "Hidden/Dependency", + "summary": "Adds more operators for view inheritance", + "depends": [ + 'base', + ], + "demo": [ + "demo/ir_ui_view.xml", + ], +} diff --git a/base_view_inheritance_extension/demo/ir_ui_view.xml b/base_view_inheritance_extension/demo/ir_ui_view.xml new file mode 100644 index 000000000..648a19cb5 --- /dev/null +++ b/base_view_inheritance_extension/demo/ir_ui_view.xml @@ -0,0 +1,22 @@ + + + + + res.partner + + + + Partner form + + + 'The company name' + context.get('company_id', context.get('company')) + + + + + + + + + diff --git a/base_view_inheritance_extension/models/__init__.py b/base_view_inheritance_extension/models/__init__.py new file mode 100644 index 000000000..7e711cb18 --- /dev/null +++ b/base_view_inheritance_extension/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import ir_ui_view diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py new file mode 100644 index 000000000..ea227a528 --- /dev/null +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from lxml import etree +from openerp import api, models, tools + + +class UnquoteObject(str): + def __getattr__(self, name): + return UnquoteObject('%s.%s' % (self, name)) + + def __repr__(self): + return self + + def __call__(self, *args, **kwargs): + return UnquoteObject( + '%s(%s)' % ( + self, + ','.join( + [ + UnquoteObject( + a if not isinstance(a, basestring) + else "'%s'" % a + ) + for a in args + ] + + [ + '%s=%s' % (UnquoteObject(k), v) + for (k, v) in kwargs.iteritems() + ] + ) + ) + ) + + +class UnquoteEvalObjectContext(tools.misc.UnquoteEvalContext): + def __missing__(self, key): + return UnquoteObject(key) + + +class IrUiView(models.Model): + _inherit = 'ir.ui.view' + + @api.model + def apply_inheritance_specs(self, source, specs_tree, inherit_id): + for specs, handled_by in self._iter_inheritance_specs(specs_tree): + source = handled_by(source, specs, inherit_id) + return source + + @api.model + def _iter_inheritance_specs(self, spec): + if spec.tag == 'data': + for child in spec: + for node, handler in self._iter_inheritance_specs(child): + yield node, handler + return + if spec.get('position') == 'attributes': + for child in spec: + node = etree.Element(spec.tag, **spec.attrib) + node.insert(0, child) + yield node, self._get_inheritance_handler_attributes( + child + ) + return + yield spec, self._get_inheritance_handler(spec) + + @api.model + def _get_inheritance_handler(self, node): + handler = super(IrUiView, self).apply_inheritance_specs + if hasattr( + self, 'inheritance_handler_%s' % node.tag + ): + handler = getattr( + self, + 'inheritance_handler_%s' % node.tag + ) + return handler + + @api.model + def _get_inheritance_handler_attributes(self, node): + handler = super(IrUiView, self).apply_inheritance_specs + if hasattr( + self, 'inheritance_handler_attributes_%s' % node.get('operation') + ): + handler = getattr( + self, + 'inheritance_handler_attributes_%s' % node.get('operation') + ) + return handler + + @api.model + def inheritance_handler_attributes_python_dict( + self, source, specs, inherit_id + ): + """Implement + <$node position="attributes"> + + $keyvalue + + """ + node = self.locate_node(source, specs) + for attribute_node in specs: + python_dict = tools.safe_eval( + node.get(attribute_node.get('name')) or '{}', + UnquoteEvalObjectContext() + ) + python_dict[attribute_node.get('key')] = UnquoteObject( + attribute_node.text + ) + node.attrib[attribute_node.get('name')] = str(python_dict) + return source + + @api.model + def inheritance_handler_xpath(self, source, specs, inherit_id): + if not specs.get('position') == 'move': + return super(IrUiView, self).apply_inheritance_specs( + source, specs, inherit_id + ) + node = self.locate_node(source, specs) + target_node = self.locate_node( + source, etree.Element(specs.tag, expr=specs.get('target')) + ) + target_node.append(node) + return source diff --git a/base_view_inheritance_extension/static/description/icon.png b/base_view_inheritance_extension/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/base_view_inheritance_extension/tests/__init__.py b/base_view_inheritance_extension/tests/__init__.py new file mode 100644 index 000000000..94db4e53b --- /dev/null +++ b/base_view_inheritance_extension/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_base_view_inheritance_extension diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py new file mode 100644 index 000000000..f40045590 --- /dev/null +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from lxml import etree +from openerp.tests.common import TransactionCase + + +class TestBaseViewInheritanceExtension(TransactionCase): + def test_base_view_inheritance_extension(self): + view_id = self.env.ref('base.view_partner_form').id + fields_view_get = self.env['res.partner'].fields_view_get( + view_id=view_id + ) + view = etree.fromstring(fields_view_get['arch']) + # verify normal attributes work + self.assertEqual(view.xpath('//form')[0].get('string'), 'Partner form') + # verify our extra context key worked + self.assertTrue( + 'default_name' in + view.xpath('//field[@name="parent_id"]')[0].get('context') + ) + self.assertTrue( + "context.get('company_id', context.get('company'))" in + view.xpath('//field[@name="parent_id"]')[0].get('context') + ) + # verify we moved the child_ids field + self.assertEqual( + view.xpath('//field[@name="child_ids"]')[0].getparent(), + view.xpath('//page[@name="my_new_page"]')[0] + ) From ae0f2f13205c4da5ea8d80ae9a2663f8016b5d1e Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Fri, 23 Dec 2016 11:37:09 +0100 Subject: [PATCH 02/12] [base_view_inheritance_extension] Relicense to LGPL. (#4) --- base_view_inheritance_extension/README.rst | 6 +++--- base_view_inheritance_extension/__init__.py | 2 +- base_view_inheritance_extension/__openerp__.py | 4 ++-- base_view_inheritance_extension/models/__init__.py | 2 +- base_view_inheritance_extension/models/ir_ui_view.py | 2 +- base_view_inheritance_extension/tests/__init__.py | 2 +- .../tests/test_base_view_inheritance_extension.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index ddfb8bafe..e0186c4bb 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -1,6 +1,6 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 ========================= Extended view inheritance diff --git a/base_view_inheritance_extension/__init__.py b/base_view_inheritance_extension/__init__.py index 7eda98a23..4431c72c4 100644 --- a/base_view_inheritance_extension/__init__.py +++ b/base_view_inheritance_extension/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import models diff --git a/base_view_inheritance_extension/__openerp__.py b/base_view_inheritance_extension/__openerp__.py index bec0cfdfe..1255e4013 100644 --- a/base_view_inheritance_extension/__openerp__.py +++ b/base_view_inheritance_extension/__openerp__.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", "version": "8.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", - "license": "AGPL-3", + "license": "LGPL-3", "category": "Hidden/Dependency", "summary": "Adds more operators for view inheritance", "depends": [ diff --git a/base_view_inheritance_extension/models/__init__.py b/base_view_inheritance_extension/models/__init__.py index 7e711cb18..588d249e2 100644 --- a/base_view_inheritance_extension/models/__init__.py +++ b/base_view_inheritance_extension/models/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import ir_ui_view diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index ea227a528..752220079 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree from openerp import api, models, tools diff --git a/base_view_inheritance_extension/tests/__init__.py b/base_view_inheritance_extension/tests/__init__.py index 94db4e53b..f76aba46a 100644 --- a/base_view_inheritance_extension/tests/__init__.py +++ b/base_view_inheritance_extension/tests/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import test_base_view_inheritance_extension diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index f40045590..2429b4f6f 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree from openerp.tests.common import TransactionCase From 46376b29503ab2c860fe6faf24a348662da11ba5 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 23 Dec 2016 22:52:19 +0100 Subject: [PATCH 03/12] [MIG] base_view_inheritance_extension: Migration to 9.0 Trivial changes: * Version in README changed * Version in manifest changed OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex --- base_view_inheritance_extension/README.rst | 2 +- .../__openerp__.py | 2 +- base_view_inheritance_extension/i18n/de.po | 34 +++++++++++++++++++ base_view_inheritance_extension/i18n/sl.po | 34 +++++++++++++++++++ base_view_inheritance_extension/i18n/tr.po | 34 +++++++++++++++++++ 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 base_view_inheritance_extension/i18n/de.po create mode 100644 base_view_inheritance_extension/i18n/sl.po create mode 100644 base_view_inheritance_extension/i18n/tr.po diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index e0186c4bb..f5eaa8ba6 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -13,7 +13,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/8.0 + :target: https://runbot.odoo-community.org/runbot/149/9.0 Change a python dictionary (context for example) ------------------------------------------------ diff --git a/base_view_inheritance_extension/__openerp__.py b/base_view_inheritance_extension/__openerp__.py index 1255e4013..d4304a540 100644 --- a/base_view_inheritance_extension/__openerp__.py +++ b/base_view_inheritance_extension/__openerp__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "8.0.1.0.0", + "version": "9.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", diff --git a/base_view_inheritance_extension/i18n/de.po b/base_view_inheritance_extension/i18n/de.po new file mode 100644 index 000000000..c9e0e1ffa --- /dev/null +++ b/base_view_inheritance_extension/i18n/de.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Rudolf Schnapka , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-04 07:39+0000\n" +"PO-Revision-Date: 2017-03-04 07:39+0000\n" +"Last-Translator: Rudolf Schnapka , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "A new page" +msgstr "Eine neue Seite" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "Partner form" +msgstr "Partner-Formular" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "" diff --git a/base_view_inheritance_extension/i18n/sl.po b/base_view_inheritance_extension/i18n/sl.po new file mode 100644 index 000000000..1071aca9d --- /dev/null +++ b/base_view_inheritance_extension/i18n/sl.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-29 03:39+0000\n" +"PO-Revision-Date: 2016-12-29 03:39+0000\n" +"Last-Translator: Matjaž Mozetič , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "A new page" +msgstr "Nova stran" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "Partner form" +msgstr "Partnerjev obrazec" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "" diff --git a/base_view_inheritance_extension/i18n/tr.po b/base_view_inheritance_extension/i18n/tr.po new file mode 100644 index 000000000..77e748e28 --- /dev/null +++ b/base_view_inheritance_extension/i18n/tr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Ahmet Altinisik , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-29 03:39+0000\n" +"PO-Revision-Date: 2016-12-29 03:39+0000\n" +"Last-Translator: Ahmet Altinisik , 2016\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "A new page" +msgstr "Yeni bir sayfa" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "Partner form" +msgstr "İş ortağı formu" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "ir.ui.view" From 199785e354a3bd96bbbe95cc04e107caab072949 Mon Sep 17 00:00:00 2001 From: Ronald Portier Date: Tue, 4 Apr 2017 19:06:26 +0200 Subject: [PATCH 04/12] [8.0][ADD] Add list manipulation operations to base_view_inheritance_extension. (#804) * Add list_add operation. * Add list_remove operation. OCA Transbot updated translations from Transifex --- base_view_inheritance_extension/README.rst | 42 ++++++++-- .../__openerp__.py | 2 +- base_view_inheritance_extension/i18n/ca.po | 34 ++++++++ base_view_inheritance_extension/i18n/de.po | 7 +- base_view_inheritance_extension/i18n/it.po | 34 ++++++++ .../models/ir_ui_view.py | 37 +++++++++ .../test_base_view_inheritance_extension.py | 83 +++++++++++++++++++ 7 files changed, 227 insertions(+), 12 deletions(-) create mode 100644 base_view_inheritance_extension/i18n/ca.po create mode 100644 base_view_inheritance_extension/i18n/it.po diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index f5eaa8ba6..af1675b65 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -6,7 +6,8 @@ Extended view inheritance ========================= -This module was written to make it simple to add custom operators for view inheritance. +This module was written to make it simple to add custom operators for view +inheritance. Usage ===== @@ -24,7 +25,8 @@ Change a python dictionary (context for example) $new_value -Note that views are subject to evaluation of xmlids anyways, so if you need to refer to some xmlid, say ``%(xmlid)s``. +Note that views are subject to evaluation of xmlids anyways, so if you need +to refer to some xmlid, say ``%(xmlid)s``. Move an element in the view --------------------------- @@ -33,13 +35,30 @@ Move an element in the view -This can also be used to wrap some element into another, create the target element first, then move the node youwant to wrap there. +This can also be used to wrap some element into another, create the target +element first, then move the node youwant to wrap there. + +Add to values in a list (states for example) +-------------------------------------------- + +.. code-block:: xml + + + $new_value(s) + + +Remove values from a list (states for example) +---------------------------------------------- + +.. code-block:: xml + + + $remove_value(s) + Known issues / Roadmap ====================== -* add ``$value`` -* add ``$index`` * add ``$value`` * support ```` * support an ``eval`` attribute for our new node types @@ -58,14 +77,21 @@ Credits Images ------ -* Odoo Community Association: `Icon `_. +* Odoo Community Association: + `Icon `_. Contributors ------------ * Holger Brunn - -Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list `_ or the `appropriate specialized mailinglist `_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues. +* Ronald Portier + +Do not contact contributors directly about help with questions or problems +concerning this addon, but use the +`community mailing list `_ or the +`appropriate specialized mailinglist `_ +for help, and the bug tracker linked in `Bug Tracker`_ above for +technical issues. Maintainer ---------- diff --git a/base_view_inheritance_extension/__openerp__.py b/base_view_inheritance_extension/__openerp__.py index d4304a540..a9e251017 100644 --- a/base_view_inheritance_extension/__openerp__.py +++ b/base_view_inheritance_extension/__openerp__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "9.0.1.0.0", + "version": "9.0.1.1.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", diff --git a/base_view_inheritance_extension/i18n/ca.po b/base_view_inheritance_extension/i18n/ca.po new file mode 100644 index 000000000..1e6d67e2b --- /dev/null +++ b/base_view_inheritance_extension/i18n/ca.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Marc Tormo i Bochaca , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-19 17:59+0000\n" +"PO-Revision-Date: 2017-04-19 17:59+0000\n" +"Last-Translator: Marc Tormo i Bochaca , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "A new page" +msgstr "Una nova pàgina " + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "Partner form" +msgstr "Empresa de " + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/de.po b/base_view_inheritance_extension/i18n/de.po index c9e0e1ffa..1e8b83970 100644 --- a/base_view_inheritance_extension/i18n/de.po +++ b/base_view_inheritance_extension/i18n/de.po @@ -3,13 +3,14 @@ # * base_view_inheritance_extension # # Translators: +# OCA Transbot , 2017 # Rudolf Schnapka , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-04 07:39+0000\n" -"PO-Revision-Date: 2017-03-04 07:39+0000\n" +"POT-Creation-Date: 2017-04-19 17:59+0000\n" +"PO-Revision-Date: 2017-04-19 17:59+0000\n" "Last-Translator: Rudolf Schnapka , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" @@ -31,4 +32,4 @@ msgstr "Partner-Formular" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "ir.ui.view" -msgstr "" +msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/it.po b/base_view_inheritance_extension/i18n/it.po new file mode 100644 index 000000000..dea907836 --- /dev/null +++ b/base_view_inheritance_extension/i18n/it.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Paolo Valier , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-19 17:59+0000\n" +"PO-Revision-Date: 2017-04-19 17:59+0000\n" +"Last-Translator: Paolo Valier , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "A new page" +msgstr "Una nuova pagina" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +msgid "Partner form" +msgstr "" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "" diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index 752220079..a32baee9d 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -122,3 +122,40 @@ class IrUiView(models.Model): ) target_node.append(node) return source + + @api.model + def inheritance_handler_attributes_list_add( + self, source, specs, inherit_id + ): + """Implement + <$node position="attributes"> + + $new_value + + """ + node = self.locate_node(source, specs) + for attribute_node in specs: + attribute_name = attribute_node.get('name') + old_value = node.get(attribute_name) or '' + new_value = old_value + ',' + attribute_node.text + node.attrib[attribute_name] = new_value + return source + + @api.model + def inheritance_handler_attributes_list_remove( + self, source, specs, inherit_id + ): + """Implement + <$node position="attributes"> + + $value_to_remove + + """ + node = self.locate_node(source, specs) + for attribute_node in specs: + attribute_name = attribute_node.get('name') + old_values = (node.get(attribute_name) or '').split(',') + remove_values = attribute_node.text.split(',') + new_values = [x for x in old_values if x not in remove_values] + node.attrib[attribute_name] = ','.join(filter(None, new_values)) + return source diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index 2429b4f6f..af1e2c6ba 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -6,6 +6,7 @@ from openerp.tests.common import TransactionCase class TestBaseViewInheritanceExtension(TransactionCase): + def test_base_view_inheritance_extension(self): view_id = self.env.ref('base.view_partner_form').id fields_view_get = self.env['res.partner'].fields_view_get( @@ -28,3 +29,85 @@ class TestBaseViewInheritanceExtension(TransactionCase): view.xpath('//field[@name="child_ids"]')[0].getparent(), view.xpath('//page[@name="my_new_page"]')[0] ) + + def test_list_add(self): + view_model = self.env['ir.ui.view'] + inherit_id = self.env.ref('base.view_partner_form').id + source = etree.fromstring( + """\ +
+
+ """ + ) + modified_source = \ + view_model.inheritance_handler_attributes_list_add( + source, specs, inherit_id + ) + button_node = modified_source.xpath('//button[@name="test"]')[0] + self.assertEqual( + button_node.attrib['states'], + 'draft,open,valid' + ) + # extend with list of values + specs = etree.fromstring( + """\ + + """ + ) + modified_source = \ + view_model.inheritance_handler_attributes_list_add( + source, specs, inherit_id + ) + button_node = modified_source.xpath('//button[@name="test"]')[0] + self.assertEqual( + button_node.attrib['states'], + 'draft,open,valid,payable,paid' + ) + + def test_list_remove(self): + view_model = self.env['ir.ui.view'] + inherit_id = self.env.ref('base.view_partner_form').id + source = etree.fromstring( + """\ +
+
+ """ + ) + modified_source = \ + view_model.inheritance_handler_attributes_list_remove( + source, specs, inherit_id + ) + button_node = modified_source.xpath('//button[@name="test"]')[0] + self.assertEqual( + button_node.attrib['states'], + 'draft,valid,paid' + ) From 942eec3e857233852d36540d0633a5a60b924b48 Mon Sep 17 00:00:00 2001 From: lfreeke Date: Thu, 31 Aug 2017 14:11:29 +0200 Subject: [PATCH 05/12] [MIG] base_view_inheritance_extension to 10.0 --- base_view_inheritance_extension/README.rst | 2 +- .../{__openerp__.py => __manifest__.py} | 2 +- .../demo/ir_ui_view.xml | 21 ++++++++++--------- .../models/ir_ui_view.py | 2 +- .../test_base_view_inheritance_extension.py | 8 +++---- 5 files changed, 18 insertions(+), 17 deletions(-) rename base_view_inheritance_extension/{__openerp__.py => __manifest__.py} (93%) diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index af1675b65..d97a5b97d 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -14,7 +14,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/9.0 + :target: https://runbot.odoo-community.org/runbot/149/10.0 Change a python dictionary (context for example) ------------------------------------------------ diff --git a/base_view_inheritance_extension/__openerp__.py b/base_view_inheritance_extension/__manifest__.py similarity index 93% rename from base_view_inheritance_extension/__openerp__.py rename to base_view_inheritance_extension/__manifest__.py index a9e251017..9088c8430 100644 --- a/base_view_inheritance_extension/__openerp__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "9.0.1.1.0", + "version": "10.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", diff --git a/base_view_inheritance_extension/demo/ir_ui_view.xml b/base_view_inheritance_extension/demo/ir_ui_view.xml index 648a19cb5..96c6c7352 100644 --- a/base_view_inheritance_extension/demo/ir_ui_view.xml +++ b/base_view_inheritance_extension/demo/ir_ui_view.xml @@ -1,9 +1,8 @@ - - - + + res.partner - + Partner form @@ -12,11 +11,13 @@ 'The company name' context.get('company_id', context.get('company')) - - - - +
+ + + +
+ + - - + diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index a32baee9d..3c844ec77 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -2,7 +2,7 @@ # © 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree -from openerp import api, models, tools +from odoo import api, models, tools class UnquoteObject(str): diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index af1e2c6ba..caeb8a359 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -2,13 +2,13 @@ # © 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase class TestBaseViewInheritanceExtension(TransactionCase): def test_base_view_inheritance_extension(self): - view_id = self.env.ref('base.view_partner_form').id + view_id = self.env.ref('base.view_partner_simple_form').id fields_view_get = self.env['res.partner'].fields_view_get( view_id=view_id ) @@ -26,8 +26,8 @@ class TestBaseViewInheritanceExtension(TransactionCase): ) # verify we moved the child_ids field self.assertEqual( - view.xpath('//field[@name="child_ids"]')[0].getparent(), - view.xpath('//page[@name="my_new_page"]')[0] + view.xpath('//field[@name="mobile"]')[0].getparent(), + view.xpath('//page[@name="phone_book"]')[0] ) def test_list_add(self): From da8ae075f92059ea9848345efab8217716f8cff5 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 11 Oct 2017 04:51:35 +0200 Subject: [PATCH 06/12] [FIX] don't break when an attribute node in an xpath makes the expression not match the node any more. Fixes #885 --- base_view_inheritance_extension/__manifest__.py | 2 +- base_view_inheritance_extension/demo/ir_ui_view.xml | 4 ++++ base_view_inheritance_extension/models/ir_ui_view.py | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/base_view_inheritance_extension/__manifest__.py b/base_view_inheritance_extension/__manifest__.py index 9088c8430..79b3cc94c 100644 --- a/base_view_inheritance_extension/__manifest__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "10.0.1.0.0", + "version": "10.0.1.0.1", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", diff --git a/base_view_inheritance_extension/demo/ir_ui_view.xml b/base_view_inheritance_extension/demo/ir_ui_view.xml index 96c6c7352..043960209 100644 --- a/base_view_inheritance_extension/demo/ir_ui_view.xml +++ b/base_view_inheritance_extension/demo/ir_ui_view.xml @@ -11,6 +11,10 @@ 'The company name' context.get('company_id', context.get('company')) + + + parent_id +
diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index 3c844ec77..ae5a00695 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -55,6 +55,9 @@ class IrUiView(models.Model): yield node, handler return if spec.get('position') == 'attributes': + if all(not c.get('operation') for c in spec): + yield spec, self._get_inheritance_handler(spec) + return for child in spec: node = etree.Element(spec.tag, **spec.attrib) node.insert(0, child) From feb51680cf39afadc8ca6a698f78edbaee3ca1a9 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 11 Oct 2017 04:40:14 +0200 Subject: [PATCH 07/12] [FIX] base_view_inheritance_extension: 2 things: * warning about dynamic context * import for safe_eval --- base_view_inheritance_extension/i18n/de.po | 23 ++++++------- base_view_inheritance_extension/i18n/es.po | 34 +++++++++++++++++++ base_view_inheritance_extension/i18n/hr.po | 34 +++++++++++++++++++ base_view_inheritance_extension/i18n/it.po | 24 ++++++------- .../models/ir_ui_view.py | 6 ++-- 5 files changed, 95 insertions(+), 26 deletions(-) create mode 100644 base_view_inheritance_extension/i18n/es.po create mode 100644 base_view_inheritance_extension/i18n/hr.po diff --git a/base_view_inheritance_extension/i18n/de.po b/base_view_inheritance_extension/i18n/de.po index 1e8b83970..5dd858a7f 100644 --- a/base_view_inheritance_extension/i18n/de.po +++ b/base_view_inheritance_extension/i18n/de.po @@ -3,15 +3,14 @@ # * base_view_inheritance_extension # # Translators: -# OCA Transbot , 2017 -# Rudolf Schnapka , 2017 +# Niki Waibel , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-19 17:59+0000\n" -"PO-Revision-Date: 2017-04-19 17:59+0000\n" -"Last-Translator: Rudolf Schnapka , 2017\n" +"POT-Creation-Date: 2017-12-01 02:10+0000\n" +"PO-Revision-Date: 2017-12-01 02:10+0000\n" +"Last-Translator: Niki Waibel , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,14 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "A new page" -msgstr "Eine neue Seite" +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Partner form" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "Partner form" -msgstr "Partner-Formular" +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view diff --git a/base_view_inheritance_extension/i18n/es.po b/base_view_inheritance_extension/i18n/es.po new file mode 100644 index 000000000..d41bffc21 --- /dev/null +++ b/base_view_inheritance_extension/i18n/es.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-01 02:10+0000\n" +"PO-Revision-Date: 2017-12-01 02:10+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Partner form" +msgstr "" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/hr.po b/base_view_inheritance_extension/i18n/hr.po new file mode 100644 index 000000000..3d628dd99 --- /dev/null +++ b/base_view_inheritance_extension/i18n/hr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +# Translators: +# Bole , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-02 18:40+0000\n" +"PO-Revision-Date: 2018-03-02 18:40+0000\n" +"Last-Translator: Bole , 2018\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Partner form" +msgstr "Forma partnera" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "Brojevi telefona" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/it.po b/base_view_inheritance_extension/i18n/it.po index dea907836..b7fca35a4 100644 --- a/base_view_inheritance_extension/i18n/it.po +++ b/base_view_inheritance_extension/i18n/it.po @@ -3,14 +3,14 @@ # * base_view_inheritance_extension # # Translators: -# Paolo Valier , 2017 +# Paolo Valier , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-19 17:59+0000\n" -"PO-Revision-Date: 2017-04-19 17:59+0000\n" -"Last-Translator: Paolo Valier , 2017\n" +"POT-Creation-Date: 2018-01-06 02:25+0000\n" +"PO-Revision-Date: 2018-01-06 02:25+0000\n" +"Last-Translator: Paolo Valier , 2018\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +19,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "A new page" -msgstr "Una nuova pagina" +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Partner form" +msgstr "Form Partner" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "Partner form" -msgstr "" +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "Numeri di telefono" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "ir.ui.view" -msgstr "" +msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index ae5a00695..7f3823371 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -3,6 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree from odoo import api, models, tools +from odoo.tools.safe_eval import safe_eval class UnquoteObject(str): @@ -103,9 +104,10 @@ class IrUiView(models.Model): """ node = self.locate_node(source, specs) for attribute_node in specs: - python_dict = tools.safe_eval( + python_dict = safe_eval( node.get(attribute_node.get('name')) or '{}', - UnquoteEvalObjectContext() + UnquoteEvalObjectContext(), + nocopy=True ) python_dict[attribute_node.get('key')] = UnquoteObject( attribute_node.text From 3c33bf364151af3188059d13f25d93b9e556efc0 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sun, 24 Jun 2018 08:20:32 +0000 Subject: [PATCH 08/12] [UPD] Update base_view_inheritance_extension.pot --- .../i18n/base_view_inheritance_extension.pot | 30 +++++++++++++++++++ base_view_inheritance_extension/i18n/ca.po | 19 +++++++----- base_view_inheritance_extension/i18n/de.po | 4 +-- base_view_inheritance_extension/i18n/es.po | 4 +-- base_view_inheritance_extension/i18n/hr.po | 7 +++-- base_view_inheritance_extension/i18n/it.po | 4 +-- base_view_inheritance_extension/i18n/sl.po | 22 ++++++++------ base_view_inheritance_extension/i18n/tr.po | 19 +++++++----- 8 files changed, 75 insertions(+), 34 deletions(-) create mode 100644 base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot diff --git a/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot new file mode 100644 index 000000000..6a43a709f --- /dev/null +++ b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_view_inheritance_extension +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Partner form" +msgstr "" + +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" + +#. module: base_view_inheritance_extension +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "ir.ui.view" +msgstr "" + diff --git a/base_view_inheritance_extension/i18n/ca.po b/base_view_inheritance_extension/i18n/ca.po index 1e6d67e2b..fef50e279 100644 --- a/base_view_inheritance_extension/i18n/ca.po +++ b/base_view_inheritance_extension/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Marc Tormo i Bochaca , 2017 msgid "" @@ -12,23 +12,26 @@ msgstr "" "PO-Revision-Date: 2017-04-19 17:59+0000\n" "Last-Translator: Marc Tormo i Bochaca , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "A new page" -msgstr "Una nova pàgina " - -#. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form msgid "Partner form" msgstr "Empresa de " +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" + #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "ir.ui.view" msgstr "ir.ui.view" + +#~ msgid "A new page" +#~ msgstr "Una nova pàgina " diff --git a/base_view_inheritance_extension/i18n/de.po b/base_view_inheritance_extension/i18n/de.po index 5dd858a7f..0862b29dd 100644 --- a/base_view_inheritance_extension/i18n/de.po +++ b/base_view_inheritance_extension/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Niki Waibel , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-01 02:10+0000\n" "Last-Translator: Niki Waibel , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension diff --git a/base_view_inheritance_extension/i18n/es.po b/base_view_inheritance_extension/i18n/es.po index d41bffc21..87cecfad6 100644 --- a/base_view_inheritance_extension/i18n/es.po +++ b/base_view_inheritance_extension/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Pedro M. Baeza , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-01 02:10+0000\n" "Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension diff --git a/base_view_inheritance_extension/i18n/hr.po b/base_view_inheritance_extension/i18n/hr.po index 3d628dd99..3ded69c2c 100644 --- a/base_view_inheritance_extension/i18n/hr.po +++ b/base_view_inheritance_extension/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Bole , 2018 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2018-03-02 18:40+0000\n" "Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_view_inheritance_extension #: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form diff --git a/base_view_inheritance_extension/i18n/it.po b/base_view_inheritance_extension/i18n/it.po index b7fca35a4..c2f0849f2 100644 --- a/base_view_inheritance_extension/i18n/it.po +++ b/base_view_inheritance_extension/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Paolo Valier , 2018 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2018-01-06 02:25+0000\n" "Last-Translator: Paolo Valier , 2018\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension diff --git a/base_view_inheritance_extension/i18n/sl.po b/base_view_inheritance_extension/i18n/sl.po index 1071aca9d..864f77e7a 100644 --- a/base_view_inheritance_extension/i18n/sl.po +++ b/base_view_inheritance_extension/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Matjaž Mozetič , 2016 msgid "" @@ -12,23 +12,27 @@ msgstr "" "PO-Revision-Date: 2016-12-29 03:39+0000\n" "Last-Translator: Matjaž Mozetič , 2016\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "A new page" -msgstr "Nova stran" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form msgid "Partner form" msgstr "Partnerjev obrazec" +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" + #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "ir.ui.view" msgstr "" + +#~ msgid "A new page" +#~ msgstr "Nova stran" diff --git a/base_view_inheritance_extension/i18n/tr.po b/base_view_inheritance_extension/i18n/tr.po index 77e748e28..45654394e 100644 --- a/base_view_inheritance_extension/i18n/tr.po +++ b/base_view_inheritance_extension/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_view_inheritance_extension -# +# # Translators: # Ahmet Altinisik , 2016 msgid "" @@ -12,23 +12,26 @@ msgstr "" "PO-Revision-Date: 2016-12-29 03:39+0000\n" "Last-Translator: Ahmet Altinisik , 2016\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form -msgid "A new page" -msgstr "Yeni bir sayfa" - -#. module: base_view_inheritance_extension -#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_form +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form msgid "Partner form" msgstr "İş ortağı formu" +#. module: base_view_inheritance_extension +#: model:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form +msgid "Phone numbers" +msgstr "" + #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "ir.ui.view" msgstr "ir.ui.view" + +#~ msgid "A new page" +#~ msgstr "Yeni bir sayfa" From 2ddfa364e5eca1d23df88010eb1595eb2181a386 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Fri, 26 Oct 2018 13:54:14 +0200 Subject: [PATCH 09/12] [MIG] base_view_inheritance_extension: Migration to 11.0 --- base_view_inheritance_extension/README.rst | 84 ++-- base_view_inheritance_extension/__init__.py | 2 - .../__manifest__.py | 6 +- .../models/__init__.py | 2 - .../models/ir_ui_view.py | 11 +- .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 2 + .../readme/ROADMAP.rst | 3 + .../readme/USAGE.rst | 36 ++ .../static/description/index.html | 461 ++++++++++++++++++ .../tests/__init__.py | 2 - .../test_base_view_inheritance_extension.py | 3 +- 12 files changed, 564 insertions(+), 51 deletions(-) create mode 100644 base_view_inheritance_extension/readme/CONTRIBUTORS.rst create mode 100644 base_view_inheritance_extension/readme/DESCRIPTION.rst create mode 100644 base_view_inheritance_extension/readme/ROADMAP.rst create mode 100644 base_view_inheritance_extension/readme/USAGE.rst create mode 100644 base_view_inheritance_extension/static/description/index.html diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index d97a5b97d..8844edc2e 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -1,23 +1,43 @@ -.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html - :alt: License: LGPL-3 - ========================= Extended view inheritance ========================= +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github + :target: https://github.com/OCA/server-tools/tree/11.0/base_view_inheritance_extension + :alt: OCA/server-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-tools-11-0/server-tools-11-0-base_view_inheritance_extension + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/149/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module was written to make it simple to add custom operators for view inheritance. +**Table of contents** + +.. contents:: + :local: + Usage ===== -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/10.0 +**Change a python dictionary (context for example)** -Change a python dictionary (context for example) ------------------------------------------------- .. code-block:: xml @@ -28,8 +48,7 @@ Change a python dictionary (context for example) Note that views are subject to evaluation of xmlids anyways, so if you need to refer to some xmlid, say ``%(xmlid)s``. -Move an element in the view ---------------------------- +**Move an element in the view** .. code-block:: xml @@ -38,8 +57,7 @@ Move an element in the view This can also be used to wrap some element into another, create the target element first, then move the node youwant to wrap there. -Add to values in a list (states for example) --------------------------------------------- +**Add to values in a list (states for example)** .. code-block:: xml @@ -47,8 +65,7 @@ Add to values in a list (states for example) $new_value(s) -Remove values from a list (states for example) ----------------------------------------------- +**Remove values from a list (states for example)** .. code-block:: xml @@ -66,44 +83,41 @@ Known issues / Roadmap Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: - `Icon `_. +* Therp BV Contributors ------------- +~~~~~~~~~~~~ * Holger Brunn * Ronald Portier +* Sergio Teruel -Do not contact contributors directly about help with questions or problems -concerning this addon, but use the -`community mailing list `_ or the -`appropriate specialized mailinglist `_ -for help, and the bug tracker linked in `Bug Tracker`_ above for -technical issues. +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/server-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_view_inheritance_extension/__init__.py b/base_view_inheritance_extension/__init__.py index 4431c72c4..92325983c 100644 --- a/base_view_inheritance_extension/__init__.py +++ b/base_view_inheritance_extension/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import models diff --git a/base_view_inheritance_extension/__manifest__.py b/base_view_inheritance_extension/__manifest__.py index 79b3cc94c..27a24017e 100644 --- a/base_view_inheritance_extension/__manifest__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -1,9 +1,9 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV +# Copyright 2016 Therp BV +# Copyright 2018 Tecnativa - Sergio Teruel # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "10.0.1.0.1", + "version": "11.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", diff --git a/base_view_inheritance_extension/models/__init__.py b/base_view_inheritance_extension/models/__init__.py index 588d249e2..352589cd2 100644 --- a/base_view_inheritance_extension/models/__init__.py +++ b/base_view_inheritance_extension/models/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import ir_ui_view diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index 7f3823371..c95631625 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -1,5 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV +# Copyright 2016 Therp BV +# Copyright 2018 Tecnativa - Sergio Teruel # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree from odoo import api, models, tools @@ -20,14 +20,14 @@ class UnquoteObject(str): ','.join( [ UnquoteObject( - a if not isinstance(a, basestring) + a if not isinstance(a, str) else "'%s'" % a ) for a in args ] + [ '%s=%s' % (UnquoteObject(k), v) - for (k, v) in kwargs.iteritems() + for (k, v) in kwargs.items() ] ) ) @@ -162,5 +162,6 @@ class IrUiView(models.Model): old_values = (node.get(attribute_name) or '').split(',') remove_values = attribute_node.text.split(',') new_values = [x for x in old_values if x not in remove_values] - node.attrib[attribute_name] = ','.join(filter(None, new_values)) + node.attrib[attribute_name] = ','.join( + [_f for _f in new_values if _f]) return source diff --git a/base_view_inheritance_extension/readme/CONTRIBUTORS.rst b/base_view_inheritance_extension/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..41d2a472c --- /dev/null +++ b/base_view_inheritance_extension/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Holger Brunn +* Ronald Portier +* Sergio Teruel diff --git a/base_view_inheritance_extension/readme/DESCRIPTION.rst b/base_view_inheritance_extension/readme/DESCRIPTION.rst new file mode 100644 index 000000000..0536b6f26 --- /dev/null +++ b/base_view_inheritance_extension/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module was written to make it simple to add custom operators for view +inheritance. diff --git a/base_view_inheritance_extension/readme/ROADMAP.rst b/base_view_inheritance_extension/readme/ROADMAP.rst new file mode 100644 index 000000000..ade040dce --- /dev/null +++ b/base_view_inheritance_extension/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +* add ``$value`` +* support ```` +* support an ``eval`` attribute for our new node types diff --git a/base_view_inheritance_extension/readme/USAGE.rst b/base_view_inheritance_extension/readme/USAGE.rst new file mode 100644 index 000000000..65199fd1e --- /dev/null +++ b/base_view_inheritance_extension/readme/USAGE.rst @@ -0,0 +1,36 @@ +**Change a python dictionary (context for example)** + + +.. code-block:: xml + + + $new_value + + +Note that views are subject to evaluation of xmlids anyways, so if you need +to refer to some xmlid, say ``%(xmlid)s``. + +**Move an element in the view** + +.. code-block:: xml + + + +This can also be used to wrap some element into another, create the target +element first, then move the node youwant to wrap there. + +**Add to values in a list (states for example)** + +.. code-block:: xml + + + $new_value(s) + + +**Remove values from a list (states for example)** + +.. code-block:: xml + + + $remove_value(s) + diff --git a/base_view_inheritance_extension/static/description/index.html b/base_view_inheritance_extension/static/description/index.html new file mode 100644 index 000000000..3d2599b76 --- /dev/null +++ b/base_view_inheritance_extension/static/description/index.html @@ -0,0 +1,461 @@ + + + + + + +Extended view inheritance + + + +
+

Extended view inheritance

+ + +

Beta License: LGPL-3 OCA/server-tools Translate me on Weblate Try me on Runbot

+

This module was written to make it simple to add custom operators for view +inheritance.

+

Table of contents

+ +
+

Usage

+

Change a python dictionary (context for example)

+
+<attribute name="$attribute" operation="python_dict" key="$key">
+    $new_value
+</attribute>
+
+

Note that views are subject to evaluation of xmlids anyways, so if you need +to refer to some xmlid, say %(xmlid)s.

+

Move an element in the view

+
+<xpath expr="$xpath" position="move" target="$targetxpath" />
+
+

This can also be used to wrap some element into another, create the target +element first, then move the node youwant to wrap there.

+

Add to values in a list (states for example)

+
+<attribute name="$attribute" operation="list_add">
+    $new_value(s)
+</attribute>
+
+

Remove values from a list (states for example)

+
+<attribute name="$attribute" operation="list_remove">
+    $remove_value(s)
+</attribute>
+
+
+
+

Known issues / Roadmap

+
    +
  • add <attribute operation="json_dict" key="$key">$value</attribute>
    • +
  • support <xpath expr="$xpath" position="move" target="xpath" target_position="position" />
    • +
  • support an eval attribute for our new node types
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Therp BV
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/server-tools project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/base_view_inheritance_extension/tests/__init__.py b/base_view_inheritance_extension/tests/__init__.py index f76aba46a..e19c813a8 100644 --- a/base_view_inheritance_extension/tests/__init__.py +++ b/base_view_inheritance_extension/tests/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import test_base_view_inheritance_extension diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index caeb8a359..212a20b5e 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2016 Therp BV +# Copyright 2016 Therp BV # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from lxml import etree from odoo.tests.common import TransactionCase From 0282b3817251675d3a289c43d39279b70b50abc4 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 17 Jan 2019 13:42:33 +0000 Subject: [PATCH 10/12] [UPD] Update base_view_inheritance_extension.pot --- .../i18n/base_view_inheritance_extension.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot index 6a43a709f..c1b5a480d 100644 --- a/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot +++ b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" From 61a83bb372dc83d6344993034ad0ee6123846d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Thu, 14 Mar 2019 18:10:16 -0300 Subject: [PATCH 11/12] [MIG] base_view_inheritance_extension: Migration to 12.0 --- base_view_inheritance_extension/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_view_inheritance_extension/__manifest__.py b/base_view_inheritance_extension/__manifest__.py index 27a24017e..baa593cd7 100644 --- a/base_view_inheritance_extension/__manifest__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Hidden/Dependency", From 0268eb262dbe789a5087b7162269a920d2a5ba50 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 3 Mar 2020 15:21:37 +0100 Subject: [PATCH 12/12] Remove the "move" feature which is now native Use https in URL to licence --- base_view_inheritance_extension/__init__.py | 1 - base_view_inheritance_extension/__manifest__.py | 2 +- .../demo/ir_ui_view.xml | 2 -- .../models/__init__.py | 1 - .../models/ir_ui_view.py | 15 +-------------- base_view_inheritance_extension/readme/USAGE.rst | 15 ++++++--------- base_view_inheritance_extension/tests/__init__.py | 1 - .../tests/test_base_view_inheritance_extension.py | 7 +------ 8 files changed, 9 insertions(+), 35 deletions(-) diff --git a/base_view_inheritance_extension/__init__.py b/base_view_inheritance_extension/__init__.py index 92325983c..0650744f6 100644 --- a/base_view_inheritance_extension/__init__.py +++ b/base_view_inheritance_extension/__init__.py @@ -1,2 +1 @@ -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import models diff --git a/base_view_inheritance_extension/__manifest__.py b/base_view_inheritance_extension/__manifest__.py index baa593cd7..e178e5725 100644 --- a/base_view_inheritance_extension/__manifest__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -1,6 +1,6 @@ # Copyright 2016 Therp BV # Copyright 2018 Tecnativa - Sergio Teruel -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Extended view inheritance", "version": "12.0.1.0.0", diff --git a/base_view_inheritance_extension/demo/ir_ui_view.xml b/base_view_inheritance_extension/demo/ir_ui_view.xml index 043960209..fb357c955 100644 --- a/base_view_inheritance_extension/demo/ir_ui_view.xml +++ b/base_view_inheritance_extension/demo/ir_ui_view.xml @@ -20,8 +20,6 @@
- - diff --git a/base_view_inheritance_extension/models/__init__.py b/base_view_inheritance_extension/models/__init__.py index 352589cd2..81f52e3bf 100644 --- a/base_view_inheritance_extension/models/__init__.py +++ b/base_view_inheritance_extension/models/__init__.py @@ -1,2 +1 @@ -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import ir_ui_view diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index c95631625..d7386d706 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -1,6 +1,6 @@ # Copyright 2016 Therp BV # Copyright 2018 Tecnativa - Sergio Teruel -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from lxml import etree from odoo import api, models, tools from odoo.tools.safe_eval import safe_eval @@ -115,19 +115,6 @@ class IrUiView(models.Model): node.attrib[attribute_node.get('name')] = str(python_dict) return source - @api.model - def inheritance_handler_xpath(self, source, specs, inherit_id): - if not specs.get('position') == 'move': - return super(IrUiView, self).apply_inheritance_specs( - source, specs, inherit_id - ) - node = self.locate_node(source, specs) - target_node = self.locate_node( - source, etree.Element(specs.tag, expr=specs.get('target')) - ) - target_node.append(node) - return source - @api.model def inheritance_handler_attributes_list_add( self, source, specs, inherit_id diff --git a/base_view_inheritance_extension/readme/USAGE.rst b/base_view_inheritance_extension/readme/USAGE.rst index 65199fd1e..2af06adaa 100644 --- a/base_view_inheritance_extension/readme/USAGE.rst +++ b/base_view_inheritance_extension/readme/USAGE.rst @@ -10,15 +10,6 @@ Note that views are subject to evaluation of xmlids anyways, so if you need to refer to some xmlid, say ``%(xmlid)s``. -**Move an element in the view** - -.. code-block:: xml - - - -This can also be used to wrap some element into another, create the target -element first, then move the node youwant to wrap there. - **Add to values in a list (states for example)** .. code-block:: xml @@ -34,3 +25,9 @@ element first, then move the node youwant to wrap there. $remove_value(s) + +**Move an element in the view** + +This feature is now native, cf the `official Odoo documentation `_. + + diff --git a/base_view_inheritance_extension/tests/__init__.py b/base_view_inheritance_extension/tests/__init__.py index e19c813a8..261fddfad 100644 --- a/base_view_inheritance_extension/tests/__init__.py +++ b/base_view_inheritance_extension/tests/__init__.py @@ -1,2 +1 @@ -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from . import test_base_view_inheritance_extension diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index 212a20b5e..ae30978ad 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -1,5 +1,5 @@ # Copyright 2016 Therp BV -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from lxml import etree from odoo.tests.common import TransactionCase @@ -23,11 +23,6 @@ class TestBaseViewInheritanceExtension(TransactionCase): "context.get('company_id', context.get('company'))" in view.xpath('//field[@name="parent_id"]')[0].get('context') ) - # verify we moved the child_ids field - self.assertEqual( - view.xpath('//field[@name="mobile"]')[0].getparent(), - view.xpath('//page[@name="phone_book"]')[0] - ) def test_list_add(self): view_model = self.env['ir.ui.view']