lims_email: results report name format: add sample_label as variable
This commit is contained in:
parent
d3dd6351a8
commit
74ce992cd1
|
@ -121,11 +121,13 @@ msgid ""
|
||||||
"Available variables (also in upper case):\n"
|
"Available variables (also in upper case):\n"
|
||||||
"- ${number}\n"
|
"- ${number}\n"
|
||||||
"- ${sample_number}\n"
|
"- ${sample_number}\n"
|
||||||
|
"- ${sample_label}\n"
|
||||||
"- ${party_name}"
|
"- ${party_name}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Variables disponibles (también en mayúsculas):\n"
|
"Variables disponibles (también en mayúsculas):\n"
|
||||||
"- ${number}\n"
|
"- ${number}\n"
|
||||||
"- ${sample_number}\n"
|
"- ${sample_number}\n"
|
||||||
|
"- ${sample_label}\n"
|
||||||
"- ${party_name}"
|
"- ${party_name}"
|
||||||
|
|
||||||
msgctxt "model:ir.action,name:act_results_report_format"
|
msgctxt "model:ir.action,name:act_results_report_format"
|
||||||
|
|
|
@ -299,6 +299,8 @@ class ResultsReport(metaclass=PoolMeta):
|
||||||
'number': getattr(self, 'number', None) or '',
|
'number': getattr(self, 'number', None) or '',
|
||||||
'sample_number': (sample and
|
'sample_number': (sample and
|
||||||
sample.notebook.fraction.sample.number or ''),
|
sample.notebook.fraction.sample.number or ''),
|
||||||
|
'sample_label': (sample and
|
||||||
|
sample.notebook.fraction.sample.label or ''),
|
||||||
'party_name': sample and sample.party.rec_name or '',
|
'party_name': sample and sample.party.rec_name or '',
|
||||||
}
|
}
|
||||||
for key, value in list(substitutions.items()):
|
for key, value in list(substitutions.items()):
|
||||||
|
@ -801,6 +803,7 @@ class ReportNameFormat(ModelSQL, ModelView):
|
||||||
help=("Available variables (also in upper case):"
|
help=("Available variables (also in upper case):"
|
||||||
"\n- ${number}"
|
"\n- ${number}"
|
||||||
"\n- ${sample_number}"
|
"\n- ${sample_number}"
|
||||||
|
"\n- ${sample_label}"
|
||||||
"\n- ${party_name}"))
|
"\n- ${party_name}"))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue