From 9b7e970f9ccc4c62d7b17e081aae069abbe16f7e Mon Sep 17 00:00:00 2001
From: Marc Durepos <marc@bemade.org>
Date: Fri, 9 Jun 2023 13:51:29 -0400
Subject: [PATCH] bemade_fsm: Unit tests complete for #1 and #2.

---
 models/__pycache__/sale_order.cpython-310.pyc | Bin 3727 -> 3366 bytes
 models/sale_order.py                          |  10 +++-------
 tests/__init__.py                             |   1 +
 tests/__pycache__/__init__.cpython-310.pyc    | Bin 203 -> 255 bytes
 .../test_task_template.cpython-310.pyc        | Bin 4108 -> 4176 bytes
 tests/test_task_template.py                   |   8 +++++++-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/models/__pycache__/sale_order.cpython-310.pyc b/models/__pycache__/sale_order.cpython-310.pyc
index 29c50133a0ce5c004375143b32305d94d7a8264e..c87196c617a49c631a6894750948f1667c749ee4 100644
GIT binary patch
delta 432
zcmW-byGjE=6o%)_%<gQ=PK?(g#48a=Bf-jA?Se#56hx88cv}@Uvo<nmTp>{uk!h@C
z(<s{J32c1?-#}l$)-w+LAOE?`Ip<;IrI0(7vWK|0m#B~IWA1y)!+@h0N?##bqy;Uy
z#}p`f9o!J~pqS$5p-m$aL6aJ)i!n_|$_#X%$qZW|ZDPPs<t41i+BD_LH_WcVR4+Fy
z${4PKdjMis_ZDU$7vLs=8gOeP`$?y(1|qgdwq(=CQN;L$<0xUglpE2(ujfOCr=Fs*
zpNjv3i18Llf(PuwArgo46;k%<HL&w+*^co8Tk~G6@ZV*@t)Ym1a=B?cvSjCilJ&(B
z1a?)-<QpN@HiW*|iR=34joEv#KH11%vLPLc2xoL25sE?J&;ucK!{CnjW3FSuK4+^i
z(*4OUK*?pk!joOC>-)RgXQw(YdyP@oHtZ@qJ~=zKRXN>P!O%zPaYSB(d7DTL75gin
F{s5~RT$=y@

delta 551
zcmY*V&ubGw6rNu@o37b3tySqt(@~Jnf-M#Fpcld3ya@FqNZDpLX47qU%}g4!6Gb9q
z#j42jpa)?CBIrrTKjD8M<RW+|`d>I{bI=Fh_ujns=6f^mv-f7Hl(?>gj2&I=2k+ds
zr9bDHIZZ$f<a0v<G{6Hgpmhdi?5)0_8I?<l^ifVV9^xL+WD8|T<BSGYpY}*bau#q+
z;4Z#2OEqcEXc`n=VT?2xW%vp%*+zDP(~}t~d?(dw8Ew){bidr=8Olf#1!NIrR5K&U
zwUsl?heqJx8O?Glpo-^qzyb@F={d&zPXw;hJ5R+{XGi&RR|>x!ia4w*(T!9i=_p71
zW4@4SSc~dWO{DFl8P?Qx6bP9J)$o-_TJa+jg+e9i<v83AV{xJ>8%bA+PHH-i>(jf(
zRS`#0x$C=rYsYVi{V428_-P-)v%)fbD^$z>%{NbhABErWl9lEj&rW65rXD`9uebu6
z))3opWUaaPY<cplFKq0=6U&2}{01L0wU@?lz!ztn1<bI6=gH_JKcrlkowhH+x^o*}
z7#%pbaAlGi7xzLb{RiQ8nn<<6+LcM$SwryaRCR8{1l&LhL-TfV0lcEb8}PdL{x5rz
BlHLFS

diff --git a/models/sale_order.py b/models/sale_order.py
index 6cbc9cb..fa04c34 100644
--- a/models/sale_order.py
+++ b/models/sale_order.py
@@ -11,21 +11,17 @@ class SaleOrderLine(models.Model):
             Override to add the logic needed to implement task templates."""
 
         def _create_task_from_template(project, template, parent):
-            """ Recursively generates the task and any subtasks from a project.task.template. Subtasks are left without
-            a specific project_id so that only the top-level tasks shows up on the project task list/kanban views.
+            """ Recursively generates the task and any subtasks from a project.task.template.
 
             :param project: project.project record to set on the task's project_id field.
-                Pass the project.project model to leave task project_id blank. DO NOT pass False or None as this will
-                cause an error in _timesheet_create_task_prepare_values(project).
             :param template: project.task.template to use to create the task.
             :param parent: project.task to set as the parent to this task.
             """
             values = _timesheet_create_task_prepare_values_from_template(project, template, parent)
             task = self.env['project.task'].sudo().create(values)
             subtasks = []
-            for subtask in tmpl.subtasks:
-                # Recurse, but pass the Project model so that no project_id gets set on the subtasks
-                subtask = _create_task_from_template(self.env['project.project'], tmpl, task)
+            for t in template.subtasks:
+                subtask = _create_task_from_template(project, t, task)
                 subtasks.append(subtask)
             task.write({'child_ids': [Command.set([t.id for t in subtasks])]})
             return task
diff --git a/tests/__init__.py b/tests/__init__.py
index 5bad71e..9df0958 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1 +1,2 @@
 from . import test_task_template
+from . import test_task_template_sale_order
diff --git a/tests/__pycache__/__init__.cpython-310.pyc b/tests/__pycache__/__init__.cpython-310.pyc
index abb4558f1aa375357b14e958e6f52204714593a0..fad409285a012dc968a5d67edfa01a8dc449790f 100644
GIT binary patch
delta 129
zcmX@j_@9wCpO=@50SJ1%n^Sxz^2#d7068fPDU3M`xr|Yaj371>kj)gu1Y|P@Gib6*
zbda{xWV|I?l3H96Uy@jy9bb}~Tac4jk{Vx}n3EcxUzCzs<fqAei=l`KXjl<5kXXr3
T#0p}wPRtAEU;(mt7z7vryoeqD

delta 77
zcmey*c$$$npO=@50SKO%Hm4{~<dqc@0CG|oQW$d>av7r-85vTTf*CZKC;CVW`)M-W
ZVklw)%CBT7VgXV`EE5-mvw;Kz7yxFm4qN~L

diff --git a/tests/__pycache__/test_task_template.cpython-310.pyc b/tests/__pycache__/test_task_template.cpython-310.pyc
index f0e0da405c605db5464c4877eadfa401abcc330c..f21b926f21144adcb76ddf4dc3d952d4d6e802e3 100644
GIT binary patch
delta 931
zcmZuuJ8#oa6!x_p+i_wiY2rK}grp6RR7DIZ0SbixttbNmK_ny=E6NQ~9;B^pkPs0a
zU<3*2t{K9J#6XpS#~)xtEJzvo161nN3C?j+;#BzRem>`X=Y02m_Ur8TtiGXXDhE%)
zd`X`fJNg?!oME3Vk?ll^8%WfknI?HhdYq~CxE4=SZuK}lO0$rwEg4V)^p7{q^<}qP
zce`T~jroa2$WvW_IMkA9zR$Z8VGnnr$K_|p2sRJq=t(C!h(R27500=qLh9Bj$Ri#h
z19MNW(UKcrp+WExgah`##%ZvThCJY^h1iY|Eyg|kflat3RR3o)LAm=}p)lMN*7>+m
zsoPHWuC>vs*PLvn{&=%fb?R(cnqQPH4L-6JM@S%~07lWxaj)r2dd((fTha@XWV_Py
zNcb>4Y{_4UnuAgNXZ8nn#=q<nMWXy+AN{c;2CBdlToNo1mb$M7*jxW)Wt{5!?1%qB
z9wkPaY1TSb+pg6+9n-XmP#eQJj7sdbx~}pNmSNjz7SW9i6<=`=Md}03(kP5}D^<Jw
z&*^XVb9NEBN79pSr`c`4CnM3WcOH4POYB=96X>F(1Q6thyMbe*v;?tr72yg3Qr1}n
z{A>l@x(2V2=)i$9S~s+uW&>p_0ICq=*_KvZ^;zd3wJsoBM7WNyiZC_lMkTDR0JLGd
z7g9Jy2>PrQwx@jxmyw>1l-O52O}5!jy?p7=2{&gur{Zfs^kCZ}fWid@YmMCtJw1Yl
VT1a~I$5ZTAXhE*c5ha`?e*yfG&qx3O

delta 918
zcmZ9J&ubG=5Xax_Zg!Jxc9YhmG5w*bt<})dgP1Cs)`~@1Poe=KAWP_5Yd70Qc2|WO
zEEta#ga;lZhv?0t<X}$<UcGqE$-ls}^dQb`s#zO&pUlj6-u!s`z3{4FHVi{&`1^XR
z#b0DTn)?8Ex^0+;y?mZ^RDOz&^V3b{=#JJ*^baqz)pyWjmVt4JXTrQJpW1>jYDS`G
z&^8^7Pq(E|OGUJqV_KU0&M-e4jC4*kS=>osJLaTCUC!^#k`*bGA%BqUWE^c1+iwC5
z0Sr}%_ZK*a3rwIt6jsAw{;e_D*21B(k?g<gM)PppWSBV0*<DsV-_0s(k_gnPtm+x~
zblxZ-N5~_@7xg*h#Ip9R`%OCly?`-#V*kC^Ph0_6{7B@)oSuj)pn!g;>*80Utde6M
zin4xhhA#9B%i3^jzQ19+u4Q=_G1kWgvP$BUzE+jdT*2edBWzX$&Z?3vb7%pVxcri}
zpsF1C3Xg?;jH|eV)=O7xKd99Fdd1#;<kkXvcc{S|jfL$7w_RV9hYr?@Shc4<-f_2f
z>K~w|__q5XGDwN!e1K&vykZBo6<|3lII8!M22&A9xx18{gvB|uy=B4@fh2E%KyO%-
zycPWGDO4}oM7%bpj2)ExI6_yFAU+$V+p4#Su6K!WnGhpfC)^+m-Yc|dR<De(@%Z#L
z;!KrwP-7;9aq&|h6BYAq`Wj^pZkNPwa{_k7cxvV9v5q(Y&m8nwMd2wPUqQrie{WU1
aNj({({vL^u`u$sCHa)G~AA$JrN%#X-oW}S7

diff --git a/tests/test_task_template.py b/tests/test_task_template.py
index 62813fd..ad84734 100644
--- a/tests/test_task_template.py
+++ b/tests/test_task_template.py
@@ -31,13 +31,14 @@ class TestTaskTemplateCommon(TransactionCase):
             'email': 'mrpm@testco.com',
             'signature': 'Mr. PM',
             'groups_id': [(6, 0, [user_group_employee.id, user_group_project_user.id, user_group_project_manager.id,
-                                  user_group_sales_user.id])]
+                                  user_group_sales_user.id])],
         })
         hours_uom = cls.env['uom.uom'].search([('name', '=', 'Hour')]) or False
         # Test product to use with the various tests
         cls.task1 = cls.env['project.task.template'].create({
             'name': 'Template 1',
         })
+
         cls.project = cls.env['project.project'].create({
             'name': 'Test Project',
         })
@@ -50,11 +51,15 @@ class TestTaskTemplateCommon(TransactionCase):
             'uom_id': hours_uom.id,
             'uom_po_id': hours_uom.id,
         })
+        cls.project_template = cls.env['project.project'].create({
+            'name': 'Test Project Template',
+        })
         cls.product_task_in_project = cls.env['product.product'].create({
             'name': 'Test Product 2',
             'type': 'service',
             'service_tracking': 'task_in_project',
             'task_template_id': cls.task1.id,
+            'project_template_id': cls.project_template.id,
             'uom_po_id': hours_uom.id,
             'uom_id': hours_uom.id,
         })
@@ -93,6 +98,7 @@ class TestTaskTemplateCommon(TransactionCase):
             'type': 'service',
             'service_tracking': 'task_in_project',
             'task_template_id': cls.parent_task.id,
+            'project_template_id': cls.project_template.id,
             'uom_po_id': hours_uom.id,
             'uom_id': hours_uom.id,
         })