odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge branch lp:~openerp-commiter/openobject-addons/ergonomy-search-views to improve search view of report_XXX modules, menu per object 

bzr revid: hmo@tinyerp.com-20091211130521-v3n6bp4dtfxvjdbs
This commit is contained in:
Harry (Open ERP) 2009-12-11 18:35:21 +05:30
parent 36854a15a5 4f32899799
commit a858f6c2cd
73 changed files with 1179 additions and 2034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/account_analytic_line.py
View File

@ -24,6 +24,7 @@ import time
from osv import fields
from osv import osv
from tools.translate import _
import tools
class account_analytic_line(osv.osv):
_name = 'account.analytic.line'
@ -113,20 +114,24 @@ class timesheet_invoice(osv.osv):
_description = "Analytic account costs and revenues"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True),
'quantity': fields.float('Quantities', readonly=True),
'cost': fields.float('Credit', readonly=True),
'revenue': fields.float('Debit', readonly=True)
'revenue': fields.float('Debit', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, account_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal')
cr.execute("""
create or replace view report_hr_timesheet_invoice_journal as (
select
min(l.id) as id,
date_trunc('month', l.date)::date as name,
to_char(l.date, 'YYYY') as name,
to_char(l.date,'MM') as month,
sum(
CASE WHEN l.amount>0 THEN 0 ELSE l.amount
END
@ -141,7 +146,8 @@ class timesheet_invoice(osv.osv):
from account_analytic_line l
LEFT OUTER join product_uom u on (u.id=l.product_uom_id)
group by
date_trunc('month', l.date),
to_char(l.date, 'YYYY'),
to_char(l.date,'MM'),
journal_id,
account_id
)""")

237
addons/account/account_invoice_view.xml
View File

@ -384,15 +384,6 @@
<field name="act_window_id" ref="action_invoice_tree1"/>
</record>
<menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree1_new" model="ir.actions.act_window">
<field name="name">New Customer Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_form" name="view_id"/>
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
</record>
<record id="action_invoice_tree2" model="ir.actions.act_window">
<field name="name">Supplier Invoices</field>
@ -405,15 +396,6 @@
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree2_new" model="ir.actions.act_window">
<field name="name">New Supplier Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_supplier_form" name="view_id"/>
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
</record>
<record id="action_invoice_tree3" model="ir.actions.act_window">
<field name="name">Customer Refunds</field>
@ -441,16 +423,6 @@
<menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree3_new" model="ir.actions.act_window">
<field name="name">New Customer Refund</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_form" name="view_id"/>
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
</record>
<record id="action_invoice_tree4" model="ir.actions.act_window">
<field name="name">Supplier Refunds</field>
<field name="res_model">account.invoice</field>
@ -463,215 +435,6 @@
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree4_new" model="ir.actions.act_window">
<field name="name">New Supplier Refund</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_supplier_form" name="view_id"/>
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
</record>
<record id="action_invoice_tree5" model="ir.actions.act_window">
<field name="name">Draft Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<record id="action_invoice_tree5_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<record id="action_invoice_tree6" model="ir.actions.act_window">
<field name="name">PRO-FORMA Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<record id="action_invoice_tree7" model="ir.actions.act_window">
<field name="name">Unpaid Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<record id="action_invoice_tree7_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<record id="action_invoice_tree8" model="ir.actions.act_window">
<field name="name">Draft Supplier Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<record id="action_invoice_tree8_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<record id="action_invoice_tree9" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<record id="action_invoice_tree9_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<record id="action_invoice_tree10" model="ir.actions.act_window">
<field name="name">Draft Customer Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<record id="action_invoice_tree10_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<record id="action_invoice_tree11" model="ir.actions.act_window">
<field name="name">Unpaid Customer Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<record id="action_invoice_tree11_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<record id="action_invoice_tree12" model="ir.actions.act_window">
<field name="name">Draft Supplier Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<record id="action_invoice_tree12_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<record id="action_invoice_tree13" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<record id="action_invoice_tree13_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>

63
addons/account/project/project_view.xml
View File

@ -17,6 +17,25 @@
</tree>
</field>
</record>
<record id="view_account_analytic_account_search" model="ir.ui.view">
<field name="name">account.analytic.account.search</field>
<field name="model">account.analytic.account</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Account">
<group col="8" colspan="4">
<filter icon="gtk-execute" string="My Accounts" domain="[('user_id','=',uid)]" help="My Analytic Accounts"/>
<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="partner_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="view_account_analytic_account_tree" model="ir.ui.view">
<field name="name">account.analytic.account.tree</field>
@ -77,6 +96,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph,form</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
@ -109,15 +129,8 @@
<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
<record id="analytic_account_form" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,graph</field>
<field eval="view_account_analytic_account_form" name="view_id"/>
</record>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/>
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@ -349,33 +362,43 @@
<field name="arch" type="xml">
<graph string="Analytic Entries Stats" type="bar">
<field name="name"/>
<field name="month"/>
<field name="cost" operator="+"/>
<field name="revenue" operator="+"/>
<field group="True" name="journal_id"/>
</graph>
</field>
</record>
<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">
<field name="name">report.hr.timesheet.invoice.journal.search</field>
<field name="model">report.hr.timesheet.invoice.journal</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Entries Stats">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
<field name="name">Account cost and revenue by journal</field>
<field name="res_model">report.hr.timesheet.invoice.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
</record>
<menuitem id="next_id_42" name="All Months" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="next_id_42"/>
<record id="report_account_analytic_journal_tree_month" model="ir.actions.act_window">
<field name="name">Account cost and revenue by journal (This Month)</field>
<field name="res_model">report.hr.timesheet.invoice.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_43" name="This Month" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree_month" id="report_account_analytic_journal_print_month" parent="next_id_43"/>
<menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
<record id="view_account_journal_1" model="ir.ui.view">

73
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -1,70 +1,28 @@
<openerp>
<data>
<record id="action_account_analytic_managed" model="ir.actions.act_window">
<field name="name">My Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_account" name="Analytic Accounts" parent="next_id_71" sequence="10"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
<menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="menu_account"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
<record id="action_hr_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
</record>
<menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="menu_invoicing"/>
<record id="action_account_analytic_managed_open" model="ir.actions.act_window">
<field name="name">My Current Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
<field name="name">My Pending Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_account_analytic_all" model="ir.actions.act_window">
<field name="name">All Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
<field name="domain">[]</field>
</record>
<menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.menu_account"/>
<menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Overpassed Accounts</field>
@ -72,32 +30,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing"/>
<record id="action_account_analytic_all_open" model="ir.actions.act_window">
<field name="name">Current Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_account_analytic_all_pending" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
</data>
</openerp>

1
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -90,7 +90,6 @@
<field name="arch" type="xml">
<field name="date" position="before">
<field name="last_invoice_date"/>
<field name="ca_to_invoice"/>
</field>

8
addons/account_report/account_view.xml
View File

@ -93,14 +93,6 @@
<menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration"/>
<record id="action_account_report_form" model="ir.actions.act_window">
<field name="name">New Reporting Item Formula</field>
<field name="res_model">account.report.report</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="action_account_report_form" id="menu_action_account_report_form" parent="account_report.menu_action_account_report_tree_define"/>
<record id="view_account_report_tree" model="ir.ui.view">
<field name="name">account.report.report.tree</field>
<field name="model">account.report.report</field>

2
addons/account_voucher/__terp__.py
View File

@ -41,8 +41,8 @@
"update_xml" : [
"voucher_sequence.xml",
"account_report.xml",
"voucher_wizard.xml",
"voucher_view.xml",
"voucher_wizard.xml",
"account_view.xml",
],
'certificate': '0037580727101',

109
addons/account_voucher/voucher_view.xml
View File

@ -77,8 +77,8 @@
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
</record>
<menuitem name="Financial Management/Voucher Entries"
id="menu_action_voucher_list" action="action_voucher_list"/>
<menuitem action="action_voucher_list" id="menu_action_voucher_list"
name="Voucher Entries" parent="account.menu_finance"/>
<!-- Receipt Vouchers -->
<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
@ -90,8 +90,8 @@
<field name="domain">[('type','like','rec_voucher')]</field>
<field name="context">{'type':'rec_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers"
id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list"/>
<menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list"
action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
<field name="name">Cash Receipt</field>
@ -102,20 +102,9 @@
<field name="domain">[('type','=','rec_voucher')]</field>
<field name="context">{'type':'rec_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts"
id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
<menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list"
action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
<field name="name">Cash Receipt Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="domain">[('type','=','rec_voucher')]</field>
<field name="context">{'type':'rec_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
<record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
<field name="name">Bank Receipt</field>
<field name="res_model">account.voucher</field>
@ -125,20 +114,8 @@
<field name="domain">[('type','=','bank_rec_voucher')]</field>
<field name="context">{'type':'bank_rec_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts"
id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
<field name="name">Bank Receipt Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="domain">[('type','=','bank_rec_voucher')]</field>
<field name="context">{'type':'bank_rec_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
<menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list"
action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
<!-- End Receipt Vouchers -->
@ -153,8 +130,8 @@
<field name="domain">[('type','like','pay_voucher')]</field>
<field name="context">{'type':'pay_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Payment Vouchers"
id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
<menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list"
action="action_payments_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
<field name="name">Payment Vouchers</field>
@ -165,20 +142,9 @@
<field name="domain">[('type','=','pay_voucher')]</field>
<field name="context">{'type':'pay_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments"
id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
<menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list"
action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
<field name="name">Cash Payment Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="domain">[('type','=','pay_voucher')]</field>
<field name="context">{'type':'pay_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
<record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
<field name="name">Payment Vouchers</field>
<field name="res_model">account.voucher</field>
@ -188,19 +154,8 @@
<field name="domain">[('type','=','bank_pay_voucher')]</field>
<field name="context">{'type':'bank_pay_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments"
id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
<field name="name">Bank Payment Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="domain">[('type','=','bank_pay_voucher')]</field>
<field name="context">{'type':'bank_pay_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
<menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list"
action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>
<!-- End Payment Vouchers -->
@ -212,53 +167,57 @@
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
</record>
<menuitem name="Financial Management/Voucher Entries/Other Vouchers"
id="menu_action_other_voucher_list" action="action_other_voucher_list"/>
<menuitem name="Other Vouchers" id="menu_action_other_voucher_list"
action="action_other_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_cont_voucher_form">
<field name="name">Contra Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
<field name="domain">[('type','=','cont_voucher')]</field>
<field name="context">{'type':'cont_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Contra Voucher" id="menu_action_view_cont_voucher_form" action="action_view_cont_voucher_form"/>
<menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form"
action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
<field name="name">Journal Sale Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
<field name="domain">[('type','=','journal_sale_vou')]</field>
<field name="context">{'type':'journal_sale_vou'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
<menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form"
action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
<field name="name">Journal Purchase Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
<field name="domain">[('type','=','journal_pur_voucher')]</field>
<field name="context">{'type':'journal_pur_voucher'}</field>
</record>
<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
<menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form"
action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_voucher_form">
<field name="name">Journal Voucher</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="view_voucher_form"/>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/>
<field name="domain">[('type','=','journal_voucher')]</field>
<field name="context">{'type':'journal_voucher'}</field>
</record>
<menuitem
name="Financial Management/Voucher Entries/Other Vouchers/Journal Voucher"
id="menu_action_view_jour_voucher_form"
action="action_view_jour_voucher_form"/>
name="Journal Voucher" id="menu_action_view_jour_voucher_form"
action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>
</data>
</openerp>

5
addons/account_voucher/voucher_wizard.xml
View File

@ -11,9 +11,10 @@
<menuitem
action="wizard_account_voucher_open"
id="menu_wizard_account_voucher_open"
name="Financial Management/Voucher Entries/Open Vouchers"
name="Open Vouchers"
sequence="0"
type="wizard"/>
type="wizard"
parent="menu_action_voucher_list"/>
</data>
</openerp>

30
addons/auction/auction_view.xml
View File

@ -141,15 +141,6 @@
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_auction_dates1">
<field name="res_model">auction.dates</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_auction_dates_form"/>
</record>
<menuitem name="New Auction Dates" parent="auction_date_menu" id="menu_auction_dates_new" action="action_auction_dates1"/>
=======================================================
Auction Management/Auction Dates/Reporting
=======================================================
@ -1245,14 +1236,6 @@ My Latest Objects
My Latest Deposit
==============================
<record model="ir.actions.act_window" id="action_report_latest_doposit_tree">
<field name="res_model">auction.deposit</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('create_uid','=',uid)]</field>
</record>
<menuitem name="My Latest Deposits" action="action_report_latest_doposit_tree" id="menu_report_latest_doposit_tree" parent="auction_report_employees_menu"/>
<record model="ir.actions.act_window" id="action_report_latest_doposit_manager_tree">
<field name="res_model">auction.deposit</field>
<field name="view_type">form</field>
@ -1304,13 +1287,6 @@ Objects per Day
</field>
</record>
<record model="ir.actions.act_window" id="action_report_auction_object_date_tree_my">
<field name="res_model">report.auction.object.date</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('user_id','=',uid),('month','=',time.strftime('%Y-%m-01'))]</field>
</record>
<record model="ir.actions.act_window" id="action_report_auction_object_date_tree">
<field name="res_model">report.auction.object.date</field>
<field name="view_type">form</field>
@ -1322,12 +1298,6 @@ Objects per Day
action="action_report_auction_object_date_tree"
id="menu_report_auction_object_date_tree"
parent="auction_report_manager_menu"/>
<menuitem
name="My Encoded Objects Per Day"
action="action_report_auction_object_date_tree_my"
id="menu_report_auction_object_date_tree1_my"
parent="auction_report_employees_menu"/>
<record model="ir.actions.act_window" id="view_report_object_by_auction">
<field name="name">Detailed lots</field>

2
addons/board_account/board_account_view.xml
View File

@ -45,7 +45,7 @@
<action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
<action colspan="4" height="160" name="%(account.action_invoice_tree5)d" string="Draft invoices"/>
<action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Customer invoices"/>
</child1>
<child2>

8
addons/board_association/board_association_view.xml
View File

@ -17,14 +17,14 @@
name="%(event.action_event_registration)d"
colspan="4"/>
<action
string="My tasks"
name="%(project.action_view_task5_prog)d"
string="Tasks"
name="%(project.action_view_task)d"
colspan="4"
height="200"
width="510"/>
<action
string="Unpaid Invoices"
name="%(account.action_invoice_tree7)d"
string="Invoices"
name="%(account.action_invoice_tree)d"
colspan="4"/>
</child1>

8
addons/board_auction/board_auction_view.xml
View File

@ -18,8 +18,8 @@
name="%(auction.action_report_latest_objects_tree)d"
height="200"
width="510"/>
<action string="My Latest Deposits"
name="%(auction.action_report_latest_doposit_tree)d"
<action string="Latest Deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_member_tree)d"
@ -35,8 +35,8 @@
colspan="4"/>
<action
string="My objects By Day"
name="%(auction.action_report_auction_object_date_tree_my)d"
string="Objects By Day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4"/>
<action
string="Estimations/Adjudication"

2
addons/board_document/board_document_view.xml
View File

@ -15,7 +15,7 @@
<child1>
<action
string="New Files"
name="%(report_document.action_view_all_document_tree)d"
name="%(report_document.action_view_all_document_tree1)d"
view_mode="tree"/>
<action

2
addons/board_manufacturing/board_manufacturing_view.xml
View File

@ -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="%(stock.action_picking_tree2)d" string="Deliveries (Out picking)"/>
<action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries"/>
<action colspan="4" name="%(mrp.mrp_procurement_action4)d" string=" Requisition in Exception"/>
</child1>

2
addons/board_project/board_project_manager_view.xml
View File

@ -64,7 +64,7 @@
<button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_my_manager_form)d" string="My project's planning"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="Project's planning"/>
<action colspan="4" name="%(action_project_pipeline_user)d" string="My user's pipeline"/>

4
addons/board_project/board_project_view.xml
View File

@ -60,8 +60,8 @@
<action colspan="4" height="150" name="%(action_view_board_note_tree)d" string="Public Notes"/>
</child1>
<child2>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_my_form)d" string="My Planning"/>
<action colspan="4" name="%(report_timesheet.action_timesheet_user_stat_my)d" string="My Timesheet"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="Planning"/>
<action colspan="4" name="%(report_timesheet.action_timesheet_user_stat_all)d" string="Timesheets"/>
</child2>
</hpaned>
</form>

6
addons/board_sale/board_sale_view.xml
View File

@ -13,14 +13,14 @@
<form string="Sales manager board">
<hpaned position="100">
<child1>
<action colspan="4" height="200" name="%(sale.action_order_tree10)d" string="My open quotations" width="510"/>
<action colspan="4" height="200" name="%(sale.action_order_tree5)d" string="All quotations" width="510"/>
<action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree_month_my)d" string="Cases statistics"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
</child1>
<child2>
<action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree_month)d" string="Cases of the month" view_mode="graph,tree"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>
</child2>
</hpaned>
</form>

1
addons/caldav/security/ir.model.access.csv
View File

@ -1,3 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"caldav_calendar_all","caldav.calendar","model_caldav_calendar",,1,1,1,1
"caldav_event_all","caldav.event","model_caldav_event",,1,1,1,1
"caldav_attendee_all","caldav.attendee","model_caldav_attendee",,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 caldav_calendar_all caldav.calendar model_caldav_calendar 1 1 1 1
3 caldav_event_all caldav.event model_caldav_event 1 1 1 1
4 caldav_attendee_all caldav.attendee model_caldav_attendee 1 1 1 1

2
addons/crm/crm_config.py
View File

@ -121,7 +121,7 @@ class crm_menu_config_wizard(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64),
'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
'lead': fields.boolean('Prospect', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),

38
addons/crm/crm_meeting_menu.xml
View File

@ -116,44 +116,6 @@
</record>
<menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>
<!--
MY MEETINGS
-->
<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
<field name="res_model">crm.case</field>
<field name="view_mode">calendar,tree,form,graph,gantt</field>
<field name="view_id" ref="crm_case_calendar_view_meet"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id.calendar\',\'=\',1)]'"/>
<field name="context" eval="{'default_state':'open'}"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_crm_case_meetings_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
<field name="sequence" eval="1"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="crm_case_calendar_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meetmy"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
<field name="sequence" eval="2"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meetmy"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meetmy"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_my">
<field name="sequence" eval="1"/>
<field name="view_mode">gantt</field>
<field name="view_id" ref="crm_case_gantt_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meetmy"/>
</record>
<menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
<!--
ALL MEETINGS
-->

3
addons/crm/crm_meeting_view.xml
View File

@ -101,8 +101,9 @@
<field name="arch" type="xml">
<search string="Search Meetings">
<group col="10" colspan="4">
<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" />
<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" />
<filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" />
<filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" />
<separator orientation="vertical"/>
<field name="name" select="1" string="Subject"/>
<field name="partner_id" select="1"/>

128
addons/crm/crm_report_view.xml
View File

@ -6,9 +6,6 @@
#
<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"
sequence="50"/>
<menuitem id="next_id_65" name="This Month" parent="next_id_64" />
<menuitem id="next_id_66" name="All Months"
parent="next_id_64"/>
<record model="ir.ui.view" id="view_crm_case_section_categ_tree">
<field name="name">CRM Report - Sections and Type(Tree)</field>
@ -17,6 +14,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section and Type">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="category2_id"/>
@ -35,6 +33,7 @@
<field name="arch" type="xml">
<form string="Cases by Section and Category2">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" select="1" widget="selection"/>
<field name="category2_id" select="1"/>
@ -58,21 +57,34 @@
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree_month">
<field name="res_model">report.crm.case.section.categ2</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem parent="next_id_65" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree_month" id="menu_crm_case_section_categ_tree_month"/>
<record id="view_crm_case_section_categ_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Type(Select)</field>
<field name="model">report.crm.case.section.categ2</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Cases by Section and Type">
<group col="10" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="category2_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree">
<field name="res_model">report.crm.case.section.categ2</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_crm_case_section_categ_filter"/>
</record>
<menuitem parent="next_id_66" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
<menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
#
# Cases by section and stage
@ -85,6 +97,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section and Stage">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="stage_id"/>
@ -102,6 +115,7 @@
<field name="arch" type="xml">
<form string="Cases by Section and Stage">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" select="1" widget="selection"/>
<field name="stage_id"/>
@ -124,20 +138,32 @@
</graph>
</field>
</record>
<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Stage(Select)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Cases by Section and Stage">
<group col="8" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree_month">
<field name="res_model">report.crm.case.section.stage</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem parent="next_id_65" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree_month" id="menu_crm_case_section_stage_tree_month"/>
<record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree">
<field name="res_model">report.crm.case.section.stage</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
</record>
<menuitem parent="next_id_66" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>
<menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>
#
# Cases by section, category and stage
@ -150,7 +176,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section, Category and Stage">
<field name="name"/>
<field name="year"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="categ_id"/>
@ -168,7 +194,7 @@
<field name="arch" type="xml">
<form string="Cases by Section, Category and Stage">
<field name="name"/>
<field name="year"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" select="1" widget="selection"/>
<field name="categ_id"/>
@ -187,9 +213,9 @@
<field name="arch" type="xml">
<search string="Cases by Section, Category and Stage">
<group col='8' colspan='4'>
<filter string="Year" icon="terp-hr" domain="[('year','=',time.localtime()[0])]"/>
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-hr" domain="[('name','=',time.localtime()[1])]"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
@ -199,21 +225,25 @@
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree_month">
<field name="res_model">report.crm.case.section.categ.stage</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
<field name="name">CRM Report - Section, Category and Stage(Select)</field>
<field name="model">report.crm.case.section.categ.stage</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Cases by Section, Category and Stage" type="bar" orientation="horizontal">
<field name="categ_id"/>
<field name="nbr" operator="+"/>
<field name="section_id" group="True"/>
</graph>
</field>
</record>
<menuitem parent="next_id_65" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree_month" id="menu_crm_case_section_categ_stage_tree_month"/>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree">
<field name="res_model">report.crm.case.section.categ.stage</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/>
</record>
<menuitem parent="next_id_66" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>
<menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>
#
# Cases by section, category and category2
@ -226,7 +256,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section, Category and Type">
<field name="name"/>
<field name="year"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="categ_id"/>
@ -245,7 +275,7 @@
<field name="arch" type="xml">
<form string="Cases by Section, Category and Type">
<field name="name"/>
<field name="year"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" select="1" widget="selection"/>
<field name="categ_id"/>
@ -265,9 +295,9 @@
<field name="arch" type="xml">
<search string="Search Cases by User">
<group col='12' colspan='4'>
<filter string="Year" icon="terp-hr" domain="[('year','=',time.localtime()[0])]"/>
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-hr" domain="[('name','=',time.localtime()[1])]"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
@ -275,20 +305,26 @@
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree_month">
<field name="res_model">report.crm.case.section.categ.categ2</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem parent="next_id_65" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree_month" id="menu_crm_case_section_categ_categ2_tree_month"/>
<record model="ir.ui.view" id="view_crm_case_section_categ_categ2_graph">
<field name="name">CRM Report - Section, Category and Type(Select)</field>
<field name="model">report.crm.case.section.categ.categ2</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Cases by Section, Category and Type" type="bar" orientation="horizontal">
<field name="category2_id"/>
<field name="nbr" operator="+"/>
<field name="section_id" group="True"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree">
<field name="res_model">report.crm.case.section.categ.categ2</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_section_categ_categ2_filter"/>
</record>
<menuitem parent="next_id_66" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
<menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
</data>
</openerp>

31
addons/crm/crm_view.xml
View File

@ -467,7 +467,7 @@
</record>
<record id="crm_case_categ0-act" model="ir.actions.act_window">
<field name="name">All Cases</field>
<field name="name">Cases</field>
<field name="res_model">crm.case</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_tree-view"/>
@ -483,24 +483,6 @@
<field name="search_view_id" ref="view_crm_case_filter"/>
</record>
<record id="crm_case_categ0-act_my" model="ir.actions.act_window">
<field name="name">My cases</field>
<field name="res_model">crm.case</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_crm_case_filter"/>
</record>
<menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended"/>
<record id="crm_case_categ0-act_my_open" model="ir.actions.act_window">
<field name="name">My Open Cases</field>
<field name="res_model">crm.case</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
<field name="search_view_id" ref="view_crm_case_filter"/>
</record>
<record id="crm_case_section_open_act" model="ir.actions.act_window">
<field name="name">Cases</field>
<field name="res_model">crm.case</field>
@ -540,16 +522,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm_case_history_tree-view"/>
</record>
<menuitem id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
<menuitem action="crm_case_history-act" id="menu_crm_case_history-act" parent="crm.menu_crm_case_history-act_main"/>
<record id="crm_case_history_my-act" model="ir.actions.act_window">
<field name="name">My Histories</field>
<field name="res_model">crm.case.history</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="crm_case_history_my-act" id="menu_crm_case_history_my-act" parent="crm.menu_crm_case_history-act_main"/>
<menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
<record id="crm_segmentation_line_tree-view" model="ir.ui.view">
<field name="name">crm.segmentation.line.tree</field>

40
addons/crm/report/crm_report.py
View File

@ -36,7 +36,9 @@ class report_crm_case_section_categ2(osv.osv):
_description = "Cases by section and category2"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True),
@ -54,7 +56,8 @@ class report_crm_case_section_categ2(osv.osv):
create view report_crm_case_section_categ2 as (
select
min(c.id) as id,
to_char(c.create_date,'YYYY-MM')||'-01' as name,
to_char(c.create_date,'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.user_id,
c.state,
c.category2_id,
@ -66,7 +69,7 @@ class report_crm_case_section_categ2(osv.osv):
from
crm_case c
where c.category2_id is not null
group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.category2_id, c.section_id)""")
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.user_id, c.state, c.stage_id, c.category2_id, c.section_id)""")
report_crm_case_section_categ2()
@ -75,7 +78,9 @@ class report_crm_case_section_stage(osv.osv):
_description = "Cases by section and stage"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
@ -93,7 +98,8 @@ class report_crm_case_section_stage(osv.osv):
create view report_crm_case_section_stage as (
select
min(c.id) as id,
to_char(c.create_date,'YYYY-MM')||'-01' as name,
to_char(c.create_date,'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.user_id,
c.state,
c.stage_id,
@ -104,7 +110,7 @@ class report_crm_case_section_stage(osv.osv):
from
crm_case c
where c.stage_id is not null
group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.section_id)""")
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.user_id, c.state, c.stage_id, c.section_id)""")
report_crm_case_section_stage()
@ -113,8 +119,9 @@ class report_crm_case_section_categ_stage(osv.osv):
_description = "Cases by section, Category and stage"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'year': fields.char('Year',size=64,readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
@ -131,8 +138,8 @@ class report_crm_case_section_categ_stage(osv.osv):
create view report_crm_case_section_categ_stage as (
select
min(c.id) as id,
to_char(c.create_date,'YYYY') as year,
to_char(c.create_date,'YYYY-MM')||'-01' as name,
to_char(c.create_date,'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.user_id,
c.categ_id,
c.state,
@ -143,7 +150,7 @@ class report_crm_case_section_categ_stage(osv.osv):
from
crm_case c
where c.categ_id is not null AND c.stage_id is not null
group by to_char(c.create_date,'YYYY'),to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.state, c.stage_id, c.section_id)""")
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),c.user_id, c.categ_id, c.state, c.stage_id, c.section_id)""")
report_crm_case_section_categ_stage()
@ -152,8 +159,9 @@ class report_crm_case_section_categ_categ2(osv.osv):
_description = "Cases by section, Category and Category2"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'year': fields.char('Year',size=64,readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True),
@ -171,8 +179,8 @@ class report_crm_case_section_categ_categ2(osv.osv):
create view report_crm_case_section_categ_categ2 as (
select
min(c.id) as id,
to_char(c.create_date, 'YYYY') as year,
to_char(c.create_date, 'YYYY-MM')||'-01' as name,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.user_id,
c.categ_id,
c.category2_id,
@ -184,7 +192,7 @@ class report_crm_case_section_categ_categ2(osv.osv):
from
crm_case c
where c.categ_id is not null AND c.category2_id is not null
group by to_char(c.create_date, 'YYYY'),to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.category2_id, c.state, c.stage_id, c.section_id)""")
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),c.user_id, c.categ_id, c.category2_id, c.state, c.stage_id, c.section_id)""")
report_crm_case_section_categ_categ2()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/crm/security/ir.model.access.csv
View File

@ -35,3 +35,4 @@
"access_crm_generic_wizard_manager","crm.generic_wizard","model_crm_generic_wizard","crm.group_crm_user",1,0,0,0
"access_crm_calendar_config_wizard","crm.calendar.config_wizard","model_crm_calendar_config_wizard",,1,1,1,1
"access_crm_caldav_attendee","crm.caldav.attendee","model_crm_caldav_attendee",,1,1,1,1
"access_crm_caldav_alarm","crm.caldav.alarm","model_crm_caldav_alarm",,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
35 access_crm_generic_wizard_manager crm.generic_wizard model_crm_generic_wizard crm.group_crm_user 1 0 0 0
36 access_crm_calendar_config_wizard crm.calendar.config_wizard model_crm_calendar_config_wizard 1 1 1 1
37 access_crm_caldav_attendee crm.caldav.attendee model_crm_caldav_attendee 1 1 1 1
38 access_crm_caldav_alarm crm.caldav.alarm model_crm_caldav_alarm 1 1 1 1

7
addons/crm_vertical/crm_meeting_vertical_view.xml
View File

@ -6,12 +6,5 @@
<field eval="&quot;terp-calendar&quot;" name="icon"/>
<field eval="False" name="parent_id"/>
</record>
<!-- short cut -->
<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
<field ref="crm.menu_crm_case_categ_meet_my" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
<field eval="&quot;My Meetings&quot;" name="name"/>
<field name="user_id" ref="base.user_root"/>
</record>
</data>
</openerp>

92
addons/event/event_view.xml
View File

@ -117,6 +117,25 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_event_search">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Events">
<group col="8" colspan="4">
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
<separator orientation="vertical"/>
<field name="name" string="Event" select="1"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<record model="ir.actions.act_window" id="action_event_view">
@ -125,35 +144,10 @@
<field name="res_model">event.event</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_event_search"/>
</record>
<menuitem name="All Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
<record model="ir.actions.act_window" id="action_new_event_form">
<field name="name">New event</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">event.event</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem parent="menu_event_event" id="menu_event_new_event" action="action_new_event_form" />
<record model="ir.actions.act_window" id="action_event_view_draft">
<field name="name">Draft Events</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">event.event</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_event_view_confirm">
<field name="name">Confirmed Events</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">event.event</field>
<field name="domain">[('state','=','confirm')]</field>
<field name="filter" eval="True"/>
</record>
<!-- EVENTS/REGISTRATIONS/EVENTS -->
@ -269,43 +263,39 @@
</field>
</record>
<record model="ir.ui.view" id="view_registration_search">
<field name="name">Registrations</field>
<field name="model">event.registration</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Event Registration">
<group col="10" colspan="4">
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
<separator orientation="vertical"/>
<field name="event_id" select="1"/>
<field name="user_id" select="1"/>
<field name="partner_id" select="1"/>
<field name="state" select="1"/>
<field name="invoice_label" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_registration">
<field name="name">Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain"></field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_registration_search"/>
</record>
<menuitem
name="All Registrations"
id="menu_action_registration" parent="menu_event_main"
action="action_registration"/>
<record model="ir.actions.act_window" id="action_registration_new">
<field name="name">New Registration</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem parent="menu_action_registration" id="menu_action_registration_new" action="action_registration_new"/>
<record model="ir.actions.act_window" id="action_registration_draft">
<field name="name">Unconfirmed Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_registration_confirm">
<field name="name">Confirmed Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain">[('state','in',('open','done'))]</field>
<field name="filter" eval="True"/>
</record>
<!-- report , event on registration... start -->
<record model="ir.ui.view" id="report_event_registration_tree">
<field name="name">report.event.registration.tree</field>

11
addons/hr/hr_view.xml
View File

@ -124,17 +124,6 @@
id="menu_open_view_employee_list_my"
parent="menu_open_view_employee_list"/>
<record id="open_view_employee_new" model="ir.actions.act_window">
<field name="name">New Employee</field>
<field name="res_model">hr.employee</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem
action="open_view_employee_new"
id="menu_open_view_employee_new"
parent="menu_open_view_employee_list"/>
<!--
=======================
Employee architecture

20
addons/hr_expense/hr_expense_view.xml
View File

@ -132,26 +132,6 @@
<menuitem action="expense_all" id="menu_expense_all"
parent="next_id_49" groups="hr.group_hr_manager"/>
<!--
My expenses menu
-->
<record id="expense_my" model="ir.actions.act_window">
<field name="name">My Expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my" id="menu_expense_my"
parent="hr_expense.next_id_49" groups="base.group_extended"
/>
<record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field>
<field name="model">product.product</field>

1
addons/hr_holidays/security/ir.model.access.csv
View File

@ -1,3 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1
"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1
"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_hr_holydays_status_user hr.holidays.status user model_hr_holidays_status hr.group_hr_user 1 1 1 1
3 access_hr_holidays_user hr holidays user model_hr_holidays hr.group_hr_user 1 1 1 1
4 access_hr_holidays_per_user hr.holidays.per.user model_hr_holidays_per_user hr.group_hr_user 1 1 1 1

25
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -69,22 +69,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
<record id="act_hr_timesheet_line_evry1_today_form_my" model="ir.actions.act_window">
<field name="name">My Working Hours of The Day</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
<field name="name">Working Hours</field>
<field name="type">ir.actions.act_window</field>
@ -99,17 +87,6 @@
parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
groups="hr.group_hr_manager"/>
<record id="act_hr_timesheet_line_evry1_today_form" model="ir.actions.act_window">
<field name="name">Working Hours of The Day</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date', '=', time.strftime('%Y-%m-%d'))]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.employee.extd_form</field>
<field name="model">hr.employee</field>

25
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -117,15 +117,6 @@
<field name="filter" eval="True"/>
</record>
<record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_open_analytic_accounts" model="ir.actions.act_window">
<field name="name">Open Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -142,22 +133,6 @@
<field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
</record>
<record id="action_draft_analytic_accounts" model="ir.actions.act_window">
<field name="name">Draft Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
</record>
<record id="action_pending_analytic_accounts" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
</record>
<record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.form</field>
<field name="model">hr_timesheet_invoice.factor</field>

92
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -203,88 +203,6 @@
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"
groups="hr.group_hr_manager"/>
<record id="act_hr_timesheet_sheet_form_my" model="ir.actions.act_window">
<field name="name">My timesheets</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended"/>
<record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
<field name="name">My timesheets to confirm</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('user_id','=',uid),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<record id="act_hr_timesheet_sheet_form_my_department" model="ir.actions.act_window">
<field name="name">My Department's Timesheets</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('user_id', 'child_of', [uid])]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended"/>
<record id="act_hr_timesheet_sheet_form_my_confirm_department" model="ir.actions.act_window">
<field name="name">My Department's Timesheets to Confirm</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('user_id', 'child_of', [uid]),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<record id="act_hr_timesheet_sheet_form_my_validate_department" model="ir.actions.act_window">
<field name="name">My Department's Timesheets to Validate</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('user_id', 'child_of', [uid]),('state','=','confirm'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
<menuitem action="act_hr_timesheet_sheet_form_my_current" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" type="wizard"/>
<record id="act_hr_timesheet_sheet_form_all_confirm" model="ir.actions.act_window">
<field name="name">Timesheets To Confirm</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
<field name="name">Timesheets To Validate</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('state','=','confirm')]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<!--
Company inheritancy
-->
@ -371,15 +289,5 @@
</field>
</record>
<record id="act_hr_timesheet_sheet_unvalidate" model="ir.actions.act_window">
<field name="name">Unvalidated Timesheets</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_timesheet_sheet_tree_simplified"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
</data>
</openerp>

10
addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
View File

@ -26,7 +26,7 @@
</record>
<record id="process_node_timesheet0" model="process.node">
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Timesheet&quot;&quot;&quot;" name="name"/>
@ -37,7 +37,7 @@
</record>
<record id="process_node_drafttimesheetsheet0" model="process.node">
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Timesheet&quot;&quot;&quot;" name="name"/>
@ -48,7 +48,7 @@
</record>
<record id="process_node_confirmedtimesheet0" model="process.node">
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Confirmed&quot;&quot;&quot;" name="name"/>
@ -59,7 +59,7 @@
</record>
<record id="process_node_validatedtimesheet0" model="process.node">
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Validated&quot;&quot;&quot;" name="name"/>
@ -82,7 +82,7 @@
</record>
<record id="process_node_workontask0" model="process.node">
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Work on Task&quot;&quot;&quot;" name="name"/>

48
addons/idea/idea_view.xml
View File

@ -164,6 +164,26 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_idea_idea_search">
<field name="name">idea.idea.search</field>
<field name="model">idea.idea</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Ideas">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Ideas"/>
<separator orientation="vertical"/>
<filter icon="gtk-execute" string="Draft" domain="[('state','=','draft')]" help="Draft Ideas"/>
<filter icon="gtk-execute" string="Open" domain="[('state','=','open')]" help="Open Ideas"/>
<separator orientation="vertical"/>
<field name="title" select="1"/>
<field name="category_id" select="1"/>
<field name="user_id" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.ui.view" id="view_idea_comment_tree">
<field name="name">idea.comment.tree</field>
@ -182,6 +202,7 @@
<field name="res_model">idea.idea</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_idea_idea_search"/>
</record>
<menuitem name="All Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea"/>
@ -194,33 +215,6 @@
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_idea_idea_my_idea">
<field name="name">My Ideas</field>
<field name="res_model">idea.idea</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id', '=', uid)]</field>
</record>
<menuitem name="My Ideas" parent="menu_ideas1" id="menu_idea_idea_my_idea" action="action_idea_idea_my_idea"/>
<record model="ir.actions.act_window" id="action_idea_idea_draft_my">
<field name="name">My Draft Ideas</field>
<field name="res_model">idea.idea</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_idea_idea_open_my">
<field name="name">My Open Ideas</field>
<field name="res_model">idea.idea</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.ui.view" id="view_idea_vote_stat_graph">
<field name="name">idea.vote_stat.graph</field>
<field name="model">idea.vote.stat</field>

1
addons/l10n_be/__terp__.py
View File

@ -52,6 +52,7 @@
'l10n_be_wizard.xml',
'l10n_be_sequence.xml',
'fiscal_templates.xml',
'security/ir.model.access.csv'
],
'demo_xml': [
'account.report.report.csv'

160
addons/membership/membership_view.xml
View File

@ -103,11 +103,11 @@
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_state"/>
<field name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')]}"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_membership_members">
<field name="name">Current members</field>
<field name="res_model">res.partner</field>
@ -131,164 +131,6 @@
id="menu_members"
sequence="2"
action="action_membership_members"/>
<!-- MEMBERSHIP/MEMBERS/PAID MEMBERS -->
<record model="ir.actions.act_window" id="action_membership_members_paid">
<field name="name">Paid members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'paid')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_paid_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_tree"/>
<field name="act_window_id" ref="action_membership_members_paid"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_paid_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_paid"/>
</record>
<!-- MEMBERSHIP/MEMBERS/FREE MEMBERS -->
<record model="ir.actions.act_window" id="action_membership_members_free">
<field name="name">Free members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'free')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_free_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_tree"/>
<field name="act_window_id" ref="action_membership_members_free"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_free_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_free"/>
</record>
<!-- MEMBERSHIP/MEMBERS/ASSOCIATED MEMBERS -->
<record model="ir.ui.view" id="membership_members_associated_tree">
<field name="name">associate members</field>
<field name="model">res.partner</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Members">
<field name="name"/>
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_state"/>
<field name="associate_member"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_membership_members_associated">
<field name="name">Associated members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('associate_member', '!=', False), ('membership_state', '!=', 'none')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_associated_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_associated_tree"/>
<field name="act_window_id" ref="action_membership_members_associated"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_associated_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_associated"/>
</record>
<!-- MEMBERSHIP/MEMBERS/INVOICED MEMBERS -->
<record model="ir.actions.act_window" id="action_membership_members_invoiced">
<field name="name">Invoiced members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'invoiced')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_tree"/>
<field name="act_window_id" ref="action_membership_members_invoiced"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_invoiced"/>
</record>
<!-- MEMBERSHIP/MEMBERS/FUTURE MEMBERS -->
<record model="ir.actions.act_window" id="action_membership_members_waiting">
<field name="name">Future members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'waiting')]</field>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_waiting_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_tree"/>
<field name="act_window_id" ref="action_membership_members_waiting"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_waiting_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_waiting"/>
</record>
<menuitem name="Future members (invoice not confirmed)" parent="menu_membership"
id="menu_members_waiting"
sequence="3"
action="action_membership_members_waiting"/>
<!-- MEMBERSHIP/MEMBERS/OLD MEMBERS -->
<record model="ir.actions.act_window" id="action_membership_members_old">
<field name="name">Old members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'old')]</field>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_old_view_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="membership_members_tree"/>
<field name="act_window_id" ref="action_membership_members_old"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_old_view_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members_old"/>
</record>
<menuitem name="Old members" parent="menu_membership"
id="menu_members_old"
sequence="4"
action="action_membership_members_old"/>
<!-- PARTNERS -->

