Merge lp:~openerp-dev/openobject-addons/trunk-warning-aja into lp:openobject-addons

Proposed by ajay javiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-warning-aja
Merge into: lp:openobject-addons
Diff against target: 88 lines (+3/-8)
5 files modified
account/data/account_data.xml (+0/-3)
account/demo/account_demo.xml (+0/-4)
edi/__openerp__.py (+1/-0)
edi/security/ir.model.access.csv (+2/-0)
sale/sale_demo.xml (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-warning-aja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+139195@code.launchpad.net

Description of the change

Hello,
Remove logger warning when module installed.
Thank You.

To post a comment you must log in.
8278. By ajay javiya (OpenERP)

[REM]: Remove unwanted changes

8279. By ajay javiya (OpenERP)

[MERGE]: Merge with main trunk

Unmerged revisions

8279. By ajay javiya (OpenERP)

[MERGE]: Merge with main trunk

8278. By ajay javiya (OpenERP)

[REM]: Remove unwanted changes

8277. By ajay javiya (OpenERP)

[REM]: Remove warning on installation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/data/account_data.xml'
2--- account/data/account_data.xml 2012-12-08 13:57:23 +0000
3+++ account/data/account_data.xml 2012-12-12 06:40:25 +0000
4@@ -16,7 +16,6 @@
5 </record>
6
7 <record id="account_payment_term_line_immediate" model="account.payment.term.line">
8- <field name="name">Immediate Payment</field>
9 <field name="value">balance</field>
10 <field eval="0" name="days"/>
11 <field eval="0" name="days2"/>
12@@ -30,7 +29,6 @@
13 </record>
14
15 <record id="account_payment_term_line_15days" model="account.payment.term.line">
16- <field name="name">15 Days</field>
17 <field name="value">balance</field>
18 <field eval="15" name="days"/>
19 <field eval="0" name="days2"/>
20@@ -48,7 +46,6 @@
21 </record>
22
23 <record id="account_payment_term_line_net" model="account.payment.term.line">
24- <field name="name">30 Net Days</field>
25 <field name="value">balance</field>
26 <field eval="30" name="days"/>
27 <field eval="0" name="days2"/>
28
29=== modified file 'account/demo/account_demo.xml'
30--- account/demo/account_demo.xml 2012-12-08 13:57:23 +0000
31+++ account/demo/account_demo.xml 2012-12-12 06:40:25 +0000
32@@ -135,7 +135,6 @@
33 <field name="note">30 Days End of Month</field>
34 </record>
35 <record id="account_payment_term_line" model="account.payment.term.line">
36- <field name="name">30 Days End of Month</field>
37 <field name="value">balance</field>
38 <field eval="30" name="days"/>
39 <field eval="-1" name="days2"/>
40@@ -147,16 +146,13 @@
41 <field name="note">30% Advance End 30 Days</field>
42 </record>
43 <record id="account_payment_term_line_advance1" model="account.payment.term.line">
44- <field name="name">30% Advance</field>
45 <field name="value">procent</field>
46- <field eval="3" name="sequence"/>
47 <field eval="0.300000" name="value_amount"/>
48 <field eval="0" name="days"/>
49 <field eval="0" name="days2"/>
50 <field eval="account_payment_term_advance" name="payment_id"/>
51 </record>
52 <record id="account_payment_term_line_advance2" model="account.payment.term.line">
53- <field name="name">Remaining Balance</field>
54 <field name="value">balance</field>
55 <field eval="30" name="days"/>
56 <field eval="-1" name="days2"/>
57
58=== modified file 'edi/__openerp__.py'
59--- edi/__openerp__.py 2012-11-29 22:26:45 +0000
60+++ edi/__openerp__.py 2012-12-12 06:40:25 +0000
61@@ -35,6 +35,7 @@
62 'author': 'OpenERP SA',
63 'website': 'http://www.openerp.com',
64 'depends': ['base', 'email_template'],
65+ 'data': ['security/ir.model.access.csv'],
66 'icon': '/edi/static/src/img/knowledge.png',
67 'test': ['test/edi_partner_test.yml'],
68 'js': ['static/src/js/edi.js'],
69
70=== added directory 'edi/security'
71=== added file 'edi/security/ir.model.access.csv'
72--- edi/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
73+++ edi/security/ir.model.access.csv 2012-12-12 06:40:25 +0000
74@@ -0,0 +1,2 @@
75+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
76+access_edi_edi,access_edi_edi,model_edi_edi,,1,1,1,1
77
78=== modified file 'sale/sale_demo.xml'
79--- sale/sale_demo.xml 2012-11-29 22:26:45 +0000
80+++ sale/sale_demo.xml 2012-12-12 06:40:25 +0000
81@@ -329,7 +329,6 @@
82 <field name="type">service</field>
83 <field name="list_price">150.0</field>
84 <field name="standard_price">100.0</field>
85- <field name="supply_method">produce</field> <!-- TODO this is a procurement field, which is not a sale dependency -->
86 <field name="uom_id" ref="product.product_uom_day"/>
87 <field name="uom_po_id" ref="product.product_uom_day"/>
88 <field name="company_id" eval="[]"/>

Subscribers

People subscribed via source and target branches

to all changes: