projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b12bcdc 6de3dcb)
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 11 Nov 2010 05:48:20 +0000 (11:18 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 11 Nov 2010 05:48:20 +0000 (11:18 +0530)
bzr revid: ksa@tinyerp.co.in-20101111054820-642jsckzejzuofp7

1  2 
addons/account/account_view.xml patch | diff1 | diff2 | blob | history
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml patch | diff1 | diff2 | blob | history
addons/sale/sale.py patch | diff1 | diff2 | blob | history

diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/sale/sale.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.