lims_interface/lims_analysis_sheet: change labels and fields order

lims_analysis_sheet/locale/es.po

@@ -800,10 +800,6 @@ msgctxt "selection:lims.template.analysis_sheet,controls_allowed:"
 msgid "SLA"
 msgstr "SLA"
 
-msgctxt "view:lims.analysis_sheet:"
-msgid "%"
-msgstr "%"
-
 msgctxt "view:lims.analysis_sheet:"
 msgid "Activate"
 msgstr "Activar"
@@ -829,8 +825,8 @@ msgid "View data"
 msgstr "Ver datos"
 
 msgctxt "view:lims.interface.column:"
-msgid "Export"
-msgstr "Exportación"
+msgid "Export:"
+msgstr "Exportación:"
 
 msgctxt "view:lims.interface:"
 msgid "Export"

lims_analysis_sheet/view/interface_column_form.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/group[@id='storage_field']"
+    <xpath expr="/form/field[@name='source_end']"
         position="after">
-        <separator id="export" colspan="4" string="Export"/>
+        <separator id="export" colspan="4" string="Export:"/>
         <group id="export_spreadsheet" colspan="4" col="4">
             <label name="destination_column"/>
             <field name="destination_column"/>

lims_interface/interface.py

@@ -481,9 +481,9 @@ class Column(sequence_ordered(), ModelSQL, ModelView):
             'required': Eval('type_') == 'many2one',
             'invisible': Eval('type_') != 'many2one',
         }, depends=['type_'])
-    is_fixed_value = fields.Boolean('Is a fixed value',
-        help='Check to define a fixed value for this column')
-    fixed_value = fields.Char('Fixed value',
+    is_fixed_value = fields.Boolean('Has a default value',
+        help='Check to define a default value for this column')
+    fixed_value = fields.Char('Default value',
         states={
             'required': Bool(Eval('is_fixed_value')),
             'invisible': Not(Eval('is_fixed_value')),

lims_interface/locale/es.po

@@ -87,8 +87,8 @@ msgid "Expression Icon"
 msgstr "Icono"
 
 msgctxt "field:lims.interface.column,fixed_value:"
-msgid "Fixed value"
-msgstr "Valor fijo"
+msgid "Default value"
+msgstr "Valor por defecto"
 
 msgctxt "field:lims.interface.column,interface:"
 msgid "Interface"
@@ -99,8 +99,8 @@ msgid "Interface State"
 msgstr "Estado interfaz"
 
 msgctxt "field:lims.interface.column,is_fixed_value:"
-msgid "Is a fixed value"
-msgstr "Es un valor fijo"
+msgid "Has a default value"
+msgstr "Tiene un valor por defecto"
 
 msgctxt "field:lims.interface.column,name:"
 msgid "Name"
@@ -275,8 +275,8 @@ msgid "Type"
 msgstr "Tipo"
 
 msgctxt "help:lims.interface.column,is_fixed_value:"
-msgid "Check to define a fixed value for this column"
-msgstr "Marque para definir un valor fijo en esta columna"
+msgid "Check to define a default value for this column"
+msgstr "Marque para definir un valor por defecto en esta columna"
 
 msgctxt "help:lims.interface.column,singleton:"
 msgid "Is a fixed value (column:row) in source file"
@@ -650,12 +650,12 @@ msgid "Timestamp"
 msgstr "Timestamp"
 
 msgctxt "view:lims.interface.column:"
-msgid "Import"
-msgstr "Importación"
+msgid "Import:"
+msgstr "Importación:"
 
 msgctxt "view:lims.interface.column:"
-msgid "Storage"
-msgstr "Almacenamiento"
+msgid "Storage:"
+msgstr "Almacenamiento:"
 
 msgctxt "view:lims.interface.compilation:"
 msgid "Activate"

lims_interface/view/interface_column_form.xml

@@ -29,7 +29,14 @@
         <label name="fixed_value"/>
         <field name="fixed_value"/>
     </group>
-    <separator id="import" colspan="4" string="Import"/>
+    <separator id="storage" colspan="4" string="Storage:"/>
+    <group id="storage_field" colspan="4" col="4">
+        <label name="transfer_field"/>
+        <field name="transfer_field" xexpand="0"/>
+        <label name="related_line_field"/>
+        <field name="related_line_field"/>
+    </group>
+    <separator id="import" colspan="4" string="Import:"/>
     <group id="import_spreadsheet" colspan="4" col="6">
         <label name="singleton"/>
         <field name="singleton"/>
@@ -42,11 +49,4 @@
     <field name="source_start"/>
     <label name="source_end"/>
     <field name="source_end"/>
-    <separator id="storage" colspan="4" string="Storage"/>
-    <group id="storage_field" colspan="4" col="4">
-        <label name="transfer_field"/>
-        <field name="transfer_field" xexpand="0"/>
-        <label name="related_line_field"/>
-        <field name="related_line_field"/>
-    </group>
 </form>