pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge]:Merged remaining changes

Browse Source 
bzr revid: uco@tinyerp.co.in-20091124103341-u11umpaatol01yqp
This commit is contained in:
uco (OpenERP)
2009-11-24 16:03:41 +05:30
parent b7beed6427
commit 56c69a3fca
10 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_view.xml
+1 -1
View File
@@ -490,7 +490,7 @@
<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_menu"/>
<menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_useability_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>
addons/delivery/delivery_view.xml
+1 -1
View File
@@ -180,7 +180,7 @@
<field name="context">{'contact_display': 'partner'}</field>
<field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
</record>
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended_menu"/>
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_useability_extended"/>
</data>
</openerp>
addons/hr_holidays/hr_view.xml
+2 -2
View File
@@ -253,7 +253,7 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended_menu" />
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_useability_extended" />
<record model="ir.actions.act_window" id="action_my_holiday_draft">
<field name="name">My Draft Leave Request</field>
@@ -309,7 +309,7 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended_menu"/>
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_useability_extended"/>
<record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+2 -2
View File
@@ -212,7 +212,7 @@
<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_menu"/>
<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_useability_extended"/>
<record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
<field name="name">My timesheets to confirm</field>
@@ -235,7 +235,7 @@
<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_menu"/>
<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_useability_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>
addons/project/project_view.xml
+3 -3
View File
@@ -235,7 +235,7 @@
<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_menu"
<menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_useability_extended"
sequence="1"/>
<record id="open_view_my_project_my_run" model="ir.actions.act_window">
@@ -534,7 +534,7 @@
<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_menu" />
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_useability_extended" />
<record id="action_view_task_department" model="ir.actions.act_window">
<field name="name">My Department Tasks</field>
@@ -546,7 +546,7 @@
<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_menu"/>
<menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_useability_extended"/>
<record id="action_view_task5_pending" model="ir.actions.act_window">
<field name="name">My Pending Tasks</field>
addons/report_sale/report_sale.py
+29 -18
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,18 +15,20 @@
# 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/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import tools
from osv import fields,osv
class report_sale_order_product(osv.osv):
_name = "report.sale.order.product"
_description = "Sales Orders by Products"
_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 +44,18 @@ class report_sale_order_product(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 = 'name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_sale_order_product')
cr.execute("""
create or replace view report_sale_order_product 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,
l.product_id,
sum(l.product_uom_qty*u.factor) as quantity,
@@ -60,7 +66,7 @@ class report_sale_order_product(osv.osv):
right join sale_order_line l on (s.id=l.order_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_uom_qty != 0
group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
)
""")
report_sale_order_product()
@@ -70,7 +76,7 @@ class report_sale_order_category(osv.osv):
_description = "Sales Orders by Categories"
_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'),
@@ -86,14 +92,19 @@ class report_sale_order_category(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 = 'name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_sale_order_category')
cr.execute("""
create or replace view report_sale_order_category 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,
t.categ_id as category_id,
sum(l.product_uom_qty*u.factor) as quantity,
@@ -105,8 +116,8 @@ class report_sale_order_category(osv.osv):
left join product_product p on (p.id=l.product_id)
left join product_template t on (t.id=p.product_tmpl_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_uom_qty != 0
group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
where l.product_uom_qty != 0
group by t.categ_id,to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
)
""")
report_sale_order_category()
@@ -119,13 +130,13 @@ class report_turnover_per_month(osv.osv):
'name': fields.date('Month', readonly=True),
'turnover': fields.float('Total Turnover', readonly=True),
}
def init(self, cr):
cr.execute("""
create or replace view report_turnover_per_month as (
select min(am.id) as id, sum(credit) as turnover,to_char(am.date, 'YYYY-MM-01') as name from account_move_line am
where am.account_id in (select distinct(account_id) from account_invoice_line)
and
where am.account_id in (select distinct(account_id) from account_invoice_line)
and
am.move_id in(select distinct(aw.move_id) from account_invoice aw,account_invoice_line l where l.invoice_id=aw.id)
group by to_char(am.date, 'YYYY-MM-01')
)
@@ -137,17 +148,17 @@ class report_turnover_per_product(osv.osv):
_description = "Turnover Per Product"
_auto = False
_rec_name = 'product_id'
_columns = {
'product_id': fields.many2one('product.product','Product', readonly=True),
'turnover': fields.float('Total Turnover', readonly=True),
}
def init(self, cr):
cr.execute("""
create or replace view report_turnover_per_product as (
select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id
from account_move_line am
select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id
from account_move_line am
group by am.product_id
)
""")
@@ -176,12 +187,12 @@ class report_sale_order_created(osv.osv):
'create_date' : fields.datetime('Create Date', readolnly=True)
}
_order = 'create_date'
def init(self, cr):
cr.execute("""create or replace view report_sale_order_created as (
select
sale.id as id, sale.date_order as date_order, sale.name as name,
sale.partner_id as partner_id,
sale.partner_id as partner_id,
sale.partner_shipping_id as partner_shipping_id,
sale.amount_untaxed as amount_untaxed, sale.state as state,
sale.create_date as create_date
addons/report_sale/report_sale_view.xml
+2
View File
@@ -9,6 +9,7 @@
<field name="arch" type="xml">
<form string="Sale Orders by Product">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="count"/>
<field name="quantity" select="2"/>
@@ -73,6 +74,7 @@
<field name="arch" type="xml">
<form string="Sale Orders by category">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="count"/>
<field name="quantity" select="2"/>
addons/sale/sale_view.xml
+2 -2
View File
@@ -260,7 +260,7 @@
<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_menu"/>
<menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
<record id="action_order_tree_all" model="ir.actions.act_window">
<field name="name">All Sales Order</field>
@@ -270,7 +270,7 @@
<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_menu"/>
<menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
<record id="action_order_tree_new" model="ir.actions.act_window">
<field name="name">New Quotation</field>
addons/scrum/scrum_view.xml
+8 -8
View File
@@ -216,7 +216,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_useability_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>
@@ -224,7 +224,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_useability_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>
@@ -232,7 +232,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
<record id="action_sprint_open_tree4" model="ir.actions.act_window">
<field name="name">My Sprints (Product Owner)</field>
@@ -241,7 +241,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_useability_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>
@@ -249,7 +249,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
<record id="action_sprint_open_tree6" model="ir.actions.act_window">
<field name="name">My opened sprints (Product Owner)</field>
@@ -258,7 +258,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_useability_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>
@@ -266,7 +266,7 @@
<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_menu"/>
<menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_useability_extended"/>
<!--
Daily Meeting
@@ -436,7 +436,7 @@
<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_menu"/>
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_useability_extended"/>
<record id="action_view_task5" model="ir.actions.act_window">
<field name="name">My opened tasks</field>
addons/stock/stock_view.xml
+1 -1
View File
@@ -1149,7 +1149,7 @@
<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_menu"/>
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/>
<record id="action_picking_form" model="ir.actions.act_window">
<field name="name">New Reception Packing</field>