lims: migrate to multi-package samples (2)

lims/locale/es.po

@@ -1320,8 +1320,8 @@ msgid "Manual Objective description (foreign language)"
 msgstr "Descripción objetiva manual (idioma extranjero)"
 
 msgctxt "field:lims.create_sample.start,packages:"
-msgid "Packages"
-msgstr "Envases"
+msgid "Packages per sample"
+msgstr "Envases por muestra"
 
 msgctxt "field:lims.create_sample.start,party:"
 msgid "Party"
@@ -15181,6 +15181,10 @@ msgctxt "view:lims.sample:"
 msgid "General"
 msgstr "General"
 
+msgctxt "view:lims.sample:"
+msgid "Packages"
+msgstr "Envases"
+
 msgctxt "view:lims.sample:"
 msgid "Report"
 msgstr "Informe"

lims/sample.py

@@ -6241,7 +6241,8 @@ class CreateSampleStart(ModelView):
                 ~Eval('foreign_language')),
             },
         depends=['obj_description', 'foreign_language'])
-    packages = fields.One2Many('lims.create_sample.package', None, 'Packages')
+    packages = fields.One2Many('lims.create_sample.package', None,
+        'Packages per sample')
     restricted_entry = fields.Boolean('Restricted entry',
         states={'readonly': True})
     zone = fields.Many2One('lims.zone', 'Zone',

lims/view/create_sample_start_form.xml

@@ -34,8 +34,8 @@
                 <label name="without_services"/>
                 <field name="without_services"/>
             </group>
-            <field name="packages" colspan="2" mode="form,tree"
-                view_ids="lims.sample_package_view_form,lims.sample_package_view_list"/>
+            <field name="packages" colspan="2" mode="tree,form"
+                view_ids="lims.sample_package_view_list,lims.sample_package_view_form"/>
             <group id="labels" string="Labels" col="1" colspan="2" yexpand="1" yfill="1">
                 <field name="labels" colspan="2"/>
             </group>

lims/view/sample_form.xml

@@ -28,6 +28,8 @@
             <field name="obj_description"/>
             <label name="obj_description_manual"/>
             <field name="obj_description_manual"/>
+            <label name="packages_string"/>
+            <field name="packages_string"/>
             <label name="restricted_entry"/>
             <field name="restricted_entry"/>
             <label name="zone"/>
@@ -36,10 +38,11 @@
             <field name="trace_report"/>
             <label name="variety"/>
             <field name="variety"/>
-            <field name="packages" colspan="4" mode="form,tree"
-                view_ids="lims.sample_package_view_form,lims.sample_package_view_list"/>
             <field name="fractions" colspan="4"/>
         </page>
+        <page string="Packages" id="packages">
+            <field name="packages" colspan="4"/>
+        </page>
         <page string="Attributes" id="attributes">
             <field name="attributes" colspan="4"/>
         </page>

lims/view/sample_package_list.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<tree>
+<tree editable="1">
     <field name="quantity"/>
-    <field name="type"/>
-    <field name="state"/>
+    <field name="type" expand="1"/>
+    <field name="state" expand="1"/>
 </tree>