From 6ceca45bef0a5676b62eb10e2343a9eaf319d437 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Fri, 13 Mar 2020 11:17:34 +0100 Subject: [PATCH 01/10] [ADD]contract_operating_unit v12 --- contract_operating_unit/README.rst | 82 ++++ contract_operating_unit/__init__.py | 4 + contract_operating_unit/__manifest__.py | 14 + contract_operating_unit/models/__init__.py | 1 + contract_operating_unit/models/contract.py | 17 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 5 + contract_operating_unit/readme/USAGE.rst | 1 + .../security/contract_security.xml | 16 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 428 ++++++++++++++++++ contract_operating_unit/tests/__init__.py | 1 + .../tests/test_contract_operating_unit.py | 99 ++++ .../views/contract_view.xml | 54 +++ 14 files changed, 723 insertions(+) create mode 100644 contract_operating_unit/README.rst create mode 100644 contract_operating_unit/__init__.py create mode 100644 contract_operating_unit/__manifest__.py create mode 100644 contract_operating_unit/models/__init__.py create mode 100644 contract_operating_unit/models/contract.py create mode 100644 contract_operating_unit/readme/CONTRIBUTORS.rst create mode 100644 contract_operating_unit/readme/DESCRIPTION.rst create mode 100644 contract_operating_unit/readme/USAGE.rst create mode 100644 contract_operating_unit/security/contract_security.xml create mode 100644 contract_operating_unit/static/description/icon.png create mode 100644 contract_operating_unit/static/description/index.html create mode 100644 contract_operating_unit/tests/__init__.py create mode 100644 contract_operating_unit/tests/test_contract_operating_unit.py create mode 100644 contract_operating_unit/views/contract_view.xml diff --git a/contract_operating_unit/README.rst b/contract_operating_unit/README.rst new file mode 100644 index 0000000000..f6b854842c --- /dev/null +++ b/contract_operating_unit/README.rst @@ -0,0 +1,82 @@ +======================= +Contract Operating Unit +======================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Foperating--unit-lightgray.png?logo=github + :target: https://github.com/OCA/operating-unit/tree/12.0/contract_operating_unit + :alt: OCA/operating-unit +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/operating-unit-12-0/operating-unit-12-0-contract_operating_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/213/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module introduces the following features: + +* Adds the Operating Unit (OU) to Contracts. + +* Security rules are defined to ensure that users can only see the Contracts of that Operating Units in which they are allowed access to. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Assign contracts to specific operating units within the company + +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 +~~~~~~~ + +* ForgeFlow S.L. + +Contributors +~~~~~~~~~~~~ + +* Aaron Henriquez + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/operating-unit `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_operating_unit/__init__.py b/contract_operating_unit/__init__.py new file mode 100644 index 0000000000..8ef8585861 --- /dev/null +++ b/contract_operating_unit/__init__.py @@ -0,0 +1,4 @@ +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import models +from . import tests diff --git a/contract_operating_unit/__manifest__.py b/contract_operating_unit/__manifest__.py new file mode 100644 index 0000000000..2d5ec8f3c6 --- /dev/null +++ b/contract_operating_unit/__manifest__.py @@ -0,0 +1,14 @@ +# Copyright 2020 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Contract Operating Unit", + "version": "12.0.1.0.0", + "license": "LGPL-3", + "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/operating-unit", + "category": "Invoicing", + "depends": ["contract", "operating_unit"], + "data": ["views/contract_view.xml", "security/contract_security.xml"], + "installable": True, +} diff --git a/contract_operating_unit/models/__init__.py b/contract_operating_unit/models/__init__.py new file mode 100644 index 0000000000..99a5468ac8 --- /dev/null +++ b/contract_operating_unit/models/__init__.py @@ -0,0 +1 @@ +from . import contract diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py new file mode 100644 index 0000000000..704c04cbb2 --- /dev/null +++ b/contract_operating_unit/models/contract.py @@ -0,0 +1,17 @@ +# Copyright 2020 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import fields, models + + +class Contract(models.Model): + + _inherit = "contract.contract" + + operating_unit_id = fields.Many2one( + "operating.unit", + "Operating Unit", + default=lambda self: self.env["res.users"].operating_unit_default_get( + self._uid + ), + ) diff --git a/contract_operating_unit/readme/CONTRIBUTORS.rst b/contract_operating_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..2e524967e3 --- /dev/null +++ b/contract_operating_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Aaron Henriquez diff --git a/contract_operating_unit/readme/DESCRIPTION.rst b/contract_operating_unit/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..79e7fde55f --- /dev/null +++ b/contract_operating_unit/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +This module introduces the following features: + +* Adds the Operating Unit (OU) to Contracts. + +* Security rules are defined to ensure that users can only see the Contracts of that Operating Units in which they are allowed access to. diff --git a/contract_operating_unit/readme/USAGE.rst b/contract_operating_unit/readme/USAGE.rst new file mode 100644 index 0000000000..f4c95c254e --- /dev/null +++ b/contract_operating_unit/readme/USAGE.rst @@ -0,0 +1 @@ +Assign contracts to specific operating units within the company diff --git a/contract_operating_unit/security/contract_security.xml b/contract_operating_unit/security/contract_security.xml new file mode 100644 index 0000000000..28ebb23eb1 --- /dev/null +++ b/contract_operating_unit/security/contract_security.xml @@ -0,0 +1,16 @@ + + + + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + Contracts from allowed operating units + + + + + + + + diff --git a/contract_operating_unit/static/description/icon.png b/contract_operating_unit/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/contract_operating_unit/static/description/index.html b/contract_operating_unit/static/description/index.html new file mode 100644 index 0000000000..35160568c2 --- /dev/null +++ b/contract_operating_unit/static/description/index.html @@ -0,0 +1,428 @@ + + + + + + +Contract Operating Unit + + + +
+

