git.inspyration.org Git - odoo/odoo.git/commit - addons/account/account_invoice.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8286d43 81a902a)

author	Denis Ledoux <dle@odoo.com>
	Fri, 8 Aug 2014 15:06:39 +0000 (17:06 +0200)
committer	Denis Ledoux <dle@odoo.com>
	Fri, 8 Aug 2014 15:06:39 +0000 (17:06 +0200)
commit	0a1e4a05b2f8735f347af1d9eed199bdd72efe4c
tree	dc2f0ee95aa1089ca6e933fafbff86ca89d6e289	tree \| snapshot
parent	8286d4306a2f29e6ba1d65ed35eac3cacf03dbf5	commit \| diff
parent	81a902a07daacfcb22224627df3d51b719ba5643	commit \| diff

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

12 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_invoice_report_view.xml	diff1 \|	diff2 \|	blob \| history
addons/analytic/analytic.py	diff1 \|	diff2 \|	blob \| history
addons/calendar/calendar.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	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/web_kanban/static/src/js/kanban.js	diff1 \|	diff2 \|	blob \| history
addons/website_quote/models/order.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/models/website.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/yaml_import.py	diff1 \|	diff2 \|	blob \| history

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