diff options
| author | Thibault Francois <tfr@openerp.com> | 2010-10-28 13:33:50 +0200 |
|---|---|---|
| committer | Thibault Francois <tfr@openerp.com> | 2010-10-28 13:33:50 +0200 |
| commit | f00a1763556b9a9b9c28dc2d66b89ba14dc3d61d (patch) | |
| tree | b602f58af326b770becd2dcf5564c91fc6a9eecd /addons/analytic_user_function | |
| parent | fb379188b89dd964e95347f3de7973e63c56491a (diff) | |
| parent | f20e34ac9d5e90c6cd014c1ef66f776f945acfee (diff) | |
[MERGE] purchase_view.xml : conflict resolved
bzr revid: tfr@openerp.com-20101028113350-fbeha4ln46la0u80
Diffstat (limited to 'addons/analytic_user_function')
0 files changed, 0 insertions, 0 deletions