Browse Source

Merge branch '12.0-MIG-FIX-beesdoo_product' of github.com:beescoop/obeesdoo into 12.0-target

pull/161/head
Manuel Claeys Bouuaert 4 years ago
parent
commit
b52705e38e
  1. 2
      beesdoo_product/models/beesdoo_product.py
  2. 2
      beesdoo_product/views/beesdoo_product.xml

2
beesdoo_product/models/beesdoo_product.py

@ -93,7 +93,7 @@ class BeesdooProduct(models.Model):
@api.one
@api.depends('taxes_id', 'list_price', 'taxes_id.amount',
'taxes_id.tax_group_id', 'total_with_vat',
'taxes_id.tax_group_id',
'display_weight', 'weight')
def _get_total(self):
consignes_group = self.env.ref('beesdoo_product.consignes_group_tax',

2
beesdoo_product/views/beesdoo_product.xml

@ -6,7 +6,7 @@
<field name="inherit_id" ref="product.product_template_only_form_view" />
<field name="arch" type="xml">
<field name="barcode" position="after">
<button string="Generate Barcode" name="generate_barcode" type="object" colspan="2" attrs="{'invisible' : [('barcode','!=',False)]}" /> />
<button string="Generate Barcode" name="generate_barcode" type="object" colspan="2" attrs="{'invisible' : [('barcode','!=',False)]}" />
</field>
<field name="list_price" position="after">
<field name="suggested_price" widget='monetary' options="{'currency_field': 'currency_id'}" />

Loading…
Cancel
Save