Jay Vora (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-6351-jvo into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-6351-jvo/+merge/65771
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-6351-jvo/+merge/65771
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-6351-jvo.
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2011-01-14 00:11:01 +0000
+++ account/board_account_view.xml 2011-06-24 09:12:39 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
- <record id="note_account_type" model="board.note.type">
+ <record id="note_account_type" model="board.note.type">
<field name="name">Accountants</field>
</record>
@@ -20,23 +20,37 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
- <record id="action_company_analysis_tree" model="ir.actions.act_window">
- <field name="name">Company Analysis</field>
- <field name="res_model">account.entries.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
- <field name="view_id" ref="account.view_account_entries_report_tree"/>
- <field name="domain">[('year','=',time.strftime('%Y'))]</field>
- </record>
- <record id="action_treasory_graph" model="ir.actions.act_window">
- <field name="name">Treasury</field>
- <field name="res_model">account.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="domain">[('type','=','liquidity')]</field>
- <field name="view_id" ref="account.view_treasory_graph"/>
- </record>
+
+ <record id="action_company_analysis_tree" model="ir.actions.act_window">
+ <field name="name">Company Analysis</field>
+ <field name="res_model">account.entries.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+ <field name="view_id" ref="account.view_account_entries_report_tree"/>
+ <field name="domain">[('year','=',time.strftime('%Y'))]</field>
+ </record>
+
+ <record id="action_treasory_graph" model="ir.actions.act_window">
+ <field name="name">Treasury</field>
+ <field name="res_model">account.account</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','liquidity')]</field>
+ <field name="view_id" ref="account.view_treasory_graph"/>
+ </record>
+
+ <record id="action_draft_customer_invoices_dashboard" model="ir.actions.act_window">
+ <field name="name">Customer Invoices to Approve</field>
+ <field name="res_model">account.invoice</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar,graph</field>
+ <field eval="False" name="view_id"/>
+ <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+ <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+ <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+ </record>
+
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
@@ -45,7 +59,7 @@
<form string="Account Board">
<hpaned>
<child1>
- <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+ <action colspan="4" height="160" width="400" name="%(action_draft_customer_invoices_dashboard)d" string="Customer Invoices to Approve" />
<action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
</child1>
<child2>
=== modified file 'mrp/board_manufacturing_view.xml'
--- mrp/board_manufacturing_view.xml 2011-01-14 00:11:01 +0000
+++ mrp/board_manufacturing_view.xml 2011-06-24 09:12:39 +0000
@@ -14,7 +14,7 @@
<hpaned position="100">
<child1>
<action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/>
- <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
+ <action colspan="4" name="%(procurement.procurement_action_board)d" string="Procurements in Exception"/>
</child1>
<child2>
<action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load" groups="base.group_extended"/>
=== modified file 'project_planning/board_project_planning_view.xml'
--- project_planning/board_project_planning_view.xml 2011-01-14 00:11:01 +0000
+++ project_planning/board_project_planning_view.xml 2011-06-24 09:12:39 +0000
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
+
+ <record id="action_account_analytic_planning_stat_dashboard" model="ir.actions.act_window">
+ <field name="name">My Project's planning</field>
+ <field name="res_model">report_account_analytic.planning.stat</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('manager_id','=',uid),('planning_id.state','<>','cancel')]</field>
+ <field name="search_view_id" ref="project_planning.account_analytic_planning_stat_view_search"/>
+ </record>
+
<record id="board_project_planning_form" model="ir.ui.view">
<field name="name">board.project.planning.form</field>
<field name="model">board.board</field>
@@ -9,7 +18,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/hpaned/child1/action[@string='My Open Tasks']" position="after">
- <action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','<>','cancel')]"/>
+ <action colspan="4" name="%(action_account_analytic_planning_stat_dashboard)d" string="My Project's planning"/>
</xpath>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