Contract Operating Unit

+ + +

Beta License: LGPL-3 OCA/operating-unit Translate me on Weblate Try me on Runbot

+

This module introduces the following features:

+
    +
  • Adds the Operating Unit (OU) to Contracts.
    • +
  • Security rules are defined to ensure that users can only see the Contracts of that Operating Units in which they are allowed access to.
    • +
+

Table of contents

+ +
+

Usage

+

Assign contracts to specific operating units within the company

+
+
+

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

+
    +
  • ForgeFlow S.L.
    • +
+
+
+

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/operating-unit project on GitHub.

+

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

+
+
+
+ + diff --git a/contract_operating_unit/tests/__init__.py b/contract_operating_unit/tests/__init__.py new file mode 100644 index 0000000000..fdd2b1a354 --- /dev/null +++ b/contract_operating_unit/tests/__init__.py @@ -0,0 +1 @@ +from . import test_contract_operating_unit diff --git a/contract_operating_unit/tests/test_contract_operating_unit.py b/contract_operating_unit/tests/test_contract_operating_unit.py new file mode 100644 index 0000000000..ac4537dd87 --- /dev/null +++ b/contract_operating_unit/tests/test_contract_operating_unit.py @@ -0,0 +1,99 @@ +# Copyright 2020 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo.tests import common + + +class TestContractOperatingUnit(common.TransactionCase): + def setUp(self): + super(TestContractOperatingUnit, self).setUp() + + self.res_users_model = self.env["res.users"] + self.contract_model = self.env["contract.contract"] + + self.company = self.env.ref("base.main_company") + self.grp_contract_manager = self.env.ref( + "account.group_account_manager" + ) + self.group_user = self.env.ref("base.group_user") + + # Main Operating Unit + self.ou1 = self.env.ref("operating_unit.main_operating_unit") + # B2C Operating Unit + self.b2c = self.env.ref("operating_unit.b2c_operating_unit") + + # Create Users + self.user1 = self._create_user( + "User_1", + [self.grp_contract_manager, self.group_user], + self.company, + [self.ou1, self.b2c], + ) + self.user2 = self._create_user( + "User_2", + [self.grp_contract_manager, self.group_user], + self.company, + [self.b2c], + ) + + self.partner = self.env["res.partner"].create( + {"name": "Test contract partner", } + ) + + self.contract1 = ( + self.env["contract.contract"] + .sudo(self.user1) + .create( + { + "name": "Maintenance of Servers", + "partner_id": self.partner.id, + "operating_unit_id": self.ou1.id, + } + ) + ) + self.contract2 = ( + self.env["contract.contract"] + .sudo(self.user2) + .create( + { + "name": "Maintenance of Servers", + "partner_id": self.partner.id, + "operating_unit_id": self.b2c.id, + } + ) + ) + + def _create_user( + self, login, groups, company, operating_units, context=None + ): + """Creates a user.""" + group_ids = [group.id for group in groups] + user = self.res_users_model.create( + { + "name": "Test Contract User", + "login": login, + "password": "demo", + "email": "example@yourcompany.com", + "company_id": company.id, + "company_ids": [(4, company.id)], + "operating_unit_ids": [(4, ou.id) for ou in operating_units], + "groups_id": [(6, 0, group_ids)], + } + ) + return user + + def test_contract_ou(self): + """Test Hr Contract Operating Unit""" + # User 2 is only assigned to Operating Unit B2C, and cannot + # Access Contract records of Main Operating Unit. + record = self.contract_model.sudo(self.user2.id).search( + [ + ("id", "=", self.contract1.id), + ("operating_unit_id", "=", self.ou1.id), + ] + ) + self.assertEqual( + record.ids, + [], + "User 2 should not have access to " "OU %s" % self.ou1.name, + ) diff --git a/contract_operating_unit/views/contract_view.xml b/contract_operating_unit/views/contract_view.xml new file mode 100644 index 0000000000..cc84141c5a --- /dev/null +++ b/contract_operating_unit/views/contract_view.xml @@ -0,0 +1,54 @@ + + + + + + contract.contract form view (in contract_payment_mode) + contract.contract + + + + + + + + + + + contract.contract tree view (in contract_payment_mode) + contract.contract + + + + + + + + + + + contract.contract search view (in contract_payment_mode) + contract.contract + + + + + + + + + + + + contract.contract supplier form view (in contract_payment_mode) + contract.contract + 18 + + + + + + + + + From bd85ee3ebca51cfe08db261b9cf283b89522a3fe Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 12:46:49 +0200 Subject: [PATCH 02/10] [IMP]create invoice with the proper operating_unit in contracts --- contract_operating_unit/models/contract.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index 704c04cbb2..1a5f4a3f2c 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -4,7 +4,7 @@ from odoo import fields, models -class Contract(models.Model): +class ContractContract(models.Model): _inherit = "contract.contract" @@ -15,3 +15,10 @@ class Contract(models.Model): self._uid ), ) + + @api.multi + def _prepare_invoice(self, date_invoice, journal=None): + invoice_vals = super()._prepare_invoice(date_invoice, journal) + if self.operating_unit_id: + invoice_vals['operating_unit_id'] = self.operating_unit_id + return invoice_vals From 99a45041f3f3a9e1f7ef01954c8fb8f95ab2ab5d Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 12:47:26 +0200 Subject: [PATCH 03/10] [UPT]contracts depends on account --- contract_operating_unit/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contract_operating_unit/__manifest__.py b/contract_operating_unit/__manifest__.py index 2d5ec8f3c6..aa93ca34f6 100644 --- a/contract_operating_unit/__manifest__.py +++ b/contract_operating_unit/__manifest__.py @@ -8,7 +8,7 @@ "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/operating-unit", "category": "Invoicing", - "depends": ["contract", "operating_unit"], + "depends": ["contract", "account_operating_unit"], "data": ["views/contract_view.xml", "security/contract_security.xml"], "installable": True, } From bd0549606fd943098931d3e041a1c7253bd6917a Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 13:12:27 +0200 Subject: [PATCH 04/10] [REV]contract depends on account --- contract_operating_unit/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contract_operating_unit/__manifest__.py b/contract_operating_unit/__manifest__.py index aa93ca34f6..2d5ec8f3c6 100644 --- a/contract_operating_unit/__manifest__.py +++ b/contract_operating_unit/__manifest__.py @@ -8,7 +8,7 @@ "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/operating-unit", "category": "Invoicing", - "depends": ["contract", "account_operating_unit"], + "depends": ["contract", "operating_unit"], "data": ["views/contract_view.xml", "security/contract_security.xml"], "installable": True, } From d0c249a4e94f75a63c9ac77a2b9d9cbe3856f829 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 13:19:33 +0200 Subject: [PATCH 05/10] [FIX]api import --- contract_operating_unit/models/contract.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index 1a5f4a3f2c..a1fdab8c72 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -1,7 +1,7 @@ # Copyright 2020 ForgeFlow S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo import fields, models +from odoo import api, fields, models class ContractContract(models.Model): From 3c5ff166c3faceabc6affbc52a3780771ec1ffc2 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 15:41:13 +0200 Subject: [PATCH 06/10] [FIX]ou in invoice from contracts --- contract_operating_unit/models/contract.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index a1fdab8c72..915078abec 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -20,5 +20,4 @@ class ContractContract(models.Model): def _prepare_invoice(self, date_invoice, journal=None): invoice_vals = super()._prepare_invoice(date_invoice, journal) if self.operating_unit_id: - invoice_vals['operating_unit_id'] = self.operating_unit_id - return invoice_vals + invoice_vals['operating_unit_id'] = self.operating_unit_id.id From 5b5dcb46ddeea2cdb2577d6f3d3bb4e8fd9f8626 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Thu, 2 Apr 2020 16:05:53 +0200 Subject: [PATCH 07/10] [FIX]restored line eliminated by mistake --- contract_operating_unit/models/contract.py | 1 + 1 file changed, 1 insertion(+) diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index 915078abec..29cad58fd0 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -21,3 +21,4 @@ def _prepare_invoice(self, date_invoice, journal=None): invoice_vals = super()._prepare_invoice(date_invoice, journal) if self.operating_unit_id: invoice_vals['operating_unit_id'] = self.operating_unit_id.id + return invoice_vals From 34ab8175852cd3dfdb5e42341103a309ad501393 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Fri, 28 May 2021 10:38:51 +0700 Subject: [PATCH 08/10] [IMP] contract_operating_unit: black, isort, prettier --- contract_operating_unit/models/contract.py | 2 +- .../security/contract_security.xml | 21 +++++----- .../tests/test_contract_operating_unit.py | 12 +++--- .../views/contract_view.xml | 40 ++++++++++++++----- .../odoo/addons/contract_operating_unit | 1 + setup/contract_operating_unit/setup.py | 6 +++ 6 files changed, 54 insertions(+), 28 deletions(-) create mode 120000 setup/contract_operating_unit/odoo/addons/contract_operating_unit create mode 100644 setup/contract_operating_unit/setup.py diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index 29cad58fd0..21b0cc99a3 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -20,5 +20,5 @@ class ContractContract(models.Model): def _prepare_invoice(self, date_invoice, journal=None): invoice_vals = super()._prepare_invoice(date_invoice, journal) if self.operating_unit_id: - invoice_vals['operating_unit_id'] = self.operating_unit_id.id + invoice_vals["operating_unit_id"] = self.operating_unit_id.id return invoice_vals diff --git a/contract_operating_unit/security/contract_security.xml b/contract_operating_unit/security/contract_security.xml index 28ebb23eb1..69858dcec6 100644 --- a/contract_operating_unit/security/contract_security.xml +++ b/contract_operating_unit/security/contract_security.xml @@ -1,16 +1,17 @@ - + - - - ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] Contracts from allowed operating units - - - - - + + + + + diff --git a/contract_operating_unit/tests/test_contract_operating_unit.py b/contract_operating_unit/tests/test_contract_operating_unit.py index ac4537dd87..50f66ac002 100644 --- a/contract_operating_unit/tests/test_contract_operating_unit.py +++ b/contract_operating_unit/tests/test_contract_operating_unit.py @@ -12,9 +12,7 @@ def setUp(self): self.contract_model = self.env["contract.contract"] self.company = self.env.ref("base.main_company") - self.grp_contract_manager = self.env.ref( - "account.group_account_manager" - ) + self.grp_contract_manager = self.env.ref("account.group_account_manager") self.group_user = self.env.ref("base.group_user") # Main Operating Unit @@ -37,7 +35,9 @@ def setUp(self): ) self.partner = self.env["res.partner"].create( - {"name": "Test contract partner", } + { + "name": "Test contract partner", + } ) self.contract1 = ( @@ -63,9 +63,7 @@ def setUp(self): ) ) - def _create_user( - self, login, groups, company, operating_units, context=None - ): + def _create_user(self, login, groups, company, operating_units, context=None): """Creates a user.""" group_ids = [group.id for group in groups] user = self.res_users_model.create( diff --git a/contract_operating_unit/views/contract_view.xml b/contract_operating_unit/views/contract_view.xml index cc84141c5a..35e3d1f25b 100644 --- a/contract_operating_unit/views/contract_view.xml +++ b/contract_operating_unit/views/contract_view.xml @@ -1,38 +1,53 @@ - + - contract.contract form view (in contract_payment_mode) + contract.contract form view (in contract_payment_mode) contract.contract - + - contract.contract tree view (in contract_payment_mode) + contract.contract tree view (in contract_payment_mode) contract.contract - + - contract.contract search view (in contract_payment_mode) + contract.contract search view (in contract_payment_mode) contract.contract - + @@ -40,13 +55,18 @@ - contract.contract supplier form view (in contract_payment_mode) + contract.contract supplier form view (in contract_payment_mode) contract.contract 18 - + - + diff --git a/setup/contract_operating_unit/odoo/addons/contract_operating_unit b/setup/contract_operating_unit/odoo/addons/contract_operating_unit new file mode 120000 index 0000000000..3ce69de57a --- /dev/null +++ b/setup/contract_operating_unit/odoo/addons/contract_operating_unit @@ -0,0 +1 @@ +../../../../contract_operating_unit \ No newline at end of file diff --git a/setup/contract_operating_unit/setup.py b/setup/contract_operating_unit/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/contract_operating_unit/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 05a0578388eedbb20c2dde3e9ee9e777450a0afa Mon Sep 17 00:00:00 2001 From: Kitti U Date: Fri, 28 May 2021 10:40:22 +0700 Subject: [PATCH 09/10] [14.0][MIG] contract_operating_unit --- contract_operating_unit/__manifest__.py | 6 +- contract_operating_unit/models/contract.py | 9 +- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 428 ------------------ .../tests/test_contract_operating_unit.py | 6 +- .../views/contract_view.xml | 10 +- 6 files changed, 17 insertions(+), 443 deletions(-) delete mode 100644 contract_operating_unit/static/description/index.html diff --git a/contract_operating_unit/__manifest__.py b/contract_operating_unit/__manifest__.py index 2d5ec8f3c6..30dc4eead5 100644 --- a/contract_operating_unit/__manifest__.py +++ b/contract_operating_unit/__manifest__.py @@ -3,12 +3,12 @@ { "name": "Contract Operating Unit", - "version": "12.0.1.0.0", + "version": "14.0.1.0.0", "license": "LGPL-3", - "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)", + "author": "ForgeFlow S.L., Odoo Community Association (OCA)", "website": "https://github.com/OCA/operating-unit", "category": "Invoicing", - "depends": ["contract", "operating_unit"], + "depends": ["contract", "account_operating_unit"], "data": ["views/contract_view.xml", "security/contract_security.xml"], "installable": True, } diff --git a/contract_operating_unit/models/contract.py b/contract_operating_unit/models/contract.py index 21b0cc99a3..b449dd96b4 100644 --- a/contract_operating_unit/models/contract.py +++ b/contract_operating_unit/models/contract.py @@ -1,7 +1,7 @@ # Copyright 2020 ForgeFlow S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo import api, fields, models +from odoo import fields, models class ContractContract(models.Model): @@ -16,9 +16,10 @@ class ContractContract(models.Model): ), ) - @api.multi def _prepare_invoice(self, date_invoice, journal=None): - invoice_vals = super()._prepare_invoice(date_invoice, journal) + (invoice_vals, move_form) = super()._prepare_invoice( + date_invoice, journal=journal + ) if self.operating_unit_id: invoice_vals["operating_unit_id"] = self.operating_unit_id.id - return invoice_vals + return (invoice_vals, move_form) diff --git a/contract_operating_unit/readme/CONTRIBUTORS.rst b/contract_operating_unit/readme/CONTRIBUTORS.rst index 2e524967e3..5322d59520 100644 --- a/contract_operating_unit/readme/CONTRIBUTORS.rst +++ b/contract_operating_unit/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Aaron Henriquez +* Kitti U. diff --git a/contract_operating_unit/static/description/index.html b/contract_operating_unit/static/description/index.html deleted file mode 100644 index 35160568c2..0000000000 --- a/contract_operating_unit/static/description/index.html +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - -Contract Operating Unit - - - -
-

