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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b3f49d4 ade561e)

author	Fabien Pinckaers <fp@openerp.com>
	Sat, 3 Aug 2013 17:50:04 +0000 (19:50 +0200)
committer	Fabien Pinckaers <fp@openerp.com>
	Sat, 3 Aug 2013 17:50:04 +0000 (19:50 +0200)
commit	54631bda2a8fd6759e7094e282db40d6213b8d40
tree	86c4dd97ac72f310318ce406a55ad95e8fe7935b	tree \| snapshot
parent	b3f49d4b748eb69aafda5f203da89c814fa28d49	commit \| diff
parent	ade561e1cc4ba0e444a9dc521a6fc243eccd3f69	commit \| diff

[MERGE] trunk

bzr revid: fp@openerp.com-20130803175004-ivqkxtsd7vh4npwe

12 files changed:

addons/crm/i18n/zh_CN.po	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/i18n/zh_CN.po	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement_data.xml	diff1 \|	diff2 \|	blob \| history
addons/project/i18n/zh_CN.po	diff1 \|	diff2 \|	blob \| history
addons/project_mrp/project_mrp.py	diff1 \|	diff2 \|	blob \| history
addons/project_mrp/project_mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/i18n/zh_CN.po	diff1 \|	diff2 \|	blob \| history
addons/stock/static/description/index.html	diff1 \|	diff2 \|	blob \| history

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