From 71a3990a041696c4003b03a7e072cb50185b15ef Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 27 Sep 2010 19:14:03 +0530 Subject: [PATCH 1/2] [FIX]: Fixed pylint warnings bzr revid: rpa@tinyerp.com-20100927134403-d0xv04c0kkfkn724 --- addons/association/profile_association.py | 1 - addons/caldav/caldav_node.py | 11 +-- addons/caldav/calendar.py | 5 +- addons/crm/crm.py | 4 +- addons/crm/crm_installer.py | 5 -- addons/crm/report/crm_lead_report.py | 1 - addons/crm/report/crm_lead_report_view.xml | 4 +- addons/crm/wizard/crm_lead_to_opportunity.py | 6 -- addons/crm/wizard/crm_send_email.py | 4 +- addons/crm_fundraising/crm_fundraising.py | 2 +- addons/project/project.py | 8 +-- addons/project/wizard/project_task_close.py | 69 +++++++++---------- .../project/wizard/project_task_delegate.py | 3 - addons/project_gtd/project_gtd.py | 7 -- addons/project_issue/project_issue.py | 16 ++--- .../report/project_issue_report.py | 1 - addons/project_long_term/project_long_term.py | 30 +++----- .../wizard/project_compute_phases.py | 2 - .../wizard/project_compute_tasks.py | 4 -- .../wizard/project_schedule_tasks.py | 3 +- addons/project_scrum/project_scrum.py | 12 ++-- addons/resource/resource.py | 6 +- addons/sale/sale.py | 11 +-- addons/sale_crm/wizard/crm_make_sale.py | 1 - 24 files changed, 69 insertions(+), 147 deletions(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index eb9ac398500..2b73dd69885 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -20,7 +20,6 @@ ############################################################################## from osv import fields, osv -import pooler class profile_association_config_install_modules_wizard(osv.osv_memory): _name='profile.association.config.install_modules_wizard' diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py index 55be22f198e..11f720bdcab 100644 --- a/addons/caldav/caldav_node.py +++ b/addons/caldav/caldav_node.py @@ -19,10 +19,6 @@ # ############################################################################## -from osv import osv, fields -from tools.translate import _ -import pooler -import tools import time from document import nodes import StringIO @@ -141,7 +137,6 @@ class node_calendar(nodes.node_class): return str(result) def _get_dav_dropbox_home_URL(self, cr): - import xml.dom.minidom import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -153,7 +148,6 @@ class node_calendar(nodes.node_class): return url def _get_dav_notification_URL(self, cr): - import xml.dom.minidom import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -308,7 +302,8 @@ class node_calendar(nodes.node_class): calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) return calendar.description - def _get_dav_principal_collection_set(self, uri): + def _get_dav_principal_collection_set(self, cr): + import xml import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -341,7 +336,6 @@ class node_calendar(nodes.node_class): def _get_caldav_calendar_user_address_set(self, cr): import xml.dom.minidom - dirobj = self.context._dirobj uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) @@ -410,7 +404,6 @@ class res_node_calendar(nodes.node_class): self.res_id = res_id def open(self, cr, mode=False): - uid = self.context.uid if self.type in ('collection','database'): return False s = StringIO.StringIO(self.get_data(cr)) diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index 4f9afb034a4..88b0549a3de 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -293,7 +293,6 @@ class CalDAV(object): att_data = [] exdates = [] - _server_tzinfo = pytz.timezone(tools.get_server_timezone()) for cal_data in child.getChildren(): if cal_data.name.lower() == 'organizer': @@ -521,7 +520,7 @@ class CalDAV(object): ical = vobject.iCalendar() self.create_ics(cr, uid, datas, vobj, ical, context=context) return ical - except Exception, e: + except: raise # osv.except_osv(('Error !'), (str(e))) def import_cal(self, cr, uid, content, data_id=None, context=None): @@ -654,7 +653,7 @@ class Calendar(CalDAV, osv.osv): data_id = self.search(cr, uid, [])[0] cal = self.browse(cr, uid, data_id, context=context) cal_children = {} - count = 0 + for line in cal.line_ids: cal_children[line.name] = line.object_id.model objs = [] diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 9b4f9e2ef96..c6f7759859c 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -20,8 +20,6 @@ ############################################################################## import time -from datetime import datetime -from datetime import timedelta import base64 import tools from osv import fields @@ -431,7 +429,7 @@ class crm_case(object): # Send an email subject = "Reminder: [%s] %s" % (str(case.id), case.name, ) - flag = tools.email_send( + tools.email_send( src, [dest], subject, diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 3860a69b51c..32551d438c4 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -20,12 +20,7 @@ ############################################################################## from lxml import etree -from operator import itemgetter from osv import fields, osv -import netsvc -import os -import pooler -import tools class crm_installer(osv.osv_memory): _name = 'crm.installer' diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index fa53a373575..71d19b3d6f1 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -45,7 +45,6 @@ class crm_lead_report(osv.osv): @param context: A standard dictionary for contextual values """ res = {} - state_perc = 0.0 avg_ans = 0.0 for case in self.browse(cr, uid, ids, context): diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 99667400043..d35b8aea295 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -204,7 +204,7 @@ form {'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph - [] + [('type', '=', 'lead')] Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis. @@ -228,7 +228,7 @@ form {"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph - [] + [('type', '=', 'opportunity')] Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity. diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 2452132b64a..502dddcdcaa 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -19,7 +19,6 @@ # ############################################################################## -from mx.DateTime import now from osv import osv, fields from tools.translate import _ @@ -70,8 +69,6 @@ class crm_lead2opportunity(osv.osv_memory): id3 = data_obj.browse(cr, uid, id3, context=context).res_id lead = lead_obj.browse(cr, uid, record_id, context=context) - model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.lead')]) - for this in self.browse(cr, uid, ids, context=context): vals ={ @@ -144,7 +141,6 @@ Leads Could not convert into Opportunity")) @return : default values of fields. """ lead_obj = self.pool.get('crm.lead') - rec_ids = context and context.get('active_ids', []) data = context and context.get('active_ids', []) or [] res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context) for lead in lead_obj.browse(cr, uid, data, context=context): @@ -181,7 +177,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): lead_obj = self.pool.get('crm.lead') partner_obj = self.pool.get('res.partner') contact_obj = self.pool.get('res.partner.address') - rec_ids = context and context.get('active_ids', []) partner_id = False data = context and context.get('active_ids', []) or [] @@ -219,7 +214,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): partner_ids = self._create_partner(cr, uid, ids, context) mod_obj = self.pool.get('ir.model.data') result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter') - res = mod_obj.read(cr, uid, result, ['res_id']) value = {} data_obj = self.pool.get('ir.model.data') data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action') diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index aadd607c154..13dae7b35a1 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -131,8 +131,8 @@ class crm_send_new_email(osv.osv_memory): x_headers=x_headers ) - if not flag: - raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.')) +# if not flag: +# raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.')) msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'} case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \ diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index 0050642a5db..d815e645c10 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv, orm +from osv import fields, osv from crm import crm class crm_fundraising(crm.crm_case, osv.osv): diff --git a/addons/project/project.py b/addons/project/project.py index 274263682a6..da3fef05f66 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -28,7 +28,6 @@ from itertools import groupby from tools.misc import flatten from tools.translate import _ from osv import fields, osv -from tools import email_send as email class project_task_type(osv.osv): @@ -245,7 +244,6 @@ class project(osv.osv): if context is None: context = {} - task_obj = self.pool.get('project.task') proj = self.browse(cr, uid, id, context=context) default = default or {} context['active_test'] = False @@ -261,7 +259,6 @@ class project(osv.osv): context = {} project_obj = self.pool.get('project.project') data_obj = self.pool.get('ir.model.data') - task_obj = self.pool.get('project.task') result = [] for proj in self.browse(cr, uid, ids, context=context): parent_id = context.get('parent_id', False) @@ -279,8 +276,7 @@ class project(osv.osv): 'date':new_date_end, 'parent_id':parent_id}, context=context) result.append(new_id) - cr.execute('select id from project_task where project_id=%s', (proj.id,)) - res = cr.fetchall() + child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)], context=context) parent_id = self.read(cr, uid, new_id, ['analytic_account_id'])['analytic_account_id'][0] if child_ids: @@ -320,7 +316,7 @@ class project(osv.osv): if child_ids: self.setActive(cr, uid, child_ids, value, context=None) return True - + project() class users(osv.osv): diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py index 78ffa5a8338..7091f466e2c 100644 --- a/addons/project/wizard/project_task_close.py +++ b/addons/project/wizard/project_task_close.py @@ -19,11 +19,9 @@ # ############################################################################## -import time - from osv import fields, osv +import tools from tools.translate import _ -from tools import email_send as email class project_task_close(osv.osv_memory): """ @@ -47,7 +45,6 @@ class project_task_close(osv.osv_memory): context = {} record_id = context and context.get('active_id', False) or False task_pool = self.pool.get('project.task') - project_pool = self.pool.get('project.project') res = super(project_task_close, self).default_get(cr, uid, fields, context=context) task = task_pool.browse(cr, uid, record_id, context=context) @@ -77,41 +74,41 @@ class project_task_close(osv.osv_memory): return {} task = task_pool.browse(cr, uid, task_id, context=context) for data in self.browse(cr, uid, ids, context=context): - if res: - # Send Warn Message by Email to Manager and Customer - if data.manager_warn and not data.manager_email: - raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager.")) + # Send Warn Message by Email to Manager and Customer + if data.manager_warn and not data.manager_email: + raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager.")) - elif data.partner_warn and not data.partner_email: - raise osv.except_osv(_('Error'), _("Please specify the email address of Customer.")) + elif data.partner_warn and not data.partner_email: + raise osv.except_osv(_('Error'), _("Please specify the email address of Customer.")) - elif data.manager_warn or data.partner_warn: - project = task.project_id - subject = _("Task '%s' Closed") % task.name - if task.user_id and task.user_id.address_id and task.user_id.address_id.email: - from_adr = task.user_id.address_id.email - signature = task.user_id.signature - else: - raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!")) - val = { - 'name': task.name, - 'user_id': task.user_id.name, - 'task_id': "%d/%d" % (project.id, task.id), - 'date_start': task.date_start, - 'date_end': task.date_end, - 'state': task.state - } + elif data.manager_warn or data.partner_warn: + project = task.project_id + subject = _("Task '%s' Closed") % task.name + if task.user_id and task.user_id.address_id and task.user_id.address_id.email: + from_adr = task.user_id.address_id.email + signature = task.user_id.signature + else: + raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!")) + val = { + 'name': task.name, + 'user_id': task.user_id.name, + 'task_id': "%d/%d" % (project.id, task.id), + 'date_start': task.date_start, + 'date_end': task.date_end, + 'state': task.state + } - header = (project.warn_header or '') % val - footer = (project.warn_footer or '') % val - body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature) - if data.manager_warn and data.manager_email: - to_adr.append(data.manager_email) - if data.partner_warn and data.partner_email: - to_adr.append(data.partner_email) - mail_id = email(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr]) - if not mail_id: - raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings")) + to_adr = [] + header = (project.warn_header or '') % val + footer = (project.warn_footer or '') % val + body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature) + if data.manager_warn and data.manager_email: + to_adr.append(data.manager_email) + if data.partner_warn and data.partner_email: + to_adr.append(data.partner_email) + mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr]) + if not mail_id: + raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings")) return {} project_task_close() diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 2430b8a0896..ac160fb6c94 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -48,9 +48,6 @@ class project_task_delegate(osv.osv_memory): record_id = context and context.get('active_id', False) or False task_pool = self.pool.get('project.task') task = task_pool.browse(cr, uid, record_id, context=context) - project = task.project_id - manager = project.user_id or False - partner = task.partner_id or task.project_id.partner_id if 'name' in fields: if task.name.startswith(_('CHECK: ')): diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index f29780126e0..47c7c02cba8 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -22,16 +22,9 @@ import sys from osv import fields, osv -import ir import tools from tools.translate import _ -try: - from lxml import etree -except ImportError: - sys.stderr.write("ERROR: Import lxml module\n") - sys.stderr.write("ERROR: Try to install the python-lxml package\n") - class project_gtd_context(osv.osv): _name = "project.gtd.context" _description = "Context" diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 05e047914b7..19db547983b 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -19,21 +19,15 @@ # ############################################################################## -import base64 -import os -import re -import time -from datetime import datetime, timedelta -import binascii -import collections - -import tools from crm import crm -from osv import fields,osv,orm -from osv.orm import except_orm +from datetime import datetime +from osv import fields,osv from tools.translate import _ +import binascii +import time import tools + class project_issue(crm.crm_case, osv.osv): _name = "project.issue" _description = "Project Issue" diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 41ebaa3243e..97a340851ef 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -44,7 +44,6 @@ class project_issue_report(osv.osv): @param context: A standard dictionary for contextual values """ res = {} - avg_ans = 0.0 for report in self.browse(cr, uid, ids, context): res[report.id]= { diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 79837416d97..be0eb07bd47 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -19,8 +19,7 @@ # ############################################################################## -import time -from datetime import date, datetime, timedelta +from datetime import datetime from tools.translate import _ from osv import fields, osv from resource.faces import task as Task @@ -292,16 +291,11 @@ class project_phase(osv.osv): # Create a new project for each phase def Project(): start = start_date - minimum_time_unit = 1 - resource = phase_resource_obj # If project has working calendar then that # else the default one would be considered if calendar_id: - working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context) - vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id)) - - def phase(): - effort = duration + resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context) + resource_pool.compute_vacation(cr, uid, calendar_id) project = Task.BalancedProject(Project) s_date = project.phase.start.to_datetime() @@ -340,7 +334,6 @@ class project_phase(osv.osv): Schedule the tasks according to resource available and priority. """ task_pool = self.pool.get('project.task') - resource_pool = self.pool.get('resource.resource') if context is None: context = {} resources_list = self.generate_resources(cr, uid, ids, context=context) @@ -432,9 +425,7 @@ class project(osv.osv): """ if type(ids) in (long, int,): ids = [ids] - user_pool = self.pool.get('res.users') task_pool = self.pool.get('project.task') - resource_pool = self.pool.get('resource.resource') if context is None: context = {} @@ -493,7 +484,7 @@ class project_task(osv.osv): if context is None: context = {} user_pool = self.pool.get('res.users') - project_pool = self.pool.get('project.project') + resource_pool = self.pool.get('resource.resource') priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300, '4': 100} # Create dynamic no of tasks with the resource specified def create_tasks(task_number, eff, priorty=500, obj=False): @@ -501,28 +492,23 @@ class project_task(osv.osv): """ task is a dynamic method! """ - effort = eff if obj: resource = obj - priority = priorty task.__doc__ = "TaskNO%d" %task_number task.__name__ = "task%d" %task_number return task # Create a 'Faces' project with all the tasks and resources def Project(): - title = "Project" - start = datetime.strftime(datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M") try: resource = reduce(operator.or_, resources) except: raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!')) - minimum_time_unit = 1 + if calendar_id: # If project has working calendar - working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context) - vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context)) + resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context) + resource_pool.compute_vacation(cr, uid, calendar_id, context=context) # Dynamic creation of tasks - task_number = 0 for openobect_task in self.browse(cr, uid, ids, context=context): hours = str(openobect_task.planned_hours )+ 'H' if openobect_task.priority in priority_dict.keys(): @@ -556,5 +542,7 @@ class project_task(osv.osv): loop_no += 1 return True + project_task() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index c43dea56e91..ade1da5c9d9 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import datetime from tools.translate import _ from osv import fields, osv @@ -38,7 +37,6 @@ class project_compute_phases(osv.osv_memory): } def check_selection(self, cr, uid, ids, context=None): - data_select = self.read(cr, uid, ids, ['target_project'])[0] return self.compute_date(cr, uid, ids, context=context) diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index cb74649502f..0d5fa22e6a8 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -19,12 +19,8 @@ # ############################################################################## -import datetime - -from tools.translate import _ from osv import osv, fields - class project_compute_tasks(osv.osv_memory): _name = 'project.compute.tasks' _description = 'Project Compute Tasks' diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 0d9e9f381f1..48039112e86 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -19,9 +19,8 @@ # ############################################################################## -import datetime -from tools.translate import _ from osv import fields, osv + class project_schedule_task(osv.osv_memory): _name = "project.schedule.tasks" _description = 'project.schedule.tasks' diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index e3e48f70b86..e7a5a2ee48f 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -18,14 +18,13 @@ # along with this program. If not, see . # ############################################################################## -import time from mx import DateTime - -import netsvc -from osv import fields, osv, orm -import re -import tools +from osv import fields, osv from tools.translate import _ +import re +import time +import tools + class project_scrum_project(osv.osv): _inherit = 'project.project' @@ -333,7 +332,6 @@ class project_scrum_meeting(osv.osv): if context is None: context = {} meeting_id = self.browse(cr, uid, ids)[0] - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email: res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email) if not res: diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 6a41f5ae72f..b5112c981e6 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -20,13 +20,12 @@ ############################################################################## from datetime import datetime, timedelta -import time import math from faces import * from new import classobj from osv import fields, osv from tools.translate import _ -import tools + class resource_calendar(osv.osv): _name = "resource.calendar" _description = "Resource Calendar" @@ -63,7 +62,6 @@ class resource_calendar(osv.osv): dt_leave = self._get_leaves(cr, uid, id, resource) dt_leave.reverse() todo = hours - cycle = 0 result = [] maxrecur = 100 current_hour = dt_from.hour @@ -100,7 +98,6 @@ class resource_calendar(osv.osv): return [(dt_from, dt_from + timedelta(hours=td))] dt_leave = self._get_leaves(cr, uid, id, resource) todo = hours - cycle = 0 result = [] maxrecur = 100 current_hour = dt_from.hour @@ -131,7 +128,6 @@ class resource_calendar(osv.osv): return result def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False): - result = [] if not id: return 0.0 dt_leave = self._get_leaves(cr, uid, id, resource) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 51d54bd9058..b6606a61215 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -19,15 +19,14 @@ # ############################################################################## -import time from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta - -import netsvc from osv import fields, osv -from tools import config from tools.translate import _ import decimal_precision as dp +import netsvc +import time + class sale_shop(osv.osv): _name = "sale.shop" @@ -533,7 +532,6 @@ class sale_order(osv.osv): def action_cancel(self, cr, uid, ids, context=None): if context is None: context = {} - ok = True sale_order_line_obj = self.pool.get('sale.order.line') for sale in self.browse(cr, uid, ids, context=context): for pick in sale.picking_ids: @@ -562,7 +560,6 @@ class sale_order(osv.osv): return True def action_wait(self, cr, uid, ids, *args): - product_obj = self.pool.get('product.product') for o in self.browse(cr, uid, ids): if (o.order_policy == 'manual'): self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')}) @@ -637,7 +634,6 @@ class sale_order(osv.osv): if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'): location_id = order.shop_id.warehouse_id.lot_stock_id.id if not picking_id: - loc_dest_id = order.partner_id.property_stock_customer.id pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out') picking_id = self.pool.get('stock.picking').create(cr, uid, { 'name': pick_name, @@ -1044,7 +1040,6 @@ class sale_order_line(osv.osv): fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False if update_tax: #The quantity only have changed result['delay'] = (product_obj.sale_delay or 0.0) - partner = partner_obj.browse(cr, uid, partner_id) result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id) result.update({'type': product_obj.procure_method}) diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index ed170e7ff6a..ca6c8cb64c8 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -73,7 +73,6 @@ class crm_make_sale(osv.osv_memory): if not context: context = {} - mod_obj = self.pool.get('ir.model.data') case_obj = self.pool.get('crm.lead') sale_obj = self.pool.get('sale.order') partner_obj = self.pool.get('res.partner') From 9f924e8358a0719a066ddf0d639ff667a45bc88e Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Mon, 27 Sep 2010 19:17:19 +0530 Subject: [PATCH 2/2] [IMP] project_timesheet: * add hr_timesheet_invoice module in depend list * remove name_get method of project model * add invoice data section in project view * add filter for billable project into project search view. bzr revid: hmo@tinyerp.com-20100927134719-1nozh8fpki9zkrvd --- .../hr_timesheet_invoice_view.xml | 2 +- addons/project/project_view.xml | 8 ++++- addons/project_timesheet/__openerp__.py | 4 +-- addons/project_timesheet/project_timesheet.py | 17 --------- .../project_timesheet_view.xml | 35 +++++++++++++++++++ 5 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 addons/project_timesheet/project_timesheet_view.xml diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 1befaebf168..1ada36aafca 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f8fe814e218..e1b64ccbf1b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -59,7 +59,13 @@ - + + + + + + + diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index 0d8715a4e46..3636fa4bdcb 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -30,9 +30,9 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base', 'project', 'hr_timesheet_sheet'], + 'depends': ['base', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'], 'init_xml': [], - 'update_xml': ["process/project_timesheet_process.xml", "report/task_report_view.xml"], + 'update_xml': ["process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"], 'demo_xml': [], 'test': [ 'test/worktask_entry_to_timesheetline_entry.yml', diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 94d0d0687fa..411351f1be1 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -205,21 +205,4 @@ class task(osv.osv): return super(task,self).write(cr, uid, ids, vals, context) task() - -class project_project(osv.osv): - _inherit = "project.project" - - def name_get(self, cr, user, ids, context=None): - if context is None: - context = {} - result = [] - if ids and not isinstance(ids, list): - ids = [ids] - for project in self.browse(cr, user, ids, context): - name = "[%s] %s" % (project.analytic_account_id and project.analytic_account_id.code or '?', project.name) - result.append((project.id, name)) - return result - -project_project() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml new file mode 100644 index 00000000000..b39cb02798e --- /dev/null +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -0,0 +1,35 @@ + + + + + Inherit project form : Invoicing Data + project.project + form + + + + + + + + + + + + + + + + Inherit project search view : Invoicing Data + project.project + search + + + + + + + + + +