[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
This commit is contained in:
atp (Open ERP)
2010-06-22 10:45:44 +05:30
1042 changed files with 22001 additions and 56912 deletions
+6 -2
View File
@@ -30,7 +30,10 @@
* to manage your events and their registrations
* to use emails to automatically confirm and send acknowledgements for any registration to an event
* ...
A dashboard for associations that includes:
* Registration by Events (graph)
* Next Events (list)
* Unpaid Invoices (list)
Note that:
- You can define new types of events in
Events / Configuration / Types of Events
@@ -49,8 +52,9 @@
'security/ir.model.access.csv',
'wizard/event_registrations_partner.xml',
'wizard/event_make_invoice_view.xml',
'board_association_view.xml',
],
'demo_xml': ['event_demo.xml'],
'demo_xml': ['event_demo.xml', 'board_association_demo.xml'],
'test': ['test/test_event.yml'],
'installable': True,
'active': False,
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<!--
Administrator shortcut
Demo user startup menu
-->
<record model="ir.ui.view_sc" id="sc_association_dash">
<field name="name">Dashboard</field>
<field name="user_id" ref="base.user_root"/>
<field name="resource">ir.ui.menu</field>
<field name="sequence">1</field>
<field name="res_id" ref="menu_board_associations_manager"/>
</record>
<record model="res.users" id="base.user_root">
<field name="action_id" ref="open_board_associations_manager"/>
</record>
</data>
</openerp>
+68
View File
@@ -0,0 +1,68 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Need to merge this action in associations -->
<!-- <action
string="My Tasks"
name="%(project.action_view_task)d"
colspan="4"
height="200"
width="510"
domain="[('user_id', '=', uid),('state','in',('open','draft'))]"/>
<action
string="New members"
name="%(membership.action_report_partner_member_year_tree)d"
view_mode="graph,tree" colspan="4"/>-->
<record model="board.note.type" id="note_association_type">
<field name="name">associations</field>
</record>
<record model="ir.ui.view" id="board_associations_manager_form">
<field name="name">board.associations.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Association Dashboard">
<hpaned position="100">
<child1>
<action string="Next Events"
name="%(event.action_event_registration_report)d"
colspan="4"/>
<action
string="Unpaid Invoices"
name="%(account.action_invoice_tree)d"
colspan="4"
domain="[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]"/>
</child1>
<child2>
<action
string="Registrations by Events"
name="%(event.action_event_type_registration)d"
view_mode="graph,tree"
colspan="4"/>
</child2>
</hpaned>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="open_board_associations_manager">
<field name="name">Association Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="board_associations_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
<menuitem
name="Associations" parent="board_associations"
action="open_board_associations_manager"
sequence="1"
id="menu_board_associations_manager"
icon="terp-graph"/>
</data>
</openerp>