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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4b884ed 6fdb783)

author	Christophe Simonis <chs@odoo.com>
	Tue, 10 Jun 2014 09:49:14 +0000 (11:49 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 10 Jun 2014 09:49:14 +0000 (11:49 +0200)
commit	4601d859440c7be464c670741e434a012e16d3b3
tree	87b652cfa181d606ae9dfa9c3ebd6efa88568a8b	tree \| snapshot
parent	4b884ed100f3d04fc7aec35f6f4943ae847a989d	commit \| diff
parent	6fdb783a378104700138dd0abcc571856fdc9541	commit \| diff

[MERGE] forward port of branch 7.0 up to 6fdb783

13 files changed:

addons/point_of_sale/wizard/pos_payment.py	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/project_timesheet.py	diff1 \|	diff2 \|	blob \| history
addons/report_webkit/webkit_report.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.css	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.sass	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history

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