From 988ad9ccc978bfd6f2aee0f17728ad38f16b1a6c Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Wed, 10 Nov 2010 12:48:32 +0530 Subject: [PATCH 01/77] [IMP] Share web addon. bzr revid: vda@tinyerp.com-20101110071832-ftzgmrd3trsz0icr --- addons/share/__openerp__.py | 2 ++ addons/share/web/__init__.py | 2 ++ addons/share/web/controllers.py | 37 +++++++++++++++++++++++++++ addons/share/web/editors.py | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 addons/share/web/__init__.py create mode 100644 addons/share/web/controllers.py create mode 100644 addons/share/web/editors.py diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 21b63fd3bc1..393afb9717b 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -48,6 +48,8 @@ 'wizard/share_wizard_view.xml' ], 'installable': True, + 'active': False, + 'web': True, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/web/__init__.py b/addons/share/web/__init__.py new file mode 100644 index 00000000000..f95bb222c10 --- /dev/null +++ b/addons/share/web/__init__.py @@ -0,0 +1,2 @@ +import controllers +import editors \ No newline at end of file diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py new file mode 100644 index 00000000000..c658a3eede5 --- /dev/null +++ b/addons/share/web/controllers.py @@ -0,0 +1,37 @@ +import urlparse + +import cherrypy + +from openobject.tools import expose, ast +import openerp.controllers +from openerp.controllers import actions +from openerp.utils import rpc, TinyDict + +class Piratepad(openerp.controllers.SecuredController): + _cp_path = "/share" + + @expose() + def index(self, **kw): + domain = ast.literal_eval(kw['domain']) + search_domain = ast.literal_eval(kw['search_domain']) + filter_domain = ast.literal_eval(kw['filter_domain']) + + context = ast.literal_eval(kw['context']) + view_name = context.get('_terp_view_name') + + domain.extend(search_domain) + + action_id = rpc.RPCProxy('ir.actions.actions').search([('name','=',view_name)], 0, 0, 0, context) + if action_id: + action_id = action_id[0] + + model = 'share.wizard' + proxy = rpc.RPCProxy(model) + + share_wiz_id = rpc.RPCProxy('ir.ui.menu').search([('name','=', 'Share Wizard')]) + context.update({'active_ids': share_wiz_id, 'active_id': share_wiz_id[0], '_terp_view_name': 'Share Wizard'}) + data = {'domain': str(domain), 'action_id':action_id} + id = proxy.create(data, context) + res = rpc.session.execute('object', 'execute', model, 'go_step_1', [id], context) + return actions.execute(res, ids=[id]) + diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py new file mode 100644 index 00000000000..b55afbf0896 --- /dev/null +++ b/addons/share/web/editors.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +import openobject.templating + +class SidebarTemplateEditor(openobject.templating.TemplateEditor): + templates = ['/openerp/widgets/templates/sidebar.mako'] + ADD_SHARE_BUTTON = u'id="sidebar"' + + def insert_share_link(self, output): + # Insert the link on the line right after the link to open the + # attachment form + form_opener_insertion = output.index( + '\n', + output.index(self.ADD_SHARE_BUTTON)) + 1 + output = output[:form_opener_insertion] + \ + '''

${_("Share View")}

+ + + \n''' + \ + output[form_opener_insertion:] + return output + + def edit(self, template, template_text): + output = super(SidebarTemplateEditor, self).edit(template, template_text) + + output = self.insert_share_link(output) + return output \ No newline at end of file From 92f7f6c994d2bf0d34297fb15840d66b1770f6ee Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Sun, 14 Nov 2010 14:57:22 +0530 Subject: [PATCH 02/77] [IMP]: Use capital letters for main words in Account and HR dashboard. bzr revid: rch@tinyerp.com-20101114092722-1x4m4nzmt64oe4xl --- addons/account/board_account_view.xml | 2 +- addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 528d986d729..bcedc3fa491 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -49,7 +49,7 @@ - + diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml index 792ea34ae53..96d91ef3e5c 100644 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml @@ -68,7 +68,7 @@ - + From bd531a11c4d2c7e3f2a2591ea0bcbb4b24b0438a Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 15 Nov 2010 10:54:09 +0530 Subject: [PATCH 03/77] [IMP]:survey:set title and author bzr revid: apa@tinyerp.com-20101115052409-a5h15b841wy2sd2d --- addons/survey/report/survey_analysis_report.py | 2 +- addons/survey/report/survey_browse_response.py | 2 +- addons/survey/report/survey_form.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py index 6f6c30e1f1d..34bcd366d0f 100644 --- a/addons/survey/report/survey_analysis_report.py +++ b/addons/survey/report/survey_analysis_report.py @@ -35,7 +35,7 @@ class survey_analysis(report_rml): company=user_obj.browse(cr,uid,[uid],context)[0].company_id rml =""" -