[MERGE] merged trunk up to revision 9327
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 14 Apr 2014 09:47:43 +0000 (11:47 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 14 Apr 2014 09:47:43 +0000 (11:47 +0200)
commit398d96f2737c3e32ad0b03dc133b53b7352795f2
treecb426a0bbc990e7102485a27ddf519bf47094d3f
parent4987c9d42d2eae6017b8a983cc0567611d236f73
parent01d9ea6f64ba43f48d91c0b2bae28a095220f730
[MERGE] merged trunk up to revision 9327

bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
68 files changed:
addons/delivery/sale.py
addons/event_sale/event_sale_view.xml
addons/hw_escpos/controllers/main.py
addons/mrp/__openerp__.py
addons/mrp/security/ir.model.access.csv
addons/point_of_sale/point_of_sale.py
addons/procurement/procurement.py
addons/procurement/wizard/schedulers_all.py
addons/procurement_jit/i18n/ar.po
addons/procurement_jit/i18n/bg.po
addons/procurement_jit/i18n/bs.po
addons/procurement_jit/i18n/ca.po
addons/procurement_jit/i18n/cs.po
addons/procurement_jit/i18n/da.po
addons/procurement_jit/i18n/de.po
addons/procurement_jit/i18n/el.po
addons/procurement_jit/i18n/en_GB.po
addons/procurement_jit/i18n/es.po
addons/procurement_jit/i18n/es_AR.po
addons/procurement_jit/i18n/es_CR.po
addons/procurement_jit/i18n/es_EC.po
addons/procurement_jit/i18n/et.po
addons/procurement_jit/i18n/fi.po
addons/procurement_jit/i18n/fr.po
addons/procurement_jit/i18n/gl.po
addons/procurement_jit/i18n/hr.po
addons/procurement_jit/i18n/hu.po
addons/procurement_jit/i18n/id.po
addons/procurement_jit/i18n/it.po
addons/procurement_jit/i18n/ja.po
addons/procurement_jit/i18n/kab.po
addons/procurement_jit/i18n/ko.po
addons/procurement_jit/i18n/lt.po
addons/procurement_jit/i18n/lv.po
addons/procurement_jit/i18n/mk.po
addons/procurement_jit/i18n/ml.po
addons/procurement_jit/i18n/mn.po
addons/procurement_jit/i18n/nb.po
addons/procurement_jit/i18n/nl.po
addons/procurement_jit/i18n/nl_BE.po
addons/procurement_jit/i18n/oc.po
addons/procurement_jit/i18n/pl.po
addons/procurement_jit/i18n/pt.po
addons/procurement_jit/i18n/pt_BR.po
addons/procurement_jit/i18n/ro.po
addons/procurement_jit/i18n/ru.po
addons/procurement_jit/i18n/sk.po
addons/procurement_jit/i18n/sl.po
addons/procurement_jit/i18n/sq.po
addons/procurement_jit/i18n/sr.po
addons/procurement_jit/i18n/sr@latin.po
addons/procurement_jit/i18n/sv.po
addons/procurement_jit/i18n/ta.po
addons/procurement_jit/i18n/tr.po
addons/procurement_jit/i18n/uk.po
addons/procurement_jit/i18n/vi.po
addons/procurement_jit/i18n/zh_CN.po
addons/procurement_jit/i18n/zh_TW.po
addons/product/product_view.xml
addons/purchase/__openerp__.py
addons/purchase/res_config.py
addons/report/models/report.py
addons/sale/__openerp__.py
addons/sale/sale.py
addons/sale_stock/sale_stock.py
addons/stock/procurement.py
addons/stock/product.py
addons/stock/wizard/orderpoint_procurement.py