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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c013210 ddef2dd)

author	Christophe Simonis <chs@odoo.com>
	Wed, 20 Aug 2014 15:57:22 +0000 (17:57 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 20 Aug 2014 15:57:22 +0000 (17:57 +0200)
commit	c3131317d765cdde1b5f0329662ea580f1b88404
tree	6f95a828fd814c7290e09011ef7adc0f151fa9e6	tree \| snapshot
parent	c0132100ce3badfb3bc9591e100296225ff550f8	commit \| diff
parent	ddef2dd10aabf0e77bf63c462d5f29e353b6b53a	commit \| diff

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

13 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/report/pos_order_report.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website_customer/controllers/main.py	diff1 \|	diff2 \|	blob \| history

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