Kalenis
/
kalenislims
mirror of https://github.com/Kalenis/kalenislims.git
2
1
Fork 1
Code Issues Projects Releases Wiki Activity

lims_interface/lims_analysis_sheet: improves import and export

This commit is contained in:
Adrián Bernardi 2020-04-14 09:37:19 -03:00
parent f6d0c4381f
commit 081b8f3b00
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lims_analysis_sheet/sheet.py
View File

@ -593,7 +593,7 @@ class AnalysisSheet(Workflow, ModelSQL, ModelView):
line[interface.analysis_field.alias] = nl.analysis.id
else:
line[interface.analysis_field.alias] = (
nl.analysis.code)
nl.analysis.rec_name)
if interface.fraction_field:
if interface.fraction_field.type_ == 'many2one':
line[interface.fraction_field.alias] = nl.fraction.id

2
lims_interface/interface.py
View File

@ -1035,7 +1035,7 @@ class Compilation(Workflow, ModelSQL, ModelView):
nb_line = NotebookLine.search([
('notebook.fraction.number', '=', fraction_value),
('analysis.code', '=', analysis_value),
('analysis.code', '=', analysis_value.split(' ')[0]),
('analysis.automatic_acquisition', '=', True),
('repetition', '=', repetition_value),
])