From 3f185feeaef2a1e00df31f11736d933adea4a630 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Mon, 17 Jan 2011 12:54:03 +0530 Subject: [PATCH 01/11] [IMP] caldav : Usabality of the import ics wizard bzr revid: jam@tinyerp.com-20110117072403-flk8m9owidlfk5o4 --- addons/caldav/wizard/calendar_event_import_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml index e580e6b2733..a4dbd5ac8d0 100644 --- a/addons/caldav/wizard/calendar_event_import_view.xml +++ b/addons/caldav/wizard/calendar_event_import_view.xml @@ -9,7 +9,7 @@
- + From 2ddeba8dcc54f8cc2677e17d829e3acb71d8efed Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Mon, 17 Jan 2011 15:06:23 +0530 Subject: [PATCH 02/11] [Fix] Fix buildbot warning bzr revid: sbh@tinyerp.com-20110117093623-7l7ozx1ti28cm7on --- addons/base_contact/base_contact_installer.py | 1 - addons/base_module_doc_rst/base_module_doc_rst.py | 4 +--- addons/base_synchro/base_synchro_obj.py | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py index febba654350..4568fa25193 100644 --- a/addons/base_contact/base_contact_installer.py +++ b/addons/base_contact/base_contact_installer.py @@ -19,7 +19,6 @@ # ############################################################################## -from lxml import etree from osv import fields, osv class base_contact_installer(osv.osv_memory): diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py index 57b26fd0d44..06393fa99ff 100644 --- a/addons/base_module_doc_rst/base_module_doc_rst.py +++ b/addons/base_module_doc_rst/base_module_doc_rst.py @@ -23,9 +23,7 @@ import pydot import base64 import report -from osv import fields, osv, orm -import tools -from tools.translate import _ +from osv import fields, osv import addons class module(osv.osv): diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py index f71e64cdf77..85ac6f95434 100644 --- a/addons/base_synchro/base_synchro_obj.py +++ b/addons/base_synchro/base_synchro_obj.py @@ -19,8 +19,6 @@ # ############################################################################## from osv import fields,osv -import tools -import re import time class base_synchro_server(osv.osv): From 42c89ee0cb07e2c1bc806d6f4c5d639f9a520ba3 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 17 Jan 2011 15:55:22 +0530 Subject: [PATCH 03/11] [FIX] project, analytic: Template project shouldn't pollute the analytic chart of account. lp bug: https://launchpad.net/bugs/681463 fixed bzr revid: uco@tinyerp.com-20110117102522-9xpds30ckjny7l9p --- addons/account/project/project_view.xml | 2 +- addons/analytic/analytic.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 77e03c23700..46867c8bf23 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -53,7 +53,7 @@ account.analytic.account.tree account.analytic.account tree - child_ids + child_complete_ids diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 03e9a9608cd..4428ba4e9be 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -109,6 +109,20 @@ class account_analytic_account(osv.osv): def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict): res = self.name_get(cr, uid, ids) return dict(res) + + def _child_compute(self, cr, uid, ids, name, arg, context=None): + result = {} + if context is None: + context = {} + + for account in self.browse(cr, uid, ids, context=context): + for child in account.child_ids: + if child.state == 'template': + account.child_ids.pop(account.child_ids.index(child)) + result[account.id] = map(lambda x: x.id, account.child_ids) + + return result + _columns = { 'name': fields.char('Account Name', size=128, required=True), @@ -118,6 +132,7 @@ class account_analytic_account(osv.osv): 'description': fields.text('Description'), 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2), 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), + 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', method=True, string="Account Hierarchy", type='many2many'), 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'), 'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), From ae410f8dd32a6b4447e99d1d4d4e83ac4b57119e Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 17 Jan 2011 16:08:28 +0530 Subject: [PATCH 04/11] [FIX] crm: Added exrule field in the view for recurrency with exception rules. lp bug: https://launchpad.net/bugs/530681 fixed bzr revid: uco@tinyerp.com-20110117103828-31f8bdxb3n9rr81i --- addons/crm/crm_meeting_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index ae9f584d059..e9f412b63dd 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -182,7 +182,9 @@ - + + + From 3ccd8392113bd18273ba839b89ad67d908fc5886 Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Mon, 17 Jan 2011 16:13:05 +0530 Subject: [PATCH 05/11] [Fix] outlook: improve installation documentation bzr revid: sbh@tinyerp.com-20110117104305-awc87sdewgx4zd8t --- addons/outlook/installer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py index 47d488849fe..033e04f3dec 100644 --- a/addons/outlook/installer.py +++ b/addons/outlook/installer.py @@ -55,14 +55,15 @@ class outlook_installer(osv.osv_memory): Pre-requirements : 1. Python 2.6+ . 2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. - 3. If With MS Outlook 2007 it is required to install externally "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". - and With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook. + 3.1 If With MS Outlook 2007 it is required to install externally "Collaboration Data Objects, version 1.2.1". + http://www.microsoft.com/downloads/en/details.aspx?FamilyId=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en + 3.2 With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook. How to install openerp-outlook plug-in? 1. Save the executable plug-in file. 2. Close Outlook Application if Running. 3. Run executable plug-in file and the folllow the instruction. - + Note : Please refer README file for dependecies external link, openobject-addons/outlook/README. """ From 390a32d7db87bb710ccaa977bd24ce9d416b62cf Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Mon, 17 Jan 2011 17:09:48 +0530 Subject: [PATCH 06/11] [IMP/ADD] project_long_term : 1) Improved the Phase sheduling Wizard warning messages 2) Addedd waraning message for Task Scheduling wizard bzr revid: jam@tinyerp.com-20110117113948-eoc37olm4iorqe02 --- addons/project_long_term/project_long_term.py | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a795dd76dee..0e605ed4331 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -364,7 +364,12 @@ def Phase_%d(): # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Phase = eval('Phase_%d' % phase.id) - phase = Task.BalancedProject(Phase) + phase = None + try: + phase = Task.BalancedProject(Phase) + except : + raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for task_id in task_ids: task = eval("phase.Task_%d" % task_id) @@ -510,7 +515,8 @@ def Project_%d(): try: project = Task.BalancedProject(Project) except : - raise osv.except_osv(_('Error !'),_('Invalid resource allocation, Phase Scheduling is not possible.\nPlease check project member resource.')) + raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for phase_id in phase_ids: act_phase = phase_pool.browse(cr, uid, phase_id, context=context) resources = act_phase.resource_ids @@ -573,7 +579,10 @@ def Project_%d(): #Creating resources using the member of the Project u_ids = [i.id for i in project.members] resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context) - start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") + try: + start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") + except: + raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.')) func_str = '' start = start_date minimum_time_unit = 1 @@ -634,7 +643,12 @@ def Project_%d(): # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Project = eval('Project_%d' % project.id) - project = Task.BalancedProject(Project) + project = None + try: + project = Task.BalancedProject(Project) + except : + raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for task_id in task_ids: task = eval("project.Task_%d" % task_id) start_date = task.start.to_datetime() From 008fb8b7f2188f4419a594d09257a650cd02c332 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Mon, 17 Jan 2011 17:14:21 +0530 Subject: [PATCH 07/11] [ADD] caldav : caldav synchronization wizard added new field to link online caldav documentation bzr revid: jam@tinyerp.com-20110117114421-wkv8h9mldsg8f8a7 --- addons/caldav/wizard/caldav_browse.py | 6 ++++-- addons/caldav/wizard/caldav_browse_view.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py index dfb7385931f..a71f6043fea 100644 --- a/addons/caldav/wizard/caldav_browse.py +++ b/addons/caldav/wizard/caldav_browse.py @@ -237,7 +237,8 @@ class user_preference(osv.osv_memory): 'collection' :fields.many2one('document.directory', "Calendar Collection", required=True, domain = [('calendar_collection', '=', True)]), 'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True), 'service': fields.selection([('webdav','CalDAV')], "Services"), - 'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices") + 'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"), + 'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True), } def _get_default_calendar(self, cr, uid, context): @@ -260,7 +261,8 @@ class user_preference(osv.osv_memory): 'service': 'webdav', 'collection' : _get_default_collection, 'calendar' : _get_default_calendar, - 'device' : 'other' + 'device' : 'other', + 'doc_link' : 'http://doc.openerp.com/' } def open_window(self, cr, uid, ids, context=None): diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml index dc3e53b0627..29a0675eea9 100644 --- a/addons/caldav/wizard/caldav_browse_view.xml +++ b/addons/caldav/wizard/caldav_browse_view.xml @@ -37,6 +37,7 @@ +