git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d822766 262eb66)

author	Christophe Simonis <chs@odoo.com>
	Tue, 21 Oct 2014 12:59:56 +0000 (14:59 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 21 Oct 2014 12:59:56 +0000 (14:59 +0200)
commit	a42167d085e8c4989412c39ec4e21685ebd93cd2
tree	fc8cf942fe689de94aec631d5b8d7365693de5d0	tree \| snapshot
parent	d822766296fed8f72d3168c675d4cf0b89e73f0c	commit \| diff
parent	262eb662de489d98b76dece7305b594399161014	commit \| diff

[MERGE] forward port of branch 8.0 up to 262eb66

18 files changed:

addons/account/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/report/pos_order_report.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/project/report/project_report.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale/wizard/sale_make_invoice_advance.py	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website/views/snippets.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/views.xml	diff1 \|	diff2 \|	blob \| history
doc/conf.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.