Contract Operating Unit

- - -

Beta License: LGPL-3 OCA/operating-unit Translate me on Weblate Try me on Runbot

-

This module introduces the following features:

-
    -
  • Adds the Operating Unit (OU) to Contracts.
    • -
  • Security rules are defined to ensure that users can only see the Contracts of that Operating Units in which they are allowed access to.
    • -
-

Table of contents

- -
-

Usage

-

Assign contracts to specific operating units within the company

-
-
-

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

-
    -
  • ForgeFlow S.L.
    • -
-
-
-

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/operating-unit project on GitHub.

-

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

-
-
-
- - diff --git a/contract_operating_unit/tests/test_contract_operating_unit.py b/contract_operating_unit/tests/test_contract_operating_unit.py index 50f66ac002..40df57878e 100644 --- a/contract_operating_unit/tests/test_contract_operating_unit.py +++ b/contract_operating_unit/tests/test_contract_operating_unit.py @@ -42,7 +42,7 @@ def setUp(self): self.contract1 = ( self.env["contract.contract"] - .sudo(self.user1) + .with_user(self.user1.id) .create( { "name": "Maintenance of Servers", @@ -53,7 +53,7 @@ def setUp(self): ) self.contract2 = ( self.env["contract.contract"] - .sudo(self.user2) + .with_user(self.user2.id) .create( { "name": "Maintenance of Servers", @@ -84,7 +84,7 @@ def test_contract_ou(self): """Test Hr Contract Operating Unit""" # User 2 is only assigned to Operating Unit B2C, and cannot # Access Contract records of Main Operating Unit. - record = self.contract_model.sudo(self.user2.id).search( + record = self.contract_model.with_user(self.user2.id).search( [ ("id", "=", self.contract1.id), ("operating_unit_id", "=", self.ou1.id), diff --git a/contract_operating_unit/views/contract_view.xml b/contract_operating_unit/views/contract_view.xml index 35e3d1f25b..1899b0ddc5 100644 --- a/contract_operating_unit/views/contract_view.xml +++ b/contract_operating_unit/views/contract_view.xml @@ -2,12 +2,12 @@ - + contract.contract form view (in contract_payment_mode) contract.contract - + contract.contract supplier form view (in contract_payment_mode) contract.contract - 18 + 18 - - + From ef9f85780490372a0456df6cfbf33b29aee53b3d Mon Sep 17 00:00:00 2001 From: AaronHForgeFlow Date: Thu, 17 Jun 2021 15:16:49 +0200 Subject: [PATCH 10/10] [FIX]contract_operating_unit: test description --- contract_operating_unit/tests/test_contract_operating_unit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contract_operating_unit/tests/test_contract_operating_unit.py b/contract_operating_unit/tests/test_contract_operating_unit.py index 40df57878e..0673057eda 100644 --- a/contract_operating_unit/tests/test_contract_operating_unit.py +++ b/contract_operating_unit/tests/test_contract_operating_unit.py @@ -81,7 +81,7 @@ def _create_user(self, login, groups, company, operating_units, context=None): return user def test_contract_ou(self): - """Test Hr Contract Operating Unit""" + """Test Contract Operating Unit""" # User 2 is only assigned to Operating Unit B2C, and cannot # Access Contract records of Main Operating Unit. record = self.contract_model.with_user(self.user2.id).search(