25
addons/mrp/mrp_view.xml
View File

@ -308,15 +308,6 @@
<field name="view_id" ref="mrp_bom_tree_view"/>
</record>
<menuitem action="mrp_bom_tree_action" id="menu_bom_tree" parent="menu_mrp_bom_form_action"/>
<record id="mrp_bom_form_action_new" model="ir.actions.act_window">
<field name="name">New Bill of Materials</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.bom</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="domain">[('bom_id','=',False)]</field>
</record>
<menuitem action="mrp_bom_form_action_new" id="menu_mrp_bom_form_action_new" parent="menu_mrp_bom_form_action"/>
<record id="mrp_bom_form_action2" model="ir.actions.act_window">
<field name="name">Bill of Materials Components</field>
@ -595,14 +586,6 @@
<field name="search_view_id" ref="view_mrp_production_filter"/>
</record>
<record id="mrp_production_new" model="ir.actions.act_window">
<field name="name">New Production Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph,gantt</field>
</record>
<record id="mrp_production_lot_form_view" model="ir.ui.view">
<field name="name">mrp.production.lot.line.form</field>
<field name="model">mrp.production.lot.line</field>
@ -815,14 +798,6 @@
<field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
</record>
<record id="mrp_procurement_new" model="ir.actions.act_window">
<field name="name">New Requisition</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<!-- Order Point -->
<record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
<field name="name">stock.warehouse.orderpoint.tree</field>

