Merge lp://staging/~openerp-dev/openobject-server/trunk-website-demo-partner-bth into lp://staging/~openerp-dev/openobject-server/trunk-website-al

Proposed by Harry (OpenERP)
Status: Merged
Merged at revision: 5084
Proposed branch: lp://staging/~openerp-dev/openobject-server/trunk-website-demo-partner-bth
Merge into: lp://staging/~openerp-dev/openobject-server/trunk-website-al
Diff against target: 673 lines (+186/-107)
4 files modified
openerp/addons/base/base_data.xml (+5/-2)
openerp/addons/base/base_demo.xml (+7/-3)
openerp/addons/base/res/res_partner_demo.xml (+146/-17)
openerp/addons/base/res/res_partner_demo.yml (+28/-85)
To merge this branch: bzr merge lp://staging/~openerp-dev/openobject-server/trunk-website-demo-partner-bth
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+191213@code.staging.launchpad.net

Description of the change

Hello,

 Added some demo data of partner. And update emails of partner.

Thanks.

To post a comment you must log in.
5042. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk-website-al.

5043. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:~openerp-dev/openobject-server/trunk-website-al.

5044. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk-website-al.

5045. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:~openerp-dev/openobject-server/trunk-website-al.

5046. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk-website-al.

5047. By Bhumi Thakkar (Open ERP)

[IMP]Email is updated.

5048. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk-website-al.

5049. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:~openerp-dev/openobject-server/trunk-website-al.

5050. By Bhumi Thakkar (Open ERP)

[IMP]Moved demo data from yml to xml.

5051. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:~openerp-dev/openobject-server/trunk-website-al.

5052. By Bhumi Thakkar (Open ERP)

[IMP]Set email address.

5053. By Bhumi Thakkar (Open ERP)

[IMP]Added address.

5054. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk-website-al.

5055. By Bhumi Thakkar (Open ERP)

[IMP]Improved country.

5056. By Bhumi Thakkar (Open ERP)

[IMP]Removed country.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.