Enapps OpenERP CSV Import Tool

Merge lp:~jri-openerp/enapps-csv-import-tool/terp-icon into lp:~enapps-london-uk/enapps-csv-import-tool/old_trunk

  1. terp-icon
  2. Merge into old_trunk
Proposed by Juan Rial (OpenERP)
Status: Needs review
Proposed branch: lp:~jri-openerp/enapps-csv-import-tool/terp-icon
Merge into: lp:~enapps-london-uk/enapps-csv-import-tool/old_trunk
Diff against target: 34 lines (+3/-3)
2 files modified
ea_import/ea_import_chain_result_view.xml (+2/-2)
ea_import/ea_import_chain_view.xml (+1/-1)
To merge this branch: bzr merge lp:~jri-openerp/enapps-csv-import-tool/terp-icon
Reviewer Review Type Date Requested Status
Enapps Ltd OpenERP Partner London UK Pending
Review via email: mp+105818@code.launchpad.net

Description of the change

LP bug #999694: fix terp-tools icon references

To post a comment you must log in.

Unmerged revisions

3. By Juan Rial (OpenERP)

LP bug #999694: fix terp-tools icon references

2. By Enapps Ltd OpenERP Partner London UK

fix invalid model reference

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ea_import/ea_import_chain_result_view.xml'
2--- ea_import/ea_import_chain_result_view.xml 2012-04-10 11:00:44 +0000
3+++ ea_import/ea_import_chain_result_view.xml 2012-05-15 13:52:19 +0000
4@@ -8,7 +8,7 @@
5 <field name="type">tree</field>
6 <field name="arch" type="xml">
7 <tree string="Import Result">
8- <button string="Show Result" type="object" name="show_result"/>
9+ <button string="Show Result" type="object" name="show_result" icon="terp-tools"/>
10 <field name="name"/>
11 <field name="chain_id" invisible="1"/>
12 <field name="result_ids_file"/>
13@@ -26,7 +26,7 @@
14 <field name="name"/>
15 <field name="chain_id" invisible="1"/>
16 <field name="result_ids_file"/>
17- <button string="Show Result" type="object" name="show_result" icon="terp-tool" colspan="8"/>
18+ <button string="Show Result" type="object" name="show_result" icon="terp-tools" colspan="8"/>
19 <field name="import_time"/>
20 </form>
21 </field>
22
23=== modified file 'ea_import/ea_import_chain_view.xml'
24--- ea_import/ea_import_chain_view.xml 2012-04-10 11:00:44 +0000
25+++ ea_import/ea_import_chain_view.xml 2012-05-15 13:52:19 +0000
26@@ -28,7 +28,7 @@
27 <field name="header" colspan="2"/>
28 <field name="separator" colspan="2"/>
29 <field name="delimiter" colspan="2"/>
30- <button string="Import Data" type="object" name="import_to_db" icon="terp-tool" colspan="2"/>
31+ <button string="Import Data" type="object" name="import_to_db" icon="terp-tools" colspan="2"/>
32 </group>
33 <group colspan="6">
34 <field name="link_ids" nolabel="1" colspan="8" height="300" context="{'chain_id': active_id}"/>

Subscribers

People subscribed via source and target branches