6
addons/point_of_sale/pos_view.xml
View File

@ -170,13 +170,12 @@
<!-- <menuitem name="Point of Sale/Point of Sale/Orders not invoiced" id="menu_action_pos_order_tree" action="action_pos_order_tree"/> -->
<record model="ir.actions.act_window" id="action_pos_order_tree2">
<field name="name">Orders of the day</field>
<field name="name">Orders for today</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_pos_order_tree"/>
<field name="filter" eval="True"/>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
@ -188,7 +187,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_pos_order_tree"/>
<field name="filter" eval="True"/>
</record>
<record model="ir.ui.view" id="view_pos_order_line">
@ -234,7 +232,7 @@
<menuitem name="POS Lines" parent="menu_point_root" id="menu_action_pos_order_line" action="action_pos_order_line"/>
<record model="ir.actions.act_window" id="action_pos_order_line_day">
<field name="name">POS Lines of the day</field>
<field name="name">POS Lines for today</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order.line</field>
<field name="view_type">form</field>

107
addons/project/project_view.xml
View File

@ -155,16 +155,6 @@
</record>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/>
<record id="open_view_project_open" model="ir.actions.act_window">
<field name="name">Running projects</field>
<field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','open')]</field>
<field name="view_id" ref="view_project"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_project_project_filter"/>
</record>
<record id="open_view_template_project" model="ir.actions.act_window">
<field name="name">Templates of Projects</field>
<field name="res_model">project.project</field>
@ -174,15 +164,6 @@
</record>
<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>
<record id="open_view_project" model="ir.actions.act_window">
<field name="name">New Project</field>
<field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" eval="edit_project"/>
</record>
<menuitem action="open_view_project" id="menu_open_view_project" parent="menu_all_project" sequence="50"/>
<record id="view_task_work_form" model="ir.ui.view">
<field name="name">project.task.work.form</field>
<field name="model">project.task.work</field>
@ -228,29 +209,8 @@
</tree>
</field>
</record>
<record id="open_view_my_project" model="ir.actions.act_window">
<field name="name">My Projects</field>
<field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="domain">[('manager', '=', uid)]</field>
<field name="view_id" ref="view_my_project"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_project_project_filter"/>
</record>
<menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_extended"
sequence="1"/>
<record id="open_view_my_project_my_run" model="ir.actions.act_window">
<field name="name">My Running Projects</field>
<field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="domain">[('manager', '=', uid),('state','=','open')]</field>
<field name="view_id" ref="view_my_project"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_project_project_filter"/>
</record>
<record id="open_view_my_project_open" model="ir.actions.act_window">
<record id="open_view_my_project_open" model="ir.actions.act_window">
<field name="name">Projects Structure</field>
<field name="res_model">project.project</field>
<field name="view_type">tree</field>
@ -527,18 +487,6 @@
</record>
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/>
<record id="action_view_task4" model="ir.actions.act_window">
<field name="name">My Tasks</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,gantt,graph</field>
<field name="domain">[('user_id', '=', uid)]</field>
<field name="view_id" ref="view_task_tree3"/>
<field eval="True" name="filter"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_extended" />
<record id="action_view_task_department" model="ir.actions.act_window">
<field name="name">My Department Tasks</field>
<field name="res_model">project.task</field>
@ -549,52 +497,6 @@
<field eval="True" name="filter"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_extended"/>
<record id="action_view_task5_pending" model="ir.actions.act_window">
<field name="name">My Pending Tasks</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id', '=', uid),('state','=','pending')]</field>
<field eval="True" name="filter"/>
<field name="view_id" ref="my_pending_task"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_task5_prog" model="ir.actions.act_window">
<field name="name">My Current Tasks</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id', '=', uid),('state','in',('open','draft'))]</field>
<field eval="True" name="filter"/>
<field name="view_id" ref="view_task_tree3"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_task5_prog_prog" model="ir.actions.act_window">
<field name="name">My Tasks in Progress</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
<field name="view_id" ref="view_task_tree3"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_task5_prog_draft" model="ir.actions.act_window">
<field name="name">My Draft Tasks</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id', '=', uid),('state','=','draft')]</field>
<field name="view_id" ref="view_task_tree3"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_task5_departments_pending" model="ir.actions.act_window">
<field name="name">My Department's Pending Tasks</field>
@ -647,13 +549,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_task_new" model="ir.actions.act_window">
<field name="name">New Task</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,gantt,graph</field>
</record>
<menuitem action="action_view_task_new" id="menu_action_view_task_new" parent="menu_tasks"/>
<record id="action_view_task6_prog" model="ir.actions.act_window">
<field name="name">Tasks in Progress</field>

3
addons/project/security/project_security.xml
View File

@ -15,9 +15,6 @@
<record model="ir.ui.menu" id="menu_definitions">
<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
</record>
<record model="ir.ui.menu" id="menu_open_view_project">
<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
</record>
<record model="ir.rule.group" id="project_comp_rule_group">
<field name="name">Project multi-company</field>

2
addons/project_timesheet/process/project_timesheet_process.xml
View File

@ -7,7 +7,7 @@
-->
<record id="process_node_timesheettask0" model="process.node">
<field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_me_all_form"/>
<field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>
<field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>

41
addons/purchase/purchase_view.xml
View File

@ -142,28 +142,6 @@
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
<record id="purchase_form_action2" model="ir.actions.act_window">
<field name="name">Request For Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action3" model="ir.actions.act_window">
<field name="name">Purchase Order Waiting Approval</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','confirmed')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action4" model="ir.actions.act_window">
<field name="name">Purchase Orders in Progress</field>
<field name="type">ir.actions.act_window</field>
@ -171,28 +149,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','approved')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action_new" model="ir.actions.act_window">
<field name="name">New Purchase Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_mode">form,tree</field>
</record>
<record id="purchase_form_action3" model="ir.actions.act_window">
<field name="name">Purchase Order Waiting Approval</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','confirmed')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>

54
addons/report_account/report_receivable_view.xml
View File

@ -115,8 +115,8 @@
<field name="view_id" ref="board_view_created_invoice"/>
</record>
<menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>
<menuitem id="menu_report_all_months" name="All Months" parent="account.menu_finance_reporting"/>
<!-- <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>-->
<menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/>
<!-- Report of the sales by product and account -->
<record id="view_report_account_sales_tree" model="ir.ui.view">
<field name="name">report.account.sales.tree</field>
@ -146,26 +146,30 @@
</graph>
</field>
</record>
<record id="action_report_account_sales_tree" model="ir.actions.act_window">
<field name="name">Sales by Account (this month)</field>
<field name="res_model">report.account.sales</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem action="action_report_account_sales_tree" id="menu_report_account_sales" parent="menu_report_this_month"/>
<record id="view_report_account_sales_search" model="ir.ui.view">
<field name="name">report.account.sales.search</field>
<field name="model">report.account.sales</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Account">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
</search>
</field>
</record>
<record id="action_report_account_sales_tree_all" model="ir.actions.act_window">
<field name="name">Sales by Account</field>
<field name="res_model">report.account.sales</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_report_account_sales_search"/>
</record>
<menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/>
<!-- Report of the sales by product and account type -->
<record id="view_report_account_type_sales_tree" model="ir.ui.view">
@ -211,21 +215,27 @@
</field>
</record>
<record id="action_report_account_type_sales_tree" model="ir.actions.act_window">
<field name="name">Sales by Account Type (this month)</field>
<field name="res_model">report.account_type.sales</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_report_account_type_sales_search" model="ir.ui.view">
<field name="name">report.account_type.sales.search</field>
<field name="model">report.account_type.sales</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Account">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
</search>
</field>
</record>
<menuitem action="action_report_account_type_sales_tree" id="menu_report_account_type_sales" parent="menu_report_this_month"/>
<record id="action_report_account_type_sales_tree_all" model="ir.actions.act_window">
<field name="name">Sales by Account Type</field>
<field name="res_model">report.account_type.sales</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_report_account_type_sales_search"/>
</record>
<menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/>

2
addons/report_analytic/report_analytic_view.xml
View File

@ -57,7 +57,7 @@
<field name="view_mode">tree,graph</field>
<field name="domain">[('state','=','open')]</field>
</record>
<menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_42"/>
<menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>
</data>
</openerp>

2
addons/report_analytic_line/report_analytic_line_view.xml
View File

@ -57,7 +57,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_42"/>
<menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
<act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>

115
addons/report_analytic_planning/report_analytic_planning_view.xml
View File

