[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100701102952-qkj555qwqs3601ot
This commit is contained in:
Mustufa Rangwala 2010-07-01 15:59:52 +05:30
commit 595e632881
5 changed files with 2 additions and 9 deletions

View File

@ -329,6 +329,7 @@
domain="[('user_id','=', False)]"
help="Unassigned Opportunities" />
</field>
<field name="email_from"/>
<field name="section_id"
default="context.get('section_id', False)"
context="{'invisible_section': False}"

View File

@ -151,7 +151,7 @@
</record>
<record id="action_project_issue_report" model="ir.actions.act_window">
<field name="name">Project Issue</field>
<field name="name">Issue Analysis</field>
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>

View File

@ -6,8 +6,6 @@
<field name="tags">help, quick start, wiki, formatting</field>
<field name="minor_edit">0</field>
<field name="section">1</field>
<field name="create_uid" eval="1"/>
<field name="write_uid" eval="1"/>
<field name="toc">0</field>
<field name="summary">Initial Page</field>
<field name="text_area">=The Open ERP wiki=

View File

@ -8,8 +8,6 @@
<record id="wiki_wiki_quickstart0" model="wiki.wiki">
<field name="name">Basic Wiki Editing</field>
<field name="tags">help, quick start, wiki, formatting</field>
<field name="create_uid" eval="1"/>
<field name="write_uid" eval="1"/>
<field name="minor_edit">0</field>
<field name="toc">1</field>
<field name="section">1.1</field>

View File

@ -19,8 +19,6 @@
<field name="name">Bug Tracker ?</field>
<field name="tags">crm, bugs</field>
<field name="group_id" ref="wiki_groups_faq"/>
<field name="create_uid" eval="1"/>
<field name="write_uid" eval="1"/>
<field name="minor_edit">0</field>
<field name="toc">0</field>
<field name="review">1</field>
@ -58,8 +56,6 @@ Integration Benefits:
<field name="name">Document Management System ?</field>
<field name="tags">dms, document</field>
<field name="group_id" ref="wiki_groups_faq"/>
<field name="create_uid" eval="1"/>
<field name="write_uid" eval="1"/>
<field name="minor_edit">0</field>
<field name="toc">1</field>
<field name="section">1</field>