projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb98f9c997fb1dab28f5184dd7f88f619ace7215c
tree3c1a2a5012cbdebaeccbc0e333a1763954fe03edtree | snapshot
parentf680fdff6d70980e61f2cefd86e3e0e277aaa7cdcommit | diff
parentf4870f84182eb7a062f11e37e31827009d237cbbcommit | diff
Merge remote-tracking branch 'odoo/7.0' into 7.0

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
addons/account/account_invoice.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.