projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f680fdf f4870f8)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 29 Oct 2014 08:25:50 +0000 (09:25 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 29 Oct 2014 08:25:50 +0000 (09:25 +0100)
Conflicts:
addons/product/pricelist.py

    Revert
    https://github.com/OCA/OCB/commit/c096d2e30b571d134b7ebb0f40dbc50d73bafbaf
    manually in favour of upstream fix of the same bug in
    https://github.com/odoo/odoo/commit/79ebe1060d7a6303dbd5ff6e401aec5337161883

1  2 
addons/account/account_invoice.py patch | diff1 | diff2 | blob | history

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