git.inspyration.org Git - odoo/odoo.git/commit - addons/account_voucher/account_voucher.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d85c66 39bee35)

author	Christophe Simonis <chs@odoo.com>
	Wed, 20 Aug 2014 18:33:17 +0000 (20:33 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 20 Aug 2014 18:33:17 +0000 (20:33 +0200)
commit	5dff0358788d7c3a001369c9501d99cb0a160144
tree	90d5cc4fb51cccb90e84ac8072900e2a089efd2f	tree \| snapshot
parent	1d85c667f7e2bd877a1e27f024245957931c3c49	commit \| diff
parent	39bee35e25ca964f73fea3538c3a5794bff4c142	commit \| diff

[MERGE] forward port of branch saas-5 up to 39bee35

18 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher_view.xml	diff1 \|	diff2 \|	blob \| history
addons/auth_oauth/auth_oauth.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list_editable.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_views.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history

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