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

author	Christophe Simonis <chs@openerp.com>
	Mon, 7 Apr 2014 16:33:18 +0000 (18:33 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Mon, 7 Apr 2014 16:33:18 +0000 (18:33 +0200)
commit	0fad8159f3e77336e34de017a4ca5f28d7a7fe02
tree	2bf89418078c923826a535c69395fa92bba8e16b	tree \| snapshot
parent	f1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b	commit \| diff
parent	ffae3807255269ff290bdf9fe62bc668feaade75	commit \| diff

[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx

bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk

18 files changed:

addons/account_voucher/account_voucher_view.xml	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar_data.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/hw_escpos/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/hw_scanner/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/share/res_users.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail/models/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/models/sale_order.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/website_sale.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale_delivery/controllers/main.py	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

addons/account_voucher/account_voucher_view.xml	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar_data.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/hw_escpos/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/hw_scanner/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/share/res_users.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail/models/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/models/sale_order.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/website_sale.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale_delivery/controllers/main.py	diff1 \|	diff2 \|	blob \| history