Merge lp:~therp-nl/therp-addons/7.0_icons into lp:~therp-nl/therp-addons/7.0

Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 92
Proposed branch: lp:~therp-nl/therp-addons/7.0_icons
Merge into: lp:~therp-nl/therp-addons/7.0
Prerequisite: lp:~therp-nl/therp-addons/7.0_remove_account_report_alt
Diff against target: 75 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~therp-nl/therp-addons/7.0_icons
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) test Approve
Review via email: mp+191595@code.launchpad.net

This proposal supersedes a proposal from 2013-10-17.

Description of the change

add a generic therp-icon to all therp modules

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! One thing, you added an icon for trp_web_export_exclude. This module is not yet installable and contains an invalid import (for 7.0). This breaks the OpenERP server startup.

review: Needs Fixing (test)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

... this breaks the OpenERP server because the preloading of the image directory apparently forces an import of the module's python files.

lp:~therp-nl/therp-addons/7.0_icons updated
93. By Holger Brunn (Therp)

[FIX] remove icon causing broken module to be loaded

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Thanks, that's fixed now

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Tnx!

review: Approve (test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'edi_company_control_invoice/static'
2=== added directory 'edi_company_control_invoice/static/src'
3=== added directory 'edi_company_control_invoice/static/src/img'
4=== added file 'edi_company_control_invoice/static/src/img/icon.png'
5Binary files edi_company_control_invoice/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and edi_company_control_invoice/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
6=== added directory 'edi_company_control_purchase/static'
7=== added directory 'edi_company_control_purchase/static/src'
8=== added directory 'edi_company_control_purchase/static/src/img'
9=== added file 'edi_company_control_purchase/static/src/img/icon.png'
10Binary files edi_company_control_purchase/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and edi_company_control_purchase/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
11=== added directory 'edi_company_control_sale/static'
12=== added directory 'edi_company_control_sale/static/src'
13=== added directory 'edi_company_control_sale/static/src/img'
14=== added file 'edi_company_control_sale/static/src/img/icon.png'
15Binary files edi_company_control_sale/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and edi_company_control_sale/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
16=== added directory 'fetchmail_invoice/static'
17=== added directory 'fetchmail_invoice/static/src'
18=== added directory 'fetchmail_invoice/static/src/img'
19=== added file 'fetchmail_invoice/static/src/img/icon.png'
20Binary files fetchmail_invoice/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and fetchmail_invoice/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
21=== added directory 'hr_contract_legacy/static'
22=== added directory 'hr_contract_legacy/static/src'
23=== added directory 'hr_contract_legacy/static/src/img'
24=== added file 'hr_contract_legacy/static/src/img/icon.png'
25Binary files hr_contract_legacy/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and hr_contract_legacy/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
26=== added directory 'report_aeroo_ooo_plugin/static'
27=== added directory 'report_aeroo_ooo_plugin/static/src'
28=== added directory 'report_aeroo_ooo_plugin/static/src/img'
29=== added file 'report_aeroo_ooo_plugin/static/src/img/icon.png'
30Binary files report_aeroo_ooo_plugin/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and report_aeroo_ooo_plugin/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
31=== added directory 'trp_encrypted_backup/static'
32=== added directory 'trp_encrypted_backup/static/src'
33=== added directory 'trp_encrypted_backup/static/src/img'
34=== added file 'trp_encrypted_backup/static/src/img/icon.png'
35Binary files trp_encrypted_backup/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_encrypted_backup/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
36=== added directory 'trp_encrypted_backup_rsync/static'
37=== added directory 'trp_encrypted_backup_rsync/static/src'
38=== added directory 'trp_encrypted_backup_rsync/static/src/img'
39=== added file 'trp_encrypted_backup_rsync/static/src/img/icon.png'
40Binary files trp_encrypted_backup_rsync/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_encrypted_backup_rsync/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
41=== added directory 'trp_report_address/static'
42=== added directory 'trp_report_address/static/src'
43=== added directory 'trp_report_address/static/src/img'
44=== added file 'trp_report_address/static/src/img/icon.png'
45Binary files trp_report_address/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_report_address/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
46=== added directory 'trp_report_background/static'
47=== added directory 'trp_report_background/static/src'
48=== added directory 'trp_report_background/static/src/img'
49=== added file 'trp_report_background/static/src/img/icon.png'
50Binary files trp_report_background/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_report_background/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
51=== added directory 'trp_report_background_invoice/static'
52=== added directory 'trp_report_background_invoice/static/src'
53=== added directory 'trp_report_background_invoice/static/src/img'
54=== added file 'trp_report_background_invoice/static/src/img/icon.png'
55Binary files trp_report_background_invoice/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_report_background_invoice/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
56=== added directory 'trp_report_background_sale/static'
57=== added directory 'trp_report_background_sale/static/src'
58=== added directory 'trp_report_background_sale/static/src/img'
59=== added file 'trp_report_background_sale/static/src/img/icon.png'
60Binary files trp_report_background_sale/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_report_background_sale/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
61=== added directory 'trp_report_invoice_line_price/static'
62=== added directory 'trp_report_invoice_line_price/static/src'
63=== added directory 'trp_report_invoice_line_price/static/src/img'
64=== added file 'trp_report_invoice_line_price/static/src/img/icon.png'
65Binary files trp_report_invoice_line_price/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_report_invoice_line_price/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
66=== added directory 'trp_use_case/static'
67=== added directory 'trp_use_case/static/src'
68=== added directory 'trp_use_case/static/src/img'
69=== added file 'trp_use_case/static/src/img/icon.png'
70Binary files trp_use_case/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_use_case/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ
71=== added directory 'trp_web_export_newlines/static'
72=== added directory 'trp_web_export_newlines/static/src'
73=== added directory 'trp_web_export_newlines/static/src/img'
74=== added file 'trp_web_export_newlines/static/src/img/icon.png'
75Binary files trp_web_export_newlines/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and trp_web_export_newlines/static/src/img/icon.png 2013-10-18 07:46:24 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: