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

[MERGE]: Merge with trunk addons

Browse Source 
bzr revid: rpa@tinyerp.com-20100309054243-fpakr6ym538hv2cf
This commit is contained in:
rpa (Open ERP)
2010-03-09 11:12:43 +05:30
parent 489ac80697 5800568468
commit 6ff5531874
9 changed files with 130 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_tax_code.py
-2
View File
@@ -47,8 +47,6 @@ def _record_to_report_line(record):
}
class account_tax_code_report(rml_parse.rml_parse):
_name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
addons/auction/auction.py
+1 -1
View File
@@ -63,7 +63,7 @@ class auction_dates(osv.osv):
return name
_columns = {
'name': fields.char('Auction date', size=64, required=True),
'name': fields.char('Auction Name', size=64, required=True),
'expo1': fields.date('First Exposition Day', required=True),
'expo2': fields.date('Last Exposition Day', required=True),
'auction1': fields.date('First Auction Day', required=True),
addons/crm/crm.py
+1 -1
View File
@@ -280,7 +280,7 @@ class crm_case(osv.osv):
'section_id': _get_section,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
}
_order = 'date_deadline desc, date desc,id desc'
_order = 'date_deadline desc, create_date desc,id desc'
def unlink(self, cr, uid, ids, context={}):
for case in self.browse(cr, uid, ids, context):
addons/event/event_view.xml
+3 -3
View File
@@ -162,7 +162,7 @@
<field name="arch" type="xml">
<tree string="Registration">
<field name="id"/>
<field name="date"/>
<field name="create_date"/>
<field name="event_id"/>
<field name="partner_id"/>
<field name="nb_register"/>
@@ -331,14 +331,14 @@
</record>
<record model="ir.actions.act_window" id="action_event_registration">
<field name="name">Events On Registrations</field>
<field name="name">Registration by Event</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" name="Registrations Per Event"/>
<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" />
<!-- end... -->
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+16 -16
View File
@@ -197,24 +197,24 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Timesheet">
<group col="10" colspan="4">
<filter icon="terp-crm" string="Unvalidated" domain="[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Unvalidated Timesheets"/>
<separator orientation="vertical"/>
<field name="state">
<filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
</field>
<field name="name" select="1"/>
<field name="user_id" select="1" widget="selection">
<group col="10" colspan="4">
<filter icon="terp-crm" string="Unvalidated" domain="[('state','!=','done'),('date_to','&lt;',current_date')]" help="Unvalidated Timesheets"/>
<separator orientation="vertical"/>
<field name="state">
<filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
</field>
<field name="name" select="1"/>
<field name="user_id" select="1" widget="selection">
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Timesheet"/>
</field>
<field name="department_id" widget="selection">
<filter icon="terp-crm"
domain="[('department_id','=',context.get('department_id',False))]"
help="My Departments Timesheet"/>
</field>
</group>
</search>
<field name="department_id" widget="selection">
<filter icon="terp-crm"
domain="[('department_id','=',context.get('department_id',False))]"
help="My Departments Timesheet"/>
</field>
</group>
</search>
</field>
</record>
addons/membership/membership_view.xml
+5 -8
View File
@@ -97,7 +97,7 @@
<!-- MEMBERSHIP/CURRENT MEMBERS -->
<record model="ir.ui.view" id="membership_members_tree">
<field name="name">Current members</field>
<field name="name">Members</field>
<field name="model">res.partner</field>
<field name="type">tree</field>
<field name="arch" type="xml">
@@ -129,10 +129,10 @@
</record>
<record model="ir.actions.act_window" id="action_membership_members">
<field name="name">Current members</field>
<field name="name">Members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
<field name="search_view_id" ref="view_res_partner_member_filter"/>
<field name="search_view_id" ref="view_res_partner_member_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
@@ -148,10 +148,7 @@
<field name="act_window_id" ref="action_membership_members"/>
</record>
<menuitem name="Current members" parent="menu_member"
id="menu_members"
sequence="2"
action="action_membership_members"/>
<menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
<!-- PARTNERS -->
@@ -189,7 +186,7 @@
<field name="membership_start" select="2"/>
<field name="membership_stop" select="2"/>
<field name="membership_cancel" select="2"/>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<field name="member_lines" nolabel="1" colspan="4">
<tree string="Membership">
<field name="date_from"/>
<field name="date_to"/>
addons/project/security/project_security.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="task_visibility_rule">
<field name="domain_force">['|','|',('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
<field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
<field name="rule_group" ref="task_visibility_rule_group"/>
</record>
addons/project_issue/project_feature_menu.xml
+8 -8
View File
@@ -1,23 +1,23 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
######################## Future Request (menu) ###########################
######################## Feature Request (menu) ###########################
<record model="ir.actions.act_window" id="action_project_feature">
<field name="name">Future Requests</field>
<field name="name">Feature Requests</field>
<field name="res_model">project.issue</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="view_id" ref="project_feature_tree_view"/>
<field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
<field name="search_view_id" ref="view_project_issue_filter"/>
<field name="search_view_id" ref="view_project_feature_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_feature_tree_view0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="view_id" ref="project_feature_tree_view"/>
<field name="act_window_id" ref="action_project_feature"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_feature_calendar_view0">
@@ -33,6 +33,6 @@
<field name="act_window_id" ref="action_project_feature"/>
</record>
<menuitem name="Feature Requests" id="menu_project_issue_future_request" parent="project.menu_project_management" action="action_project_feature"/>
<menuitem name="Feature Requests" id="menu_project_issue_feature_request" parent="project.menu_project_management" action="action_project_feature"/>
</data>
</openerp>
addons/project_issue/project_issue_view.xml
+95 -21
View File
@@ -11,23 +11,23 @@
<field name="name">Issue Categories</field>
<field name="res_model">crm.case.categ</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
<field name="context">{'object_id':'project.issue'}</field>
<field name="context">{'object_id':'project.issue'}</field>
</record>
# ------------------------------------------------------
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
# ------------------------------------------------------
<record id="project_issue_stage_act" model="ir.actions.act_window">
<field name="name">Issue Stages</field>
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
<field name="context">{'object_id':'project.issue'}</field>
<field name="context">{'object_id':'project.issue'}</field>
</record>
<menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
<record model="ir.ui.view" id="project_issue_form_view">
<field name="name">Project Issue Tracker Form</field>
<field name="model">project.issue</field>
@@ -35,8 +35,8 @@
<field name="arch" type="xml">
<form string="Issue Tracker Form">
<group colspan="4" col="6">
<field name="name" string="Title" colspan="2"/>
<field name="project_id" required="True"/>
<field name="name" string="Title" colspan="2"/>
<field name="project_id" required="True"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
<group col="3" colspan="2">
<field name="task_id"/>
@@ -45,7 +45,7 @@
icon="gtk-index" type="action"
attrs="{'invisible':[('task_id','!=',False)]}" />
</group>
</group>
<!-- <group colspan="4" col="5">
<label string="" colspan="2"/>
@@ -55,19 +55,19 @@
<button string="Convert To Bug"
name="convert_to_bug"
icon="gtk-convert" type="object" attrs="{'invisible':[('categ_id','=',ref('feature_request_categ'))]}"/>
</group> -->
<notebook colspan="4">
<page string="General">
<separator colspan="4" string="Communication"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
<field name="email_from" colspan="2"/>
<field name="email_from" colspan="2"/>
<separator colspan="4" string="Status and Categorization"/>
<group colspan="4" col="6">
<field name="type_id" string="Version"/>
<field name="type_id" string="Version"/>
<field name="priority" string="Severity"/>
<field name="user_id" />
<label string="Resolution: " align="1.0"/>
@@ -147,7 +147,7 @@
</field>
</record>
<record model="ir.ui.view" id="project_issue_tree_view">
<field name="name">Proejct Issue Tracker Tree</field>
<field name="name">Project Issue Tracker Tree</field>
<field name="model">project.issue</field>
<field name="type">tree</field>
<field name="arch" type="xml">
@@ -155,7 +155,7 @@
<field name="id"/>
<field name="name" string="Title"/>
<field name="partner_id"/>
<field name="priority" string="Severity"/>
<field name="priority" string="Severity"/>
<field name="stage_id" string="Resolution"/>
<button icon="gtk-go-back" string=""
name="stage_previous" type="object"
@@ -182,7 +182,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Issue Tracker Search">
<group col="3" colspan="1">
<group col="3" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -192,8 +192,8 @@
string=" 7 Days " separator="1"
domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Bugs during last 7 days"
/>
/>
</group>
<separator orientation="vertical"/>
<group col="5" colspan="2">
@@ -204,7 +204,7 @@
<field name="state" select="1">
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
<filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
</field>
</field>
<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
<filter icon="terp-crm"
domain="[('project_id','=',context.get('project_id',False))]"
@@ -214,7 +214,7 @@
</group>
</search>
</field>
</record>
</record>
<record model="ir.ui.view" id="project_issue_calendar_view">
<field name="name">Project Issue Tracker Calendar</field>
@@ -228,5 +228,79 @@
</calendar>
</field>
</record>
# ------------------------------------------------------
# Feature Requests
# ------------------------------------------------------
<record model="ir.ui.view" id="project_feature_tree_view">
<field name="name">Project Issue- Feature Tracker Tree</field>
<field name="model">project.issue</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Feature Tracker Tree" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="id"/>
<field name="name" string="Feature description"/>
<field name="partner_id"/>
<field name="priority" string="Severity"/>
<field name="stage_id" string="Resolution"/>
<button icon="gtk-go-back" string=""
name="stage_previous" type="object"
states="open,draft,pending,done,cancel" />
<button icon="gtk-go-forward" string=""
name="stage_next" type="object"
states="open,draft,pending,done,cancel" />
<field name="type_id" string="Version"/>
<field name="user_id"/>
<field name="state"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
</tree>
</field>
</record>
<record id="view_project_feature_filter" model="ir.ui.view">
<field name="name">Project Issue- Feature Tracker Search</field>
<field name="model">project.issue</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Feature Tracker Search">
<group col="3" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's features"
/>
<filter icon="gtk-media-rewind"
string=" 7 Days " separator="1"
domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Features during last 7 days"
/>
</group>
<separator orientation="vertical"/>
<group col="5" colspan="2">
<field name="name" select='1' string="Feature description"/>
<field name="user_id" select="1" widget="selection">
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
</field>
<field name="state" select="1">
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
<filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
</field>
<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
<filter icon="terp-crm"
domain="[('project_id','=',context.get('project_id',False))]"
help="My Project"
/>
</field>
</group>
</search>
</field>
</record>
</data>
</openerp>