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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4b8b2e8 fe8106f)

author	Christophe Simonis <chs@odoo.com>
	Fri, 26 Sep 2014 10:53:59 +0000 (12:53 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Fri, 26 Sep 2014 10:53:59 +0000 (12:53 +0200)
commit	e2e60bf4eb89d92e883e8520771523c1c0377fd3
tree	c471997732b938ea4dac37340862dfe668fc1a0c	tree \| snapshot
parent	4b8b2e8dfe3147beb5ab7c333269c2874eda5267	commit \| diff
parent	fe8106fb85c5b0ba8d59fd95f44cde6379c3dec5	commit \| diff

[MERGE] forward port of branch saas-3 up to fe8106f

15 files changed:

addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/voucher_sales_purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/auth_ldap/users_ldap.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall_view.xml	diff1 \|	diff2 \|	blob \| history
addons/payment/views/payment_acquirer.xml	diff1 \|	diff2 \|	blob \| history
addons/portal_sale/portal_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/web_graph/static/src/js/graph_view.js	diff1 \|	diff2 \|	blob \| history
addons/web_graph/static/src/js/pivot_table.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/base_test.yml	diff1 \|	\|	blob \| history

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