Merge lp:~openerp-dev/openobject-addons/trunk-bug-1163392-amitvora into lp:openobject-addons
Proposed by
Amit Vora(OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-bug-1163392-amitvora |
Merge into: | lp:openobject-addons |
Diff against target: |
115 lines (+29/-13) (has conflicts) 2 files modified
crm/crm_lead_view.xml (+24/-2) marketing/marketing_view.xml (+5/-11) Text conflict in crm/crm_lead_view.xml |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1163392-amitvora |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+157344@code.launchpad.net |
Description of the change
Hello,
I have fixed the issue search view vs form view, fields missing.
Thanks.
To post a comment you must log in.
Unmerged revisions
- 8665. By Mehul Mehta(OpenERP)
-
[Merge] merge with main addons
- 8664. By Amit Vora(OpenERP)
-
[FIX] add type_id and channel_id fields in form view