Vaibhav (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-905301-vda into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #905301 in OpenERP Addons: "[POS] can't load images which are set in to
product form view"
https://bugs.launchpad.net/openobject-addons/+bug/905301
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-905301-vda/+merge/86194
consider product image
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-905301-vda/+merge/86194
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-905301-vda.
=== modified file 'point_of_sale/static/src/js/pos.js'
--- point_of_sale/static/src/js/pos.js 2011-12-14 17:13:22 +0000
+++ point_of_sale/static/src/js/pos.js 2011-12-19 07:11:31 +0000
@@ -79,7 +79,7 @@
this.store.set('currency', val);
}, this));
$.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
- this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]),
+ this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img', 'product_image'], [['pos_categ_id', '!=', 'false']]),
this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'], [['state', '=', 'open']]),
this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
this.get_currency())
=== modified file 'point_of_sale/static/src/xml/pos.xml'
--- point_of_sale/static/src/xml/pos.xml 2011-12-14 14:54:26 +0000
+++ point_of_sale/static/src/xml/pos.xml 2011-12-19 07:11:31 +0000
@@ -171,7 +171,12 @@
<t t-name="pos-product-template">
<a href="#">
<div class="product-img">
- <img t-att-src="'data:image/gif;base64,'+ img" />
+ <t t-if="product_image">
+ <img t-att-src="'data:image/gif;base64,'+ product_image" />
+ </t>
+ <t t-if="!product_image">
+ <img t-att-src="'data:image/gif;base64,'+ img" />
+ </t>
<span class="price-tag">
<t t-esc="format_amount(list_price)"/>
</span>
@@ -263,4 +268,4 @@
</div>
</div>
</t>
-</templates>
\ No newline at end of file
+</templates>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
