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

author	Christophe Simonis <chs@odoo.com>
	Mon, 15 Sep 2014 13:09:32 +0000 (15:09 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Mon, 15 Sep 2014 13:09:32 +0000 (15:09 +0200)
commit	45cc064d590eae30357b6055f7609508a47b78fc
tree	db41ced74b478c9e6629f4aa40396b00ed78cc65	tree \| snapshot
parent	3fb4ad20cdae70019656c8fce32ab0bb8fadf090	commit \| diff
parent	780dd9891f5783fd07a075a445314df912d0a88c	commit \| diff

[MERGE] forward port of branch 8.0 up to 780dd98

37 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account_anglo_saxon/test/anglo_saxon.yml	diff1 \|	diff2 \|	blob \| history
addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/res_config_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/screens.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/widgets.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/xml/pos.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/module.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account_anglo_saxon/test/anglo_saxon.yml	diff1 \|	diff2 \|	blob \| history
addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/res_config_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/screens.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/widgets.js	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/xml/pos.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/module.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history