Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / stock / views / report_location_barcode.xml

diff --git a/addons/stock/views/report_location_barcode.xml b/addons/stock/views/report_location_barcode.xml
index 7e6466e..ecb9c4b 100644 (file)
--- a/addons/stock/views/report_location_barcode.xml
+++ b/addons/stock/views/report_location_barcode.xml
@@ -10,11 +10,11 @@
                     <div class="row">
                         <div class="col-xs-6 mt6">
                             <table class="table table-condensed" style="border-bottom: 3px solid black !important;"><thead><th> </th></thead></table>
-                            <img t-if="not o.loc_barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px"/>
-                            <img t-if="o.loc_barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.loc_barcode, 600, 100)" style="width:300px;height:50px"/>
+                            <img t-if="not o.barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px"/>
+                            <img t-if="o.barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.barcode, 600, 100)" style="width:300px;height:50px"/>
                             <p>
-                            <span t-if="not o.loc_barcode" t-field="o.name"/>
-                            <span t-if="o.loc_barcode" t-field="o.loc_barcode"/>
+                            <span t-if="not o.barcode" t-field="o.name"/>
+                            <span t-if="o.barcode" t-field="o.barcode"/>
                             </p>
                         </div>
                     </div>