lims: add method to analysis not typified wizard

lims/analysis.py

@@ -2538,6 +2538,7 @@ class OpenAnalysisNotTypifiedStart(ModelView):
     product_type = fields.Many2One('lims.product.type', 'Product type',
         required=True)
     matrix = fields.Many2One('lims.matrix', 'Matrix', required=True)
+    method = fields.Many2One('lims.lab.method', 'Method')
 
 
 class OpenAnalysisNotTypified(Wizard):
@@ -2570,16 +2571,18 @@ class OpenAnalysisNotTypified(Wizard):
         set_group_id = self.start.analysis.id
         product_type_id = self.start.product_type.id
         matrix_id = self.start.matrix.id
+        method_id = self.start.method and self.start.method.id or None
 
         analysis_ids = []
         ia = Analysis.get_included_analysis_analysis(set_group_id)
+        method_clause = method_id and 'AND method = %s' % (method_id, ) or ''
         for a_id in ia:
             cursor.execute('SELECT COUNT(*) '
                 'FROM "' + Typification._table + '" '
                 'WHERE valid '
                     'AND analysis = %s '
                     'AND product_type = %s '
-                    'AND matrix = %s',
+                    'AND matrix = %s' + method_clause,
                 (a_id, product_type_id, matrix_id))
             typifications = cursor.fetchone()
             if typifications[0] == 0:

lims/locale/es.po

@@ -270,6 +270,10 @@ msgctxt "field:lims.analysis.open_not_typified.start,matrix:"
 msgid "Matrix"
 msgstr "Matriz"
 
+msgctxt "field:lims.analysis.open_not_typified.start,method:"
+msgid "Method"
+msgstr "Método"
+
 msgctxt "field:lims.analysis.open_not_typified.start,product_type:"
 msgid "Product type"
 msgstr "Tipo de producto"

lims/view/analysis_open_not_typified_form.xml

@@ -6,4 +6,6 @@
     <field name="product_type"/>
     <label name="matrix"/>
     <field name="matrix"/>
+    <label name="method"/>
+    <field name="method"/>
 </form>