From 7c58ae62fbcf9b9fa8c7efa76ef7a6763d28f205 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Wed, 6 Nov 2013 17:47:38 +0100
Subject: [PATCH] [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 @@
             <rng:optional><rng:attribute name="date_stop" /></rng:optional>
             <rng:optional><rng:attribute name="day_length" /></rng:optional>
             <rng:optional><rng:attribute name="date_delay" /></rng:optional>
+            <rng:optional><rng:attribute name="all_day" /></rng:optional>
             <rng:optional><rng:attribute name="type" /></rng:optional>
             <rng:optional><rng:attribute name="mode" /></rng:optional>
             <rng:oneOrMore>
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