git.inspyration.org Git - odoo/odoo.git/commit - addons/point_of_sale/point_of_sale_view.xml

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f2cb870 0a1e4a0)

author	Denis Ledoux <dle@odoo.com>
	Fri, 8 Aug 2014 15:27:29 +0000 (17:27 +0200)
committer	Denis Ledoux <dle@odoo.com>
	Fri, 8 Aug 2014 15:27:29 +0000 (17:27 +0200)
commit	7c647ec8768845d387da3bc3792b338b9144b395
tree	1fb161939a89391db0adefe7cb8fb774a11a66c9	tree \| snapshot
parent	f2cb8702b231621abf34d343b49ae8a711f776d1	commit \| diff
parent	0a1e4a05b2f8735f347af1d9eed199bdd72efe4c	commit \| diff

[MERGE] forward port of branch saas-4 up to 0a1e4a0

15 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar.py	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm_claim/crm_claim_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/xml/pos.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/edi/purchase_order_action_data.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history

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