From 7c58ae62fbcf9b9fa8c7efa76ef7a6763d28f205 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Wed, 6 Nov 2013 17:47:38 +0100 Subject: [PATCH 1/7] [MERGE]0k/web_fullcalendar branch from github bzr revid: jke@openerp.com-20131106164738-0medo6b8938rphzm --- openerp/addons/base/rng/view.rng | 1 + openerp/osv/orm.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index de0af811b83..383b4164fa7 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -647,6 +647,7 @@ + diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index cf96c8d27bd..a102dcd5ba4 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -999,7 +999,7 @@ class BaseModel(object): continue sm = f.store if sm is True: - sm = {self._name: (lambda self, cr, uid, ids, c={}: ids, None, 10, None)} + sm = {self._name: (lambda self, cr, uid, ids, c={}: ids, None, f.priority, None)} for object, aa in sm.items(): if len(aa) == 4: (fnct, fields2, order, length) = aa @@ -1775,7 +1775,7 @@ class BaseModel(object): children = False views = {} for f in node: - if f.tag in ('form', 'tree', 'graph', 'kanban'): + if f.tag in ('form', 'tree', 'graph', 'kanban', 'calendar'): node.remove(f) ctx = context.copy() ctx['base_model_name'] = self._name @@ -1819,7 +1819,7 @@ class BaseModel(object): in_tree_view = node.tag == 'tree' elif node.tag == 'calendar': - for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'): + for additional_field in ('date_start', 'date_delay', 'date_stop', 'color', 'all_day'): if node.get(additional_field): fields[node.get(additional_field)] = {} @@ -2013,7 +2013,7 @@ class BaseModel(object): return False view = etree.Element('calendar', string=self._description) - etree.SubElement(view, 'field', self._rec_name_fallback(cr, user, context)) + etree.SubElement(view, 'field', name=self._rec_name_fallback(cr, user, context)) if self._date_name not in self._columns: date_found = False From 9e980b4e9d55adb8d9f8cb25a433ed3d59a705f3 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Fri, 15 Nov 2013 17:59:42 +0100 Subject: [PATCH 2/7] bzr revid: jke@openerp.com-20131115165942-pki8hgk1j7qxitk8 --- openerp/addons/base/rng/view.rng | 2 ++ openerp/osv/orm.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 383b4164fa7..a5f092b0000 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -648,6 +648,8 @@ + + diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index a102dcd5ba4..6dba42d5926 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1819,7 +1819,7 @@ class BaseModel(object): in_tree_view = node.tag == 'tree' elif node.tag == 'calendar': - for additional_field in ('date_start', 'date_delay', 'date_stop', 'color', 'all_day'): + for additional_field in ('date_start', 'date_delay', 'date_stop', 'color', 'all_day','attendee'): if node.get(additional_field): fields[node.get(additional_field)] = {} From 9963f892bafb765750800d6bf21222d126703c53 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Sat, 23 Nov 2013 12:30:53 +0100 Subject: [PATCH 3/7] [IMP] add options for calendar view bzr revid: jke@openerp.com-20131123113053-79idzhhx88ps2dw6 --- openerp/addons/base/ir/ir_mail_server.py | 1 + openerp/addons/base/rng/view.rng | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 1b5f5d5d6a4..4af52bdea41 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -411,6 +411,7 @@ class ir_mail_server(osv.osv): email_to = message['To'] email_cc = message['Cc'] email_bcc = message['Bcc'] + smtp_to_list = filter(None, tools.flatten(map(extract_rfc2822_addresses,[email_to, email_cc, email_bcc]))) assert smtp_to_list, "At least one valid recipient address should be specified for outgoing emails (To/Cc/Bcc)" diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index a5f092b0000..733104054ce 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -649,7 +649,11 @@ - + + + + + From dae2d405468e17a6134c932ff79f9ac00c3ab99e Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Tue, 26 Nov 2013 14:52:45 +0100 Subject: [PATCH 4/7] [IMP] Add param "event_open_popup" to calendar to allow to specify an action to execte on click on a meeting bzr revid: jke@openerp.com-20131126135245-faan29zfvwd3q8wo --- openerp/addons/base/rng/view.rng | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 733104054ce..73a3882413e 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -648,6 +648,7 @@ + From 4e607334f7cccd1a2c05437fe04dc6b8d37e43a8 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Tue, 17 Dec 2013 13:18:43 +0100 Subject: [PATCH 5/7] [IMP] Add some fields in nrg for calendar bzr revid: jke@openerp.com-20131217121843-zatimzcp0bye5e7p --- openerp/addons/base/rng/view.rng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 73a3882413e..ef03f0a7fd2 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -651,6 +651,8 @@ + + From b7a001866d4e4b97e12aba654abf4d5273baf3d6 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Wed, 18 Dec 2013 13:38:58 +0100 Subject: [PATCH 6/7] [IMP] Move threading.currentThread().testing from load_test to load_data. The purpose is to dont send mail when we are installing the demo data bzr revid: jke@openerp.com-20131218123858-09hitdpxxqa5uh3j --- openerp/modules/loading.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 9a5533f5caa..48c5c5adab5 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -59,7 +59,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= def load_test(module_name, idref, mode): cr.commit() try: - threading.currentThread().testing = True _load_data(cr, module_name, idref, mode, 'test') return True except Exception: @@ -67,7 +66,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= 'module %s: an exception occurred in a test', module_name) return False finally: - threading.currentThread().testing = False if tools.config.options['test_commit']: cr.commit() else: @@ -104,12 +102,18 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= init mode. """ - for filename in _get_files_of_kind(kind): - _logger.info("module %s: loading %s", module_name, filename) - noupdate = False - if kind in ('demo', 'demo_xml') or (filename.endswith('.csv') and kind in ('init', 'init_xml')): - noupdate = True - tools.convert_file(cr, module_name, filename, idref, mode, noupdate, kind, report) + try: + if kind in ('demo', 'test'): + threading.currentThread().testing = True + for filename in _get_files_of_kind(kind): + _logger.info("module %s: loading %s", module_name, filename) + noupdate = False + if kind in ('demo', 'demo_xml') or (filename.endswith('.csv') and kind in ('init', 'init_xml')): + noupdate = True + tools.convert_file(cr, module_name, filename, idref, mode, noupdate, kind, report) + finally: + if kind in ('demo', 'test'): + threading.currentThread().testing = False if status is None: status = {} From 344166ba15e2e0c9822b326945de40af2d460074 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Fri, 10 Jan 2014 18:06:45 +0100 Subject: [PATCH 7/7] [IMP] Removed quick_create_instance from rng calendar, now by default quick_add is use as if set to True, and if value is not False, we use this value as quick_create_instance bzr revid: jke@openerp.com-20140110170645-ubdxpga4aah8g50c --- openerp/addons/base/rng/view.rng | 1 - 1 file changed, 1 deletion(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 2b73cffddcb..0f161a91f51 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -654,7 +654,6 @@ -