diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-20 14:16:48 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-20 14:33:54 +0000 |
| commit | 58a83d12228fbbd4e9dde542e133d264204ee0f3 (patch) | |
| tree | 60aaf45e3281e88fddc58fea8fe75de0ad4e2f46 /odoo/addons/base/models/ir_qweb_fields.py | |
| parent | f6da4d57bcc8e19ae0bd6d571926706bee46e08f (diff) | |
| parent | 4a1321bc99dd7d8d153aceb2d0076161ce28bcd7 (diff) | |
[MERGE] forward port branch saas-12.4 up to 4a1321bc99d
closes odoo/odoo#37127
Signed-off-by: Christophe Simonis <chs@odoo.com>
Diffstat (limited to 'odoo/addons/base/models/ir_qweb_fields.py')
| -rw-r--r-- | odoo/addons/base/models/ir_qweb_fields.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odoo/addons/base/models/ir_qweb_fields.py b/odoo/addons/base/models/ir_qweb_fields.py index 8f64560203c..2cc77269e27 100644 --- a/odoo/addons/base/models/ir_qweb_fields.py +++ b/odoo/addons/base/models/ir_qweb_fields.py @@ -601,7 +601,7 @@ class BarcodeConverter(models.AbstractModel): def get_available_options(self): options = super(BarcodeConverter, self).get_available_options() options.update( - type=dict(type='string', string=_('Barcode type'), description=_('Barcode type, eg: UPCA, EAN13, Code128'), default_value='Code128'), + symbology=dict(type='string', string=_('Barcode symbology'), description=_('Barcode type, eg: UPCA, EAN13, Code128'), default_value='Code128'), width=dict(type='integer', string=_('Width'), default_value=600), height=dict(type='integer', string=_('Height'), default_value=100), humanreadable=dict(type='integer', string=_('Human Readable'), default_value=0), @@ -610,9 +610,9 @@ class BarcodeConverter(models.AbstractModel): @api.model def value_to_html(self, value, options=None): - barcode_type = options.get('type', 'Code128') + barcode_symbology = options.get('symbology', 'Code128') barcode = self.env['ir.actions.report'].barcode( - barcode_type, + barcode_symbology, value, **{key: value for key, value in options.items() if key in ['width', 'height', 'humanreadable']}) return u'<img src="data:png;base64,%s">' % base64.b64encode(barcode).decode('ascii') |