Merge lp:~openerp-dev/openobject-addons/trunk-improve-import into lp:openobject-addons

Proposed by Yogesh Parekh(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-improve-import
Merge into: lp:openobject-addons
Diff against target: 13 lines (+2/-1)
1 file modified
base_import/static/src/xml/import.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-improve-import
Reviewer Review Type Date Requested Status
Yogesh Parekh(OpenERP) (community) Needs Resubmitting
OpenERP Core Team Pending
Review via email: mp+217202@code.launchpad.net

Description of the change

Hello,

I have add a new div tag for display the FAQ while Import a csv File

Thanks,
ypa.

To post a comment you must log in.
9383. By Chirag Dodiya(OpenERP)

[MRG]Merged with lp:openobejct-addons

9384. By Yogesh Parekh(OpenERP)

[ADD]: I have add 'oe_padding' class in div tag

Revision history for this message
Yogesh Parekh(OpenERP) (yogesh.parekh-openerp) wrote :

Hello Sir,

I have make changes as per your suggestions.
Please Review it.

Thanks.

review: Needs Resubmitting
9385. By Yogesh Parekh(OpenERP)

[MERGE] Merge with addons

Unmerged revisions

9385. By Yogesh Parekh(OpenERP)

[MERGE] Merge with addons

9384. By Yogesh Parekh(OpenERP)

[ADD]: I have add 'oe_padding' class in div tag

9383. By Chirag Dodiya(OpenERP)

[MRG]Merged with lp:openobejct-addons

9382. By Yogesh Parekh(OpenERP)

[Add]: Add a new div to display questions while import the file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_import/static/src/xml/import.xml'
2--- base_import/static/src/xml/import.xml 2014-05-12 10:04:00 +0000
3+++ base_import/static/src/xml/import.xml 2014-05-16 11:33:39 +0000
4@@ -73,7 +73,8 @@
5
6 <div class="oe_import_error_report"></div>
7 <table class="oe_import_grid" />
8-
9+ </div>
10+ <div class="oe_padding">
11 <h2>Frequently Asked Questions</h2>
12
13 <dl>

Subscribers

People subscribed via source and target branches

to all changes: