Merge lp:~openerp-dev/openobject-addons/7.0-opw-589931-rgo into lp:openobject-addons
Proposed by
Lithin T
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Naresh(OpenERP) | ||||
Proposed branch: | lp:~openerp-dev/openobject-addons/7.0-opw-589931-rgo | ||||
Merge into: | lp:openobject-addons | ||||
Diff against target: |
208 lines (+177/-0) (has conflicts) 1 file modified
audittrail/audittrail.py (+177/-0) Text conflict in audittrail/audittrail.py |
||||
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-589931-rgo | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lithin T (community) | Disapprove | ||
Review via email: mp+191347@code.launchpad.net |
Commit message
This fix is not traking when we deleting the records. So it should not be merged to the branch
To post a comment you must log in.
Hello Lithin,
Please don't propose a merge proposal to its opposite source version. Here you proposed this to trunk source while it was intended for stable 7.0. Infact already a merge proposal was available for stable 7.0 https:/ /code.launchpad .net/~openerp- dev/openobject- addons/ 7.0-opw- 589931- rgo/+merge/ 156130 so there was no need to do this extra work.
Please keep this note for future reference. It will save time for all of us.
Thanks,