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

author	kum (Open ERP) <kum@tinyerp.co.in>
	Thu, 26 Nov 2009 08:42:52 +0000 (14:12 +0530)
committer	kum (Open ERP) <kum@tinyerp.co.in>
	Thu, 26 Nov 2009 08:42:52 +0000 (14:12 +0530)
commit	c9f87c4dc9ebceddb609c5cfc2e6fd15abc481e8
tree	053269a0cc8d08a3d44694c3c73d38abadd6749e	tree \| snapshot
parent	38caea46b0ba92d3a2db17c7c72ec4c290b3b334	commit \| diff
parent	d8dc05715d93963f3c72b78a57d07ca9552ef45f	commit \| diff

[IMP] English Improvement resolved conflicts

bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f

28 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/process/statement_process.xml	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_wizard.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/procurement_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/service_product_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/stockable_product_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale/process/sale_process.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_journal/picking_journal_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_journal/sale_journal_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/process/statement_process.xml	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_wizard.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/procurement_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/service_product_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/stockable_product_process.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale/process/sale_process.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_journal/picking_journal_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_journal/sale_journal_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history