@ -154,6 +154,24 @@
</form>
</field>
</record>
<record id="account_analytic_planning_view_search" model="ir.ui.view">
<field name="name">report.account.analytic.planning.search</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning by Account">
<group col="8" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<!-- Planning Line -->
@ -196,6 +214,7 @@
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record>
<menuitem id="planning_main" name="Long Term Planning"
@ -204,57 +223,6 @@
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="planning_main" />
<record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
<field name="name">My Plannings</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="action_account_analytic_planning_form_my"
id="menu_report_account_analytic_planning_my2"
parent="planning_main" />
<record id="action_account_analytic_planning_form_current_my"
model="ir.actions.act_window">
<field name="name">My Current Plannings</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem
action="action_account_analytic_planning_form_current_my"
id="menu_report_account_analytic_planning_current_my"
parent="menu_report_account_analytic_planning_my2" />
<record id="action_account_analytic_planning_form_current"
model="ir.actions.act_window">
<field name="name">Current Plannings</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')),('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem action="action_account_analytic_planning_form_current"
id="menu_report_account_analytic_planning_current"
parent="report_analytic_planning.menu_report_account_analytic_planning" />
<record id="action_account_analytic_planning_form_new"
model="ir.actions.act_window">
<field name="name">New Planning</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="action_account_analytic_planning_form_new"
id="menu_report_account_analytic_planning_new"
parent="planning_main" />
<!--
Planning statistics
-->
@ -303,6 +271,23 @@
</field>
</record>
<record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
<field name="name">report_account_analytic.planning.stat.search</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning statistics">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
<filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
<separator orientation="vertical"/>
<field name="planning_id" select="1"/>
<field name="user_id" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
@ -310,39 +295,13 @@
<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="search_view_id" ref="account_analytic_planning_stat_view_search"/>
</record>
<menuitem id="next_id_85" name="Planning"
parent="hr.menu_hr_reporting" />
<menuitem action="action_account_analytic_planning_stat_form"
id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
<record id="action_account_analytic_planning_stat_my_form"
model="ir.actions.act_window">
<field name="name">My Planning Statistics</field>
<field name="res_model">report_account_analytic.planning.stat</field>
<field name="view_type">form</field>
<field name="domain">[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem action="action_account_analytic_planning_stat_my_form"
id="menu_report_account_analytic_planning_stat_my"
parent="report_analytic_planning.next_id_85" />
<record
id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
<field name="name">Planning Statistics of My Projects</field>
<field name="res_model">report_account_analytic.planning.stat</field>
<field name="view_type">form</field>
<field name="domain">[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem
action="action_account_analytic_planning_stat_my_manager_form"
id="menu_report_account_analytic_planning_stat_my_manager"
parent="report_analytic_planning.next_id_85" />
<!-- Analytic account Form -->
<record id="view_project_planning_form" model="ir.ui.view">

67
addons/report_crm/report_crm_view.xml
View File

@ -61,10 +61,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Cases by User">
<group col='12' colspan='4'>
<filter string="Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<group col="12" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
@ -77,47 +77,27 @@
</field>
</record>
<record id="action_report_crm_case_user_tree_month" model="ir.actions.act_window">
<field name="name">Cases by user and section (this month)</field>
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
<menuitem id="crm.next_id_52" name="All Cases" parent="next_id_64" sequence="0"/>
<menuitem id="next_id_65" name="This Month" parent="next_id_64"/><menuitem action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month" parent="next_id_65"/>
<menuitem id="crm.next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
<menuitem id="crm.next_id_52" name="All Cases" parent="crm.next_id_64" sequence="0"/>
<record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
<field name="name">Cases by User and Section</field>
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_user_filter"/>
</record>
<menuitem id="next_id_66" name="All Months" parent="report_crm.next_id_64"/><menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="next_id_66"/>
<record id="action_report_crm_case_user_tree_month_my" model="ir.actions.act_window">
<field name="name">My cases by section (this month)</field>
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem action="action_report_crm_case_user_tree_month_my" id="menu_crm_case_user_tree_month_my" parent="report_crm.next_id_65"/>
<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/>
<record id="action_report_crm_case_user_tree_my" model="ir.actions.act_window">
<field name="name">My cases by section</field>
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_crm_case_user_filter"/>
</record>
<menuitem action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my" parent="report_crm.next_id_66"/>
<menuitem action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my" parent="crm.next_id_64"/>
<!-- # Cases by section and categoryof case -->
@ -163,10 +143,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Cases by categories and Sections">
<group col='12' colspan='4'>
<filter string="Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<group col="12" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
@ -179,22 +159,14 @@
</field>
</record>
<record id="action_report_crm_case_categ_tree_month" model="ir.actions.act_window">
<field name="name">Cases by categories and section (this month)</field>
<field name="res_model">report.crm.case.categ</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem action="action_report_crm_case_categ_tree_month" id="menu_crm_case_categ_tree_month" parent="report_crm.next_id_65"/>
<record id="action_report_crm_case_categ_tree" model="ir.actions.act_window">
<field name="name">Cases by Categories and Section</field>
<field name="res_model">report.crm.case.categ</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_categ_filter"/>
</record>
<menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="report_crm.next_id_66"/>
<menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_64"/>
<act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>
@ -243,10 +215,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Cases by Section">
<group col='4' colspan='4'>
<filter string="Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<group col="4" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr_cases" select="1"/>
</group>
</search>
</field>

56
addons/report_document/report_document_view.xml
View File

@ -34,49 +34,39 @@
</field>
</record>
<record model="ir.actions.act_window" id="action_view_my_document_tree">
<field name="name">My files (This months)</field>
<field name="res_model">report.document.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_report_document_user_search" model="ir.ui.view">
<field name="name">report.document.user.search</field>
<field name="model">report.document.user</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="All users files">
<group col="10" colspan="4">
<filter icon="terp-stock" string="My" domain="[('user','=',uid)]" help="My Files"/>
<separator orientation="vertical"/>
<filter icon="terp-stock" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Files"/>
<filter icon="terp-stock" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Files"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="file_title" select="1"/>
<field name="user" select="1"/>
<field name="directory" select="1"/>
</group>
</search>
</field>
</record>
<menuitem name="Document Management" id="menu_action_view_my_document"/>
<menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>
<menuitem name="This Month" id="menu_action_view_my_document_report_this" parent="menu_action_view_my_document_report"/>
<menuitem name="My files" id="menu_action_view_my_document_report_this_myfile" parent="menu_action_view_my_document_report_this" action="action_view_my_document_tree"/>
<record model="ir.actions.act_window" id="action_view_my_document_tree1">
<field name="name">My files (All months)</field>
<field name="res_model">report.document.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem name="All Months" id="menu_action_view_my_document_report_all" parent="menu_action_view_my_document_report"/>
<menuitem name="My files" id="menu_action_view_my_document_report_all_myfile" parent="menu_action_view_my_document_report_all" action="action_view_my_document_tree1"/>
<record model="ir.actions.act_window" id="action_view_all_document_tree">
<field name="name">All Users files (This month)</field>
<field name="res_model">report.document.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem name="All Users files" id="menu_action_view_my_document_report_this_userfile" parent="menu_action_view_my_document_report_this" action="action_view_all_document_tree"/>
<record model="ir.actions.act_window" id="action_view_all_document_tree1">
<field name="name">All Users files (All months)</field>
<field name="name">All Users files</field>
<field name="res_model">report.document.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_report_document_user_search"/>
</record>
<menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report_all" action="action_view_all_document_tree1"/>
<menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>
<!-- -->
<record model="ir.ui.view" id="view_document_wall_form">

31
addons/report_intrastat/report_intrastat_view.xml
View File

@ -89,27 +89,34 @@
</field>
</record>
<record id="action_report_intrastat_tree" model="ir.actions.act_window">
<field name="name">Intrastat (this month)</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">report.intrastat</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%b.%Y'))]</field>
<record id="view_report_intrastat_search" model="ir.ui.view">
<field name="name">report.intrastat.search</field>
<field name="model">report.intrastat</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Intrastat Data">
<group col="8" colspan="4">
<filter icon="terp-stock" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
<filter icon="terp-stock" string="This Month" domain="[('name','=',time.strftime('%%b.%%Y'))]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="intrastat_id" select="1"/>
<field name="type" select="1"/>
</group>
</search>
</field>
</record>
<menuitem id="next_id_89" name="This Month" parent="stock.next_id_61"/>
<menuitem action="action_report_intrastat_tree" id="menu_report_intrastat" parent="next_id_89"/>
<record id="action_report_intrastat_tree_all" model="ir.actions.act_window">
<field name="name">Intrastat</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">report.intrastat</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_report_intrastat_search"/>
</record>
<menuitem id="next_id_90" name="All Months" parent="stock.next_id_61"/>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="next_id_90"/>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
</data>
</openerp>

56
addons/report_project/report_project_view.xml
View File

@ -41,22 +41,34 @@
</tree>
</field>
</record>
<record id="action_project_task_user_tree_month" model="ir.actions.act_window">
<field name="name">Tasks finished by project and user (this month)</field>
<field name="res_model">report.project.task.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_task_project_user_search" model="ir.ui.view">
<field name="name">report.project.task.user.search</field>
<field name="model">report.project.task.user</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks by projects and users">
<group col="8" colspan="4">
<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1"/>
</group>
</search>
</field>
</record>
<menuitem id="next_id_63" name="This Month" parent="report_task.next_id_57"/><menuitem action="action_project_task_user_tree_month" id="menu_project_task_user_tree_month" parent="next_id_63"/>
<record id="action_project_task_user_tree" model="ir.actions.act_window">
<field name="name">Tasks Closed by Project and User</field>
<field name="res_model">report.project.task.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="report_task.next_id_58"/>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="report_task.next_id_57"/>
<!-- Tasks by projects -->
@ -94,22 +106,34 @@
</tree>
</field>
</record>
<record id="action_project_task_tree_month" model="ir.actions.act_window">
<field name="name">Tasks finished by project (this month)</field>
<field name="res_model">report.project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_task_project_search" model="ir.ui.view">
<field name="name">report.project.task.search</field>
<field name="model">report.project.task</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks by projects">
<group col="8" colspan="4">
<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
</group>
</search>
</field>
</record>
<menuitem action="action_project_task_tree_month" id="menu_project_task_tree_month" parent="report_project.next_id_63"/>
<record id="action_project_task_tree" model="ir.actions.act_window">
<field name="name">Tasks Closed by Project</field>
<field name="res_model">report.project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_task_project_search"/>
</record>
<menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="report_task.next_id_58"/>
<menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="report_task.next_id_57"/>
</data>
</openerp>

60
addons/report_purchase/report_purchase_view.xml
View File

@ -50,22 +50,36 @@
</tree>
</field>
</record>
<record id="action_order_product_tree" model="ir.actions.act_window">
<field name="name">Purchases by Products (this month)</field>
<field name="res_model">report.purchase.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_order_product_search" model="ir.ui.view">
<field name="name">report.purchase.order.product.search</field>
<field name="model">report.purchase.order.product</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Purchases by products">
<group col="8" colspan="4">
<filter icon="terp-purchase" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Purchases by products during this year"/>
<filter icon="terp-purchase" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Purchases by products during this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/><menuitem id="next_id_74" name="This Month" parent="next_id_73"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_74"/>
<record id="action_order_product_tree_all" model="ir.actions.act_window">
<field name="name">Purchases by Products</field>
<field name="res_model">report.purchase.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_order_product_search"/>
</record>
<menuitem id="next_id_75" name="All Months" parent="report_purchase.next_id_73"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_75"/>
<menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_73"/>
<!-- Purchases by category by month -->
@ -117,21 +131,33 @@
</field>
</record>
<record id="action_order_category_tree" model="ir.actions.act_window">
<field name="name">Purchases by Category of Product (this month)</field>
<field name="res_model">report.purchase.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record id="view_order_category_search" model="ir.ui.view">
<field name="name">report.purchase.order.category.search</field>
<field name="model">report.purchase.order.category</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Purchases by category of products">
<group col="8" colspan="4">
<filter icon="terp-purchase" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Purchases by categories of products during this year"/>
<filter icon="terp-purchase" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Purchases by categories of products during this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_purchase.next_id_74"/>
<record id="action_order_category_tree_all" model="ir.actions.act_window">
<field name="name">Purchases by Category of Products</field>
<field name="res_model">report.purchase.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_order_category_search"/>
</record>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_75"/>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_73"/>
<act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>

2
addons/report_sale/report_sale_graph.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_82"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
<menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_80"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
<menuitem icon="STOCK_PRINT" id="ir_ui_menu2" name="Daily Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
<menuitem icon="STOCK_PRINT" id="ir_ui_menu3" name="Monthly Cumulated Sales Turnover Over One Year" parent="report_sale.next_id_83"/>

67
addons/report_sale/report_sale_view.xml
View File

@ -48,22 +48,36 @@
</graph>
</field>
</record>
<record id="action_order_product_tree" model="ir.actions.act_window">
<field name="name">Sale Orders by Product (this month)</field>
<field name="res_model">report.sale.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/><menuitem id="next_id_81" name="This Month" parent="next_id_80"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_81"/>
<record id="view_order_product_search" model="ir.ui.view">
<field name="name">report.sale.order.product.search</field>
<field name="model">report.sale.order.product</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sale Orders by Product">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale orders during this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale orders during this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_order_product_tree_all" model="ir.actions.act_window">
<field name="name">Sale Orders by Product</field>
<field name="res_model">report.sale.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_order_product_search"/>
</record>
<menuitem id="next_id_82" name="All Months" parent="report_sale.next_id_80"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_82"/>
<menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
<!-- Sales by category by month -->
@ -113,21 +127,34 @@
</graph>
</field>
</record>
<record id="action_order_category_tree" model="ir.actions.act_window">
<field name="name">Sale Orders by Category of Product (this month)</field>
<field name="res_model">report.sale.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
</record>
<menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_sale.next_id_81"/>
<record id="view_order_category_search" model="ir.ui.view">
<field name="name">report.sale.order.category.search</field>
<field name="model">report.sale.order.category</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sale Orders by Category of Products">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale orders during this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale orders during this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_order_category_tree_all" model="ir.actions.act_window">
<field name="name">Sale Orders by Category of Products</field>
<field name="res_model">report.sale.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_order_category_search"/>
</record>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_82"/>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_80"/>
<!-- Sales of the month -->
<record id="view_order_graph" model="ir.ui.view">
@ -148,7 +175,7 @@
<field name="view_mode">graph,tree,form</field>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
</record>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_80"/>
<record id="view_so_pipeline_graph" model="ir.ui.view">
<field name="name">sale.order.dashboard.graph</field>

2
addons/report_task/report_task_view.xml
View File

@ -56,7 +56,7 @@
<field name="domain">[]</field>
</record>
<menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/>
<menuitem id="next_id_58" name="All Months" parent="next_id_57"/><menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_58"/>
<menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_57"/>
<!-- Closed Task in Random Acitivities dashboard -->

6
addons/report_task/security/ir.model.access.csv
View File

@ -1,2 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_report_task_user_pipeline_open,report.task.user.pipeline.open,model_report_task_user_pipeline_open,project.group_project_manager,1,0,0,0
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_report_task_user_pipeline_open","report.task.user.pipeline.open","model_report_task_user_pipeline_open","project.group_project_manager",1,0,0,0
"access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0
"access_report_closed_task","report.closed.task","model_report_closed_task","project.group_project_manager",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_report_task_user_pipeline_open report.task.user.pipeline.open model_report_task_user_pipeline_open project.group_project_manager 1 0 0 0
3 access_report_timesheet_task_user report.timesheet.task.user model_report_timesheet_task_user project.group_project_manager 1 0 0 0
4 access_report_closed_task report.closed.task model_report_closed_task project.group_project_manager 1 0 0 0

120
addons/report_timesheet/report_timesheet_view.xml
View File

@ -17,7 +17,6 @@
</field>
</record>
<record id="view_timesheet_user_form" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.user.form</field>
<field name="model">report_timesheet.user</field>
@ -31,7 +30,6 @@
</field>
</record>
<record id="view_timesheet_user_tree" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.user.tree</field>
<field name="model">report_timesheet.user</field>
@ -46,15 +44,6 @@
</field>
</record>
<record id="action_timesheet_user_stat" model="ir.actions.act_window">
<field name="name">Timesheet by user (this month)</field>
<field name="res_model">report_timesheet.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_69" name="This Month" parent="hr.menu_hr_reporting"/><menuitem action="action_timesheet_user_stat" id="menu_report_timesheet_user" parent="next_id_69"/>
<record id="view_timesheet_account_date_graph_account" model="ir.ui.view">
<field name="name">report_timesheet.account.date.graph</field>
<field name="model">report_timesheet.account.date</field>
@ -68,26 +57,32 @@
</field>
</record>
<record id="action_timesheet_user_stat_my" model="ir.actions.act_window">
<field name="name">My Timesheet of the Month</field>
<field name="res_model">report_timesheet.account.date</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_timesheet_account_date_graph_account"/>
<field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01')), ('user_id','=',uid)]</field>
<record id="view_timesheet_user_search" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.user.search</field>
<field name="model">report_timesheet.user</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet by user">
<group col="8" colspan="4">
<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
</group>
</search>
</field>
</record>
<menuitem action="action_timesheet_user_stat_my" id="menu_report_timesheet_user_my" parent="next_id_69"/>
<record id="action_timesheet_user_stat_all" model="ir.actions.act_window">
<field name="name">Timesheet by User</field>
<field name="res_model">report_timesheet.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_timesheet_user_search"/>
</record>
<menuitem id="next_id_70" name="All Months" parent="hr.menu_hr_reporting"/><menuitem action="action_timesheet_user_stat_all" id="menu_report_timesheet_user_all" parent="next_id_70"/>
<menuitem action="action_timesheet_user_stat_all" id="menu_report_timesheet_user_all" parent="hr.menu_hr_reporting"/>
<!-- Statistics report on timesheets to invoice -->
@ -103,7 +98,6 @@
</field>
</record>
<record id="view_timesheet_invoice_form" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.invoice.form</field>
<field name="model">report_timesheet.invoice</field>
@ -117,7 +111,6 @@
</field>
</record>
<record id="view_timesheet_invoice_tree" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.invoice.tree</field>
<field name="model">report_timesheet.invoice</field>
@ -139,16 +132,7 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem action="action_timesheet_invoice_stat_all" id="menu_report_timesheet_invoice_all" parent="next_id_70"/>
<record id="action_timesheet_invoice_stat_my" model="ir.actions.act_window">
<field name="name">My timesheets to invoice</field>
<field name="res_model">report_timesheet.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('manager_id','=',uid)]</field>
</record>
<menuitem action="action_timesheet_invoice_stat_my" id="menu_report_timesheet_invoice_my" parent="next_id_69"/>
<menuitem action="action_timesheet_invoice_stat_all" id="menu_report_timesheet_invoice_all" parent="hr.menu_hr_reporting"/>
<!-- Statistics report on daily timesheets per account -->
@ -178,7 +162,6 @@
</field>
</record>
<record id="view_timesheet_account_date_form" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.account.date.form</field>
<field name="model">report_timesheet.account.date</field>
@ -194,22 +177,33 @@
</field>
</record>
<record id="view_timesheet_account_date_search" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.account.date.search</field>
<field name="model">report_timesheet.account.date</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Daily timesheet by account">
<group col="8" colspan="4">
<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
<field name="user_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_timesheet_account_date_stat_all" model="ir.actions.act_window">
<field name="name">Daily Timesheet by Account</field>
<field name="res_model">report_timesheet.account.date</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_timesheet_account_date_search"/>
</record>
<menuitem action="action_timesheet_account_date_stat_all" id="menu_report_timesheet_account_date_all" parent="next_id_70"/>
<record id="action_timesheet_account_date_stat_my" model="ir.actions.act_window">
<field name="name">My daily timesheets by account</field>
<field name="res_model">report_timesheet.account.date</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="action_timesheet_account_date_stat_my" id="menu_report_timesheet_account_date_my" parent="next_id_69"/>
<menuitem action="action_timesheet_account_date_stat_all" id="menu_report_timesheet_account_date_all" parent="hr.menu_hr_reporting"/>
<!-- Statistics report on timesheets per account -->
@ -239,8 +233,6 @@
</field>
</record>
<record id="view_timesheet_account_form" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.account.form</field>
<field name="model">report_timesheet.account</field>
@ -256,22 +248,34 @@
</field>
</record>
<record id="view_timesheet_account_search" model="ir.ui.view">
<field name="name">report_timesheet.timesheet.account.search</field>
<field name="model">report_timesheet.account</field>
<field name="type">search</field>
<field name="arch" type="xml">
<form string="Timesheet by account">
<group col="8" colspan="4">
<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
<field name="user_id" select="1"/>
</group>
</form>
</field>
</record>
<record id="action_timesheet_account_stat_all" model="ir.actions.act_window">
<field name="name">Timesheet by Account</field>
<field name="res_model">report_timesheet.account</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_timesheet_account_search"/>
</record>
<menuitem action="action_timesheet_account_stat_all" id="menu_report_timesheet_account_all" parent="next_id_70"/>
<record id="action_timesheet_account_stat_my" model="ir.actions.act_window">
<field name="name">My timesheets by account</field>
<field name="res_model">report_timesheet.account</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="action_timesheet_account_stat_my" id="menu_report_timesheet_account_my" parent="next_id_69"/>
<menuitem action="action_timesheet_account_stat_all" id="menu_report_timesheet_account_all" parent="hr.menu_hr_reporting"/>
<act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_timesheet_user" name="Timesheets per day" res_model="report_timesheet.user" src_model="res.users"/>

4
addons/sale/process/sale_process.xml
View File

@ -41,7 +41,7 @@
</record>
<record id="process_node_quotation0" model="process.node">
<field name="menu_id" ref="sale.menu_action_order_tree"/>
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
@ -52,7 +52,7 @@
</record>
<record id="process_node_saleorder0" model="process.node">
<field name="menu_id" ref="sale.menu_action_order_tree"/>
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>

76
addons/sale/sale_view.xml
View File

@ -131,7 +131,7 @@
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
domain="[('product_id','=',product_id)]"
groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/>
<separator colspan="4" string="Manual Description"/>
<field colspan="4" name="name" select="2"/>
<field name="price_unit" select="2"/>
@ -253,36 +253,6 @@
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">My Sales Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended"/>
<record id="action_order_tree_all" model="ir.actions.act_window">
<field name="name">All Sales Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended"/>
<record id="action_order_tree_new" model="ir.actions.act_window">
<field name="name">New Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
</record>
<menuitem action="action_order_tree_new" id="menu_action_order_tree_new" parent="sale.menu_sale_order"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
<field name="type">ir.actions.act_window</field>
@ -312,47 +282,18 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree7" model="ir.actions.act_window">
<field name="name">My sales in exception</field>
<record id="action_order_tree5" model="ir.actions.act_window">
<field name="name">All Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree8" model="ir.actions.act_window">
<field name="name">My sales order waiting Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree9" model="ir.actions.act_window">
<field name="name">My sales order in progress</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree10" model="ir.actions.act_window">
<field name="name">My Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="domain">[('state','=','draft')]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree" model="ir.actions.act_window">
@ -378,7 +319,6 @@
</field>
</record>
<record id="view_order_line_tree" model="ir.ui.view">
<field name="name">sale.order.line.tree</field>
<field name="model">sale.order.line</field>
@ -415,7 +355,7 @@
<field name="product_uom"/>
<field name="product_id" readonly="1" select="1"/>
<field name="invoiced" select="2"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/>
<separator colspan="4" string="Manual Designation"/>
<field colspan="4" name="name" select="2"/>
<field name="price_unit" select="2"/>

22
addons/sale_journal/picking_journal_view.xml
View File

@ -70,28 +70,6 @@
<menuitem name="Picking by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
<field name="name">My open packing journals</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
<field name="name">Picking by journal</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_invoice_type_tree">
<field name="name">Picking by invoice_method</field>
<field name="name">sale_journal.invoice.type.tree</field>

65
addons/sale_journal/picking_journal_view_report.xml
View File

@ -12,6 +12,7 @@
<field name="arch" type="xml">
<form string="Picking by invoice method">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="invoice_state" select="1"/>
<field name="state" select="1"/>
<field name="invoice_type_id" select="1"/>
@ -29,6 +30,7 @@
<field name="arch" type="xml">
<tree string="Packing by invoice method">
<field name="name"/>
<field name="month"/>
<field name="invoice_state"/>
<field name="state"/>
<field name="invoice_type_id"/>
@ -39,6 +41,24 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_picking_invoice_type_stats_search">
<field name="name">sale_journal.invoice.type.stats.search</field>
<field name="model">sale_journal.invoice.type.stats</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Picking by invoice method">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice method in this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice method in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="invoice_state" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open">
<field name="name">Statistics on picking to invoice</field>
<field name="res_model">sale_journal.invoice.type.stats</field>
@ -48,18 +68,7 @@
<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
</record>
<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_month">
<field name="name">Picking by invoice method</field>
<field name="res_model">sale_journal.invoice.type.stats</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem name="Picking Journal" id="menu_definition_journal_reporting" parent="stock.next_id_61"/>
<menuitem name="This Month" id="menu_definition_journal_reporting_this" parent="menu_definition_journal_reporting"/>
<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_invoice_type_picking_stats_open_menu_month"/>
<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_all">
<field name="name">Picking by invoice method</field>
@ -67,10 +76,10 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_picking_invoice_type_stats_search"/>
</record>
<menuitem name="All Months" id="menu_definition_journal_reporting_all" parent="menu_definition_journal_reporting"/>
<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_invoice_type_picking_stats_open_menu_all"/>
<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting" action="action_invoice_type_picking_stats_open_menu_all"/>
#
# Packing by journal
@ -83,6 +92,7 @@
<field name="arch" type="xml">
<form string="Picking by journals">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="state" select="1"/>
<field name="journal_id" select="1"/>
<field name="quantity"/>
@ -108,27 +118,34 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_month">
<field name="name">Picking by journal</field>
<field name="res_model">sale_journal.picking.stats</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record model="ir.ui.view" id="view_picking_journal_stats_search">
<field name="name">sale_journal.picking.stats.search</field>
<field name="model">sale_journal.picking.stats</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Picking by journals">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by journals in this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by journals in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_picking_picking_stats_open_menu_month"/>
<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_all">
<field name="name">Picking by journal</field>
<field name="res_model">sale_journal.picking.stats</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_picking_journal_stats_search"/>
</record>
<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_picking_picking_stats_open_menu_all"/>
<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting" action="action_picking_picking_stats_open_menu_all"/>
</data>
</openerp>

23
addons/sale_journal/sale_journal_picking_report.py
View File

@ -20,13 +20,14 @@
##############################################################################
from osv import fields,osv
import tools
class report_sale_journal_invoice_type_stats(osv.osv):
_name = "sale_journal.invoice.type.stats"
_description = "Stats on packing by invoice method"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'invoice_state':fields.selection([
("invoiced","invoiced"),
("2binvoiced","to be invoiced"),
@ -45,14 +46,19 @@ class report_sale_journal_invoice_type_stats(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'state,invoice_state,name desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'sale_journal_invoice_type_stats')
cr.execute("""
create or replace view sale_journal_invoice_type_stats as (
select
min(l.id) as id,
to_char(s.date, 'YYYY-MM-01') as name,
to_char(s.date, 'YYYY') as name,
to_char(s.date, 'MM') as month,
s.state,
s.invoice_state,
s.invoice_type_id,
@ -63,7 +69,7 @@ class report_sale_journal_invoice_type_stats(osv.osv):
from stock_picking s
left join stock_move l on (s.id=l.picking_id)
left join sale_order_line ol on (l.sale_line_id=ol.id)
group by s.invoice_type_id, to_char(s.date, 'YYYY-MM-01'),s.state, s.invoice_state
group by s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
order by s.invoice_type_id, s.invoice_state, s.state
)
""")
@ -74,7 +80,7 @@ class report_sale_journal_picking(osv.osv):
_description = "Picking lists by Journal"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','draft'),
('auto','waiting'),
@ -88,14 +94,19 @@ class report_sale_journal_picking(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'journal_id,name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'sale_journal_picking_stats')
cr.execute("""
create or replace view sale_journal_picking_stats as (
select
min(l.id) as id,
to_char(s.date, 'YYYY-MM-01') as name,
to_char(s.date, 'YYYY') as name,
to_char(s.date, 'MM') as month,
s.state,
s.journal_id,
sum(l.product_qty) as quantity,
@ -105,7 +116,7 @@ class report_sale_journal_picking(osv.osv):
from stock_picking s
right join stock_move l on (s.id=l.picking_id)
right join sale_order_line ol on (l.sale_line_id=ol.id)
group by s.journal_id, to_char(s.date, 'YYYY-MM-01'),s.state
group by s.journal_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state
)
""")
report_sale_journal_picking()

11
addons/sale_journal/sale_journal_report.py
View File

@ -20,13 +20,14 @@
##############################################################################
from osv import fields,osv
import tools
class report_sale_journal_sale(osv.osv):
_name = "sale_journal.sale.stats"
_description = "Sales Orders by Journal"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@ -42,14 +43,18 @@ class report_sale_journal_sale(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'journal_id,name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'sale_journal_sale_stats')
cr.execute("""
create or replace view sale_journal_sale_stats as (
select
min(l.id) as id,
to_char(s.date_order, 'YYYY-MM-01') as name,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order,'MM') as month,
s.state,
s.journal_id,
sum(l.product_uom_qty) as quantity,
@ -58,7 +63,7 @@ class report_sale_journal_sale(osv.osv):
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
from sale_order s
right join sale_order_line l on (s.id=l.order_id)
group by s.journal_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
group by s.journal_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
)
""")
report_sale_journal_sale()

77
addons/sale_journal/sale_journal_view.xml
View File

@ -91,10 +91,31 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_sale_journal_search">
<field name="name">sale_journal.sale.journal.search</field>
<field name="model">sale_journal.sale.journal</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Journal">
<group col="8" colspan="4">
<filter icon="terp-sale" string="My" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
<filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_definition_journal">
<field name="res_model">sale_journal.sale.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_sale_journal_search"/>
</record>
<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
@ -104,32 +125,11 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
<field name="search_view_id" ref="view_sale_journal_search"/>
</record>
<menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
<field name="name">My open journals</field>
<field name="res_model">sale_journal.sale.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
<field name="name">Open journals</field>
<field name="res_model">sale_journal.sale.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_extended"/>
<record model="ir.ui.view" id="sale_journal_sale_order">
<field name="name">sale.order.journal.view.form</field>
<field name="type">form</field>
@ -303,27 +303,36 @@
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
<field name="name">Sales by journal (this month)</field>
<field name="res_model">sale_journal.sale.stats</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
<record model="ir.ui.view" id="view_sale_journal_sale_stats_search">
<field name="name">sale_journal.sale.stats.search</field>
<field name="model">sale_journal.sale.stats</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Journal">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="state" select="1"/>
<field name="journal_id" select="1"/>
</group>
</search>
</field>
</record>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
<menuitem name="Sales by Journal (This Month)" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_month"/>
<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
<field name="name">Sales by Journal</field>
<field name="res_model">sale_journal.sale.stats</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
</record>
<menuitem name="Sales by Journal (All Months)" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
<act_window name="Monthly sales"
domain="[('journal_id', '=', active_id)]"

160
addons/scrum/scrum_view.xml
View File

@ -111,31 +111,35 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="view_scrum_product_backlog_search">
<field name="name">scrum.product.backlog.search</field>
<field name="model">scrum.product.backlog</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Product Backlogs">
<group col="10" colspan="4">
<filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
<filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="project_id" select="1"/>
<field name="sprint_id" select="1"/>
<field name="user_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_product_backlog_form" model="ir.actions.act_window">
<field name="name">Backlogs</field>
<field name="res_model">scrum.product.backlog</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_scrum_product_backlog_search"/>
</record>
<menuitem action="action_product_backlog_form" id="menu_action_product_backlog_form" parent="scrum.next_id_67"/>
<record id="action_product_backlog_form_draft" model="ir.actions.act_window">
<field name="name">Draft Backlogs</field>
<field name="res_model">scrum.product.backlog</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_product_backlog_form_open" model="ir.actions.act_window">
<field name="name">Opened Backlogs</field>
<field name="res_model">scrum.product.backlog</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<!--
Scrum Sprint
-->
@ -192,82 +196,36 @@
</field>
</record>
<record model="ir.ui.view" id="view_scrum_sprint_search">
<field name="name">scrum.sprint.search</field>
<field name="model">scrum.sprint</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sprints">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('scrum_master_id','=',uid)]" help="My Sprints"/>
<separator orientation="vertical"/>
<filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
<filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
<filter icon="terp-project" string="Done" domain="[('state','=','done')]" help="Done Sprints"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="date_start" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_sprint_all_tree" model="ir.actions.act_window">
<field name="name">Sprints</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_scrum_sprint_tree"/>
<field name="search_view_id" ref="view_scrum_sprint_search"/>
</record>
<menuitem action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="scrum.next_id_67"/>
<record id="action_sprint_form" model="ir.actions.act_window">
<field name="name">Sprint</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_scrum_sprint_form"/>
</record>
<menuitem action="action_sprint_form" id="menu_action_sprint_form" parent="menu_action_sprint_all_tree"/>
<record id="action_sprint_open_tree" model="ir.actions.act_window">
<field name="name">Opened Sprints</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
<record id="action_sprint_open_tree2" model="ir.actions.act_window">
<field name="name">Draft Sprints</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
<record id="action_sprint_open_tree3" model="ir.actions.act_window">
<field name="name">Sprints Done</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('state','=','done')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
<record id="action_sprint_open_tree4" model="ir.actions.act_window">
<field name="name">My Sprints (Product Owner)</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('product_owner_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
<record id="action_sprint_open_tree5" model="ir.actions.act_window">
<field name="name">My Sprints (Scrum Master)</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('scrum_master_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
<record id="action_sprint_open_tree6" model="ir.actions.act_window">
<field name="name">My opened sprints (Product Owner)</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('product_owner_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_extended"/>
<record id="action_sprint_open_tree7" model="ir.actions.act_window">
<field name="name">My opened sprints (Scrum Master)</field>
<field name="res_model">scrum.sprint</field>
<field name="view_type">tree</field>
<field name="domain">[('scrum_master_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_extended"/>
<!--
Daily Meeting
-->
@ -403,6 +361,18 @@
</field>
</field>
</record>
<record id="view_task_search_form" model="ir.ui.view">
<field name="name">scrum.task.search</field>
<field name="model">scrum.task</field>
<field name="type">search</field>
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<field name="project_id" position="after">
<field name="product_backlog_id" select="1"/>
</field>
</field>
</record>
<record id="action_view_task" model="ir.actions.act_window">
<field name="name">All Tasks</field>
@ -410,6 +380,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('scrum','=',1)]</field>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<record id="action_view_scrum_task_tree_view" model="ir.actions.act_window.view">
@ -428,25 +399,6 @@
<menuitem action="action_view_task" id="menu_action_view_task" parent="scrum.next_id_67"/>
<record id="action_view_task4" model="ir.actions.act_window">
<field name="name">My tasks</field>
<field name="res_model">scrum.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_extended"/>
<record id="action_view_task5" model="ir.actions.act_window">
<field name="name">My opened tasks</field>
<field name="res_model">scrum.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_view_task6" model="ir.actions.act_window">
<field name="name">Opened tasks</field>
<field name="res_model">scrum.task</field>

1
addons/stock/security/ir.model.access.csv
View File

@ -15,3 +15,4 @@
"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
"access_stock_lines_date","report.stock.lines.date all","model_report_stock_lines_date",,1,0,0,0
"access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
15 access_stock_report_prodlots stock.report.prodlots model_stock_report_prodlots stock.group_stock_manager 1 0 0 0
16 access_stock_location_product_manager stock.location product manager model_stock_location product.group_product_manager 1 0 0 0
17 access_stock_lines_date report.stock.lines.date all model_report_stock_lines_date 1 0 0 0
18 access_stock_report_tracklots stock.report.tracklots model_stock_report_tracklots stock.group_stock_user 1 1 1 1

5
addons/stock/stock.py
View File

@ -1000,7 +1000,10 @@ class stock_move(osv.osv):
\nThe state is \'Waiting\' if the move is waiting for another one.'),
'price_unit': fields.float('Unit Price',
digits=(16, int(config['price_accuracy']))),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
}
_constraints = [
(_check_tracking,

372
addons/stock/stock_view.xml
View File

@ -93,15 +93,6 @@
<field name="filter" eval="True"/>
</record>
<record id="action_inventory_form_new" model="ir.actions.act_window">
<field name="name">New Periodical Inventory</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.inventory</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="domain">[('state','=','draft')]</field>
</record>
=============================
Lot
=============================
@ -598,6 +589,26 @@
</form>
</field>
</record>
<record id="view_stock_picking_filter" model="ir.ui.view">
<field name="name">stock.picking.list.select</field>
<field name="model">stock.picking</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Stock Picking">
<group col="8" colspan="4">
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
<separator orientation="vertical"/>
<field name="location_id" select="1"/>
<field name="location_dest_id" select="1"/>
<field name="name" select="1"/>
<field name="address_id" select="1"/>
</group>
</search>
</field>
</record>
#
# Delivery Orders
@ -742,74 +753,6 @@
<menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
<record id="action_picking_tree2_delivery" model="ir.actions.act_window">
<field name="name">Delivery Orders to Process</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_delivery_tree"/>
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2_toproc" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_delivery_form"/>
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2_toproc_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
</record>
<record id="action_picking_tree3_delivery" model="ir.actions.act_window">
<field name="name">Future Delivery Orders</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_delivery_tree"/>
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2_waiting" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_delivery_form"/>
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2_waiting_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
</record>
<record id="action_picking_calendar_delivery" model="ir.actions.act_window">
<field name="name">Calendar of Deliveries</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">calendar,tree,form</field>
<field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner'}</field>
</record>
#
# Sending Products
#
@ -917,7 +860,6 @@
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','out')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
@ -939,64 +881,6 @@
</record>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
<record id="action_picking_tree2" model="ir.actions.act_window">
<field name="name">Available Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','assigned'),('type','=','out')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_out_tree"/>
<field name="act_window_id" ref="action_picking_tree2"/>
</record>
<record id="action_picking_tree2_out_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_out_form"/>
<field name="act_window_id" ref="action_picking_tree2"/>
</record>
<record id="action_picking_tree2_out_view2_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree2"/>
</record>
<record id="action_picking_tree3" model="ir.actions.act_window">
<field name="name">Confirmed Picking Waiting Availability</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_out_tree"/>
<field name="act_window_id" ref="action_picking_tree3"/>
</record>
<record id="action_picking_tree3_out_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_out_form"/>
<field name="act_window_id" ref="action_picking_tree3"/>
</record>
<record id="action_picking_tree3_out_view2_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree3"/>
</record>
#
# Reception of Products
#
@ -1106,7 +990,6 @@
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@ -1128,64 +1011,6 @@
</record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
<record id="action_picking_tree5" model="ir.actions.act_window">
<field name="name">Picking to Process</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','assigned'),('type','=','in')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_in_tree"/>
<field name="act_window_id" ref="action_picking_tree5"/>
</record>
<record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_in_form"/>
<field name="act_window_id" ref="action_picking_tree5"/>
</record>
<record id="action_invoice_tree6_view2_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree5"/>
</record>
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended"/>
<record id="action_picking_form" model="ir.actions.act_window">
<field name="name">New Reception Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="domain">[('type','=','in')]</field>
</record>
<record id="action_picking_form_view1" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_in_tree"/>
<field name="act_window_id" ref="action_picking_form"/>
</record>
<record id="action_picking_form_view2" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_in_form"/>
<field name="act_window_id" ref="action_picking_form"/>
</record>
<record id="action_picking_form_view2_cal" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_form"/>
</record>
<menuitem action="action_picking_form" id="menu_action_picking_form" parent="menu_action_picking_tree4"/>
<record id="action_picking_tree6" model="ir.actions.act_window">
<field name="name">Internal Moves</field>
<field name="res_model">stock.picking</field>
@ -1194,47 +1019,10 @@
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
<record id="action_picking_tree7" model="ir.actions.act_window">
<field name="name">Available Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree8" model="ir.actions.act_window">
<field name="name">Confirmed Picking Waiting Availability</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree9" model="ir.actions.act_window">
<field name="name">New Internal Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar</field>
<field name="domain">[('state','=','draft'),('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner'}</field>
</record>
<menuitem action="action_picking_tree9" id="menu_action_picking_tree9" parent="menu_action_picking_tree6"/>
=============================
Move Tracking
=============================
@ -1309,45 +1097,125 @@
</form>
</field>
</record>
<record id="view_move_search" model="ir.ui.view">
<field name="name">stock.move.search</field>
<field name="model">stock.move</field>
<field name="type">tree</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<search string="Stock Moves">
<group col="8" colspan="4">
<filter icon="terp-stock" string="Draft" domain="[('state','=','draft')]" help="Draft Moves"/>
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
<separator orientation="vertical"/>
<field name="location_id" select="1"/>
<field name="location_dest_id" select="1"/>
<field name="product_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_move_form2" model="ir.actions.act_window">
<field name="name">Stock Moves</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_move_search"/>
</record>
<menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability_low"/>
<record id="action_move_form3" model="ir.actions.act_window">
<field name="name">Draft Moves</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_id" ref="view_move_tree"/>
<field name="filter" eval="True"/>
</record>
<record id="action_move_form4" model="ir.actions.act_window">
<field name="name">Available Moves</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','assigned')]</field>
<field name="view_id" ref="view_move_tree"/>
<field name="filter" eval="True"/>
</record>
<record id="action_picking_all" model="ir.actions.act_window">
<field name="name">Picking</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="view_stock_picking_filter"/>
<field name="context">{'contact_display': 'partner'}</field>
</record>
<menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/>
====================================
Reception Picking (By Stock Move)
====================================
<record id="view_move_tree_reception_picking" model="ir.ui.view">
<field name="name">stock.move.tree2</field>
<field name="model">stock.move</field>
<field name="type">tree</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<tree color="grey:state=='cancel' or state=='done'" string="Moves">
<field name="picking_id" string="Reference"/>
<field name="origin" string="Purchase Order"/>
<field name="partner_id" string="Supplier"/>
<field name="product_id"/>
<field name="product_qty" />
<field name="product_uom" string="UOM"/>
<field name="prodlot_id" string="Lot"/>
<field name="date_planned"/>
<field name="backorder_id"/>
<field name="state"/>
<button name="action_done" states="done" string="Done" type="object" icon="gtk-close"/>
<button name="%(partial_move)d" string="Partial" type="action" icon="gtk-justify-fill"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
</tree>
</field>
</record>
<record id="view_move_form_reception_picking" model="ir.ui.view">
<field name="name">stock.move.form2</field>
<field name="model">stock.move</field>
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<form string="Moves">
<field name="picking_id"/>
<field name="product_id"/>
<field name="product_qty" />
<field name="product_uom" string="UOM"/>
<field name="prodlot_id"/>
<field name="date_planned"/>
<field name="state"/>
</form>
</field>
</record>
<record id="view_move_search_reception_picking" model="ir.ui.view">
<field name="name">stock.move.search2</field>
<field name="model">stock.move</field>
<field name="type">search</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<search string="Stock Moves">
<group col="8" colspan="4">
<filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
<filter icon="terp-stock" string="Planned Today" domain="[('date_planned','=',time.strftime('%%m-%%d-%%Y %%H:%%M:%%S')))]" help="Orders planned for today"/>
<separator orientation="vertical"/>
<field name="origin" string="Purchase Order"/>
<field name="partner_id" string="Supplier"/>
<field name="product_id"/>
</group>
</search>
</field>
</record>
<record id="action_reception_picking_move" model="ir.actions.act_window">
<field name="name">Reception Picking Stock Moves</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="search_view_id" ref="view_move_search_reception_picking"/>
</record>
<menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_root"/>
# -------------------------------------------------------------
# Stock incoterms

7
addons/stock/stock_wizard.xml
View File

@ -21,6 +21,13 @@
name="stock.partial_picking"
string="Partial picking"/>
<wizard
id="partial_move"
model="stock.move"
multi="True"
name="stock.partial_move"
string="Partial Move"/>
<wizard
id="track_line"
model="stock.move"

1
addons/stock/wizard/__init__.py
View File

@ -21,6 +21,7 @@
import stock_traceability
import wizard_partial_picking
import wizard_partial_move
import wizard_picking_make
import wizard_replacement
import wizard_return

218
addons/stock/wizard/wizard_partial_move.py Normal file
View File

@ -0,0 +1,218 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
import netsvc
from tools.misc import UpdateableStr, UpdateableDict
import pooler
import wizard
from osv import osv
import tools
from tools.translate import _
_moves_arch = UpdateableStr()
_moves_fields = UpdateableDict()
_moves_arch_end = '''<?xml version="1.0"?>
<form string="Picking result">
<label string="Move(s) have been successfully Done !" colspan="4"/>
</form>'''
def make_default(val):
def fct(uid, data, state):
return val
return fct
def _to_xml(s):
return (s or '').replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
def _get_moves(self, cr, uid, data, context):
move_obj = pooler.get_pool(cr.dbname).get('stock.move')
move_lines = move_obj.browse(cr, uid, data['ids'], context)
res = {}
_moves_fields.clear()
_moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Partial Stock Moves">']
for move in move_lines:
quantity = move.product_qty
if move.state <> 'assigned':
quantity = 0
_moves_arch_lst.append('<field name="move%s" />' % (move.id,))
_moves_fields['move%s' % move.id] = {
'string': _to_xml(move.name),
'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
price = 0
if hasattr(move, 'purchase_line_id') and move.purchase_line_id:
price = move.purchase_line_id.price_unit
currency = 0
if hasattr(move.picking_id, 'purchase_id') and move.picking_id.purchase_id:
currency = move.picking_id.purchase_id.pricelist_id.currency_id.id
_moves_arch_lst.append('<group col="6"><field name="uom%s" nolabel="1"/>\
<field name="price%s"/>' % (move.id, move.id,))
_moves_fields['price%s' % move.id] = {'string': 'Unit Price',
'type': 'float', 'required': True, 'default': make_default(price)}
_moves_fields['uom%s' % move.id] = {'string': 'UOM', 'type': 'many2one',
'relation': 'product.uom', 'required': True,
'default': make_default(move.product_uom.id)}
_moves_arch_lst.append('<field name="currency%d" nolabel="1"/></group>' % (move.id,))
_moves_fields['currency%s' % m.id] = {'string': 'Currency',
'type': 'many2one', 'relation': 'res.currency',
'required': True, 'default': make_default(currency)}
_moves_arch_lst.append('<newline/>')
res.setdefault('moves', []).append(move.id)
_moves_arch_lst.append('</form>')
_moves_arch.string = '\n'.join(_moves_arch_lst)
return res
def _do_split(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
move_obj = pool.get('stock.move')
pick_obj = pool.get('stock.picking')
product_obj = pool.get('product.product')
currency_obj = pool.get('res.currency')
users_obj = pool.get('res.users')
uom_obj = pool.get('product.uom')
move_lines = move_obj.browse(cr, uid, data['ids'])
wf_service = netsvc.LocalService("workflow")
complete, too_few, too_many = [], [], []
for move in move_lines:
states = []
if move.product_qty == data['form']['move%s' % move.id]:
complete.append(move)
elif move.product_qty > data['form']['move%s' % move.id]:
too_few.append(move)
else:
too_many.append(move)
# Average price computation
if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
product = move.product_id
user = users_obj.browse(cr, uid, uid)
qty = data['form']['move%s' % move.id]
uom = data['form']['uom%s' % move.id]
price = data['form']['price%s' % move.id]
currency = data['form']['currency%s' % move.id]
qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
if (qty > 0):
new_price = currency_obj.compute(cr, uid, currency,
user.company_id.currency_id.id, price)
new_price = uom_obj._compute_price(cr, uid, uom, new_price,
product.uom_id.id)
if product.qty_available<=0:
new_std_price = new_price
else:
new_std_price = ((product.standard_price * product.qty_available)\
+ (new_price * qty))/(product.qty_available + qty)
product_obj.write(cr, uid, [product.id],
{'standard_price': new_std_price})
move_obj.write(cr, uid, move.id, {'price_unit': new_price})
for move in too_few:
if data['form']['move%s' % move.id] <> 0:
new_move = move_obj.copy(cr, uid, move.id,
{
'product_qty' : data['form']['move%s' % move.id],
'product_uos_qty':data['form']['move%s' % move.id],
'picking_id' : move.picking_id.id,
'state': 'assigned',
'move_dest_id': False,
'price_unit': move.price_unit,
})
complete.append(move_obj.browse(cr, uid, new_move))
move_obj.write(cr, uid, move.id,
{
'product_qty' : move.product_qty - data['form']['move%s' % move.id],
'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
})
for move in too_many:
move_obj.write(cr, uid, move.id,
{
'product_qty': data['form']['move%s' % move.id],
'product_uos_qty': data['form']['move%s' % move.id]
})
complete.append(move)
for move in complete:
move_obj.action_done(cr, uid, [move.id])
# TOCHECK : Done picking if all moves are done
cr.execute('select move.id from stock_picking pick \
right join stock_move move on move.picking_id = pick.id and move.state = ''%s'' where pick.id = %s',
('done', move.picking_id.id))
res = cr.fetchall()
if len(res) == len(move.picking_id.move_lines):
pick_obj.action_done(cr, uid, [move.picking_id.id])
#wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
#wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
return {}
class partial_move(wizard.interface):
states = {
'init': {
'actions': [ _get_moves ],
'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields,
'state' : (
('end', 'Cancel'),
('split', 'Partial')
)
},
},
'split': {
'actions': [ _do_split ],
'result': {'type': 'state', 'state': 'end2'},
},
'end2': {
'actions': [],
'result': {'type': 'form', 'arch': _moves_arch_end,
'fields': {},
'state': (
('end', 'Close'),
)
},
},
}
partial_move('stock.partial_move')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

35
addons/wiki/wiki_view.xml
View File

@ -137,28 +137,35 @@
</field>
</record>
<record model="ir.actions.act_window" id="action_wiki">
<field name="name">Search a Pages</field>
<field name="res_model">wiki.wiki</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_wiki_tree"/>
<field name="context">{'section':'1'}</field>
<record id="view_wiki_filter" model="ir.ui.view">
<field name="name">wiki.wiki.search</field>
<field name="model">wiki.wiki</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Wiki">
<group col='8' colspan='4'>
<filter icon="gtk-execute" string="My" domain="[('create_uid','=',uid)]" help="My Pages"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="group_id" select="1"/>
<field name="text_area" select="1"/>
<field name="review" select="1"/>
</group>
</search>
</field>
</record>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search a Page" action="action_wiki"/>
<!-- My Pages-->
<record model="ir.actions.act_window" id="action_wiki_mypages">
<field name="name">My Pages</field>
<record model="ir.actions.act_window" id="action_wiki">
<field name="name">Search Pages</field>
<field name="res_model">wiki.wiki</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_wiki_tree"/>
<field name="context">{'section':'1'}</field>
<field name="domain">[('create_uid','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_wiki_filter"/>
</record>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search Pages" action="action_wiki"/>
<!-- Pages Waiting Review -->
<record model="ir.actions.act_window" id="action_wiki_review">
<field name="name">Pages Waiting Review</field>