Merge lp:~openerp-dev/openobject-server/ssi-dev-framework into lp:openobject-server
Proposed by
Harry (OpenERP)
Status: | Merged |
---|---|
Merged at revision: | 3147 |
Proposed branch: | lp:~openerp-dev/openobject-server/ssi-dev-framework |
Merge into: | lp:openobject-server |
Diff against target: |
93 lines (+22/-4) (has conflicts) 4 files modified
bin/addons/base/res/partner/partner_view.xml (+1/-1) bin/addons/base/res/partner/wizard/partner_wizard_spam.py (+5/-1) bin/addons/base/res/res_log_view.xml (+1/-1) bin/tools/misc.py (+15/-1) Text conflict in bin/tools/misc.py |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/ssi-dev-framework |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+41830@code.launchpad.net |
This proposal supersedes a proposal from 2010-11-04.
Description of the change
hello
i have fixed some bugs and development.
https:/
https:/
Kindly review it.
Thanks
ssi
To post a comment you must log in.