Remove progressbar option on measures
This commit is contained in:
parent
70b1a0329d
commit
1f4e342c3f
|
@ -1,3 +1,4 @@
|
|||
* Remove progressbar option on measures
|
||||
* Fix parent calculation with null values
|
||||
* Prevent error when opening executions with duplicated internal measures
|
||||
* Add label for fields on form view
|
||||
|
|
12
babi.py
12
babi.py
|
@ -167,13 +167,9 @@ class DynamicModel(ModelSQL, ModelView):
|
|||
# Avoid duplicated fields
|
||||
if field.internal_name in fields:
|
||||
continue
|
||||
widget = ''
|
||||
if hasattr(field, 'progressbar') and field.progressbar:
|
||||
widget = 'widget="progressbar"'
|
||||
if view_type == 'form':
|
||||
xml += '<label name="%s"/>\n' % (field.internal_name)
|
||||
xml += '<field name="%s" %s/>\n' % (field.internal_name,
|
||||
widget)
|
||||
xml += '<field name="%s"/>\n' % (field.internal_name)
|
||||
fields.append(field.internal_name)
|
||||
xml += '</%s>\n' % (view_type)
|
||||
result['arch'] = xml
|
||||
|
@ -1349,7 +1345,6 @@ class ReportExecution(ModelSQL, ModelView):
|
|||
'expression': expression,
|
||||
'ttype': measure.expression.ttype,
|
||||
'related_model': related_model_id,
|
||||
'progressbar': measure.progressbar,
|
||||
})
|
||||
if to_create:
|
||||
InternalMeasure.create(to_create)
|
||||
|
@ -2037,8 +2032,6 @@ class Measure(ModelSQL, ModelView):
|
|||
aggregate = fields.Selection(AGGREGATE_TYPES, 'Aggregate', required=True)
|
||||
internal_measures = fields.One2Many('babi.internal.measure',
|
||||
'measure', 'Internal Measures')
|
||||
progressbar = fields.Boolean('Progress Bar',
|
||||
help='Display a progress bar instead of a number.')
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
|
@ -2070,7 +2063,7 @@ class Measure(ModelSQL, ModelView):
|
|||
'name': self.name,
|
||||
'internal_name': self.internal_name,
|
||||
'expression': self.expression,
|
||||
'ttype': self.ttype if not self.progressbar else 'float',
|
||||
'ttype': self.ttype,
|
||||
'related_model': (self.related_model and
|
||||
self.related_model.model),
|
||||
}
|
||||
|
@ -2146,7 +2139,6 @@ class InternalMeasure(ModelSQL, ModelView):
|
|||
ttype = fields.Selection(FIELD_TYPES, 'Field Type',
|
||||
required=True)
|
||||
related_model = fields.Many2One('ir.model', 'Related Model')
|
||||
progressbar = fields.Boolean('Progress Bar')
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
|
|
|
@ -12,8 +12,6 @@ contains the full copyright notices and license terms. -->
|
|||
<field name="measure"/>
|
||||
<label name="name"/>
|
||||
<field name="name"/>
|
||||
<label name="progressbar"/>
|
||||
<field name="progressbar"/>
|
||||
<label name="related_model"/>
|
||||
<field name="related_model"/>
|
||||
<label name="execution"/>
|
||||
|
|
|
@ -5,7 +5,6 @@ contains the full copyright notices and license terms. -->
|
|||
<field name="measure"/>
|
||||
<field name="name"/>
|
||||
<field name="aggregate"/>
|
||||
<field name="progressbar"/>
|
||||
<field name="ttype"/>
|
||||
<field name="related_model"/>
|
||||
</tree>
|
||||
|
|
|
@ -10,6 +10,4 @@ contains the full copyright notices and license terms. -->
|
|||
<field name="name"/>
|
||||
<label name="aggregate"/>
|
||||
<field name="aggregate"/>
|
||||
<label name="progressbar"/>
|
||||
<field name="progressbar"/>
|
||||
</form>
|
||||
|
|
|
@ -6,6 +6,5 @@ contains the full copyright notices and license terms. -->
|
|||
<field name="expression"/>
|
||||
<field name="name"/>
|
||||
<field name="aggregate"/>
|
||||
<field name="progressbar"/>
|
||||
<field name="sequence" tree_invisible="1"/>
|
||||
</tree>
|
||||
|
|
Loading…
Reference in New Issue