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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 04a56d8 3509e15)

author	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:12:55 +0000 (16:12 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:12:55 +0000 (16:12 +0200)
commit	ada9724655b85587cd1b992a6c636800beadd56b
tree	82855268b0bfaf05d0dc4cc8aa2303021f286461	tree \| snapshot
parent	04a56d8f6b401da3c6849dd5581938657e6f450f	commit \| diff
parent	3509e15cc9abd8ee662acbe8a450c534d5a48645	commit \| diff

[MERGE] forward port of branch 7.0 up to 3509e15

17 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/auth_ldap/users_ldap.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message_view.xml	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/security/ir_rule.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_alias.py	diff1 \|	diff2 \|	blob \| history
addons/pad/pad.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/resource/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/sale_margin/sale_margin.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history

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