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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f426dc1 8b3cbc9)

author	Harry (Open ERP) <hmo@tinyerp.com>
	Thu, 18 Mar 2010 07:42:14 +0000 (13:12 +0530)
committer	Harry (Open ERP) <hmo@tinyerp.com>
	Thu, 18 Mar 2010 07:42:14 +0000 (13:12 +0530)
commit	42a396dcfe8cdce5c8495a991451e28f5289da3d
tree	574a6ef183728d8360beabbded722280732a4432	tree \| snapshot
parent	f426dc1306fad9f5e1aed6c105ada56b27ac8ca8	commit \| diff
parent	8b3cbc9a969dad09f87d8194166bf8b0602ef031	commit \| diff

[MERGE] merged from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100318074214-9blwk2h5qgfo59zd

15 files changed:

addons/mrp/__terp__.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/mrp/stock.py.moved	\|	\|	blob
addons/point_of_sale/__terp__.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project_issue/report/project_issue_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/__terp__.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/__terp__.py	diff1 \|	diff2 \|	blob \| history
addons/stock/report/report_stock_view.xml	\|	diff2 \|	blob \| history
addons/stock/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_move.py	diff1 \|	\|	blob \| history

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