Skip to content

Commit 7f799a2

Browse files
Merge pull request #79 from Escodoo/14.0-imp-epa_lab_sample_management-ht00893
[14.0][IMP] epa_lab_sample_management: remove depth from name
2 parents bb7ba36 + 4e68cda commit 7f799a2

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

epa_lab_sample_management/models/lab_sample.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def create(self, vals):
136136

137137
return record
138138

139-
@api.depends("number", "company_id", "point", "depth", "collection_date")
139+
@api.depends("number", "company_id", "point", "collection_date")
140140
def _compute_name(self):
141141
for sample in self:
142142
if (
@@ -147,14 +147,10 @@ def _compute_name(self):
147147
and sample.collection_date
148148
):
149149
point = sample.point
150-
depth = sample.depth
151150
year = sample.collection_date.strftime("%y")
152151
company_name = sample.company_id.name.split(" ")[0].upper()
153152
number = sample.number
154-
if depth:
155-
sample.name = f"{point}/{depth}/{year}/{company_name}/{number}"
156-
else:
157-
sample.name = f"{point}/{year}/{company_name}/{number}"
153+
sample.name = f"{point}/{year}/{company_name}/{number}"
158154

159155
def action_confirm(self):
160156
for sample in self:

epa_lab_sample_management/views/lab_sample.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@
163163
<field name="arch" type="xml">
164164
<tree>
165165
<field name="name" />
166-
<field name="company_id" />
166+
<field name="company_id" optional="hide" />
167+
<field name="depth" />
167168
<field name="laboratory_id" />
168169
<field name="analytic_account_id" />
169170
<field name="partner_id" />

0 commit comments

Comments
 (0)