@@ -176,6 +176,20 @@
kanban,tree,form
{'search_default_open_true':True}
+
+
+ Click to add a personal note.
+
+ Use notes to organize personal tasks or notes. All
+ notes are private; no one else will be able to see them. However
+ you can share some notes with other people by inviting followers
+ on the note. (Useful for meeting minutes, especially if
+ you activate the pad feature for collaborative writings).
+
+ You can customize how you process your notes/tasks by adding,
+ removing or modifying columns.
+
+
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..17bf009479e
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+ sass --trace -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index d4b5f3d8d64..43bc455e04a 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -3,6 +3,16 @@
text-decoration: line-through;
}
+.openerp .oe_form .oe_form_field.oe_memo {
+ margin: 0 -16px 0 -16px;
+ padding: 0px;
+ width: 100%;
+ min-height: 200px;
+}
+.openerp .oe_form .oe_form_field.oe_memo .cleditorMain {
+ border: none;
+ padding: 0px;
+}
.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_0 {
box-shadow: 0px 4px 9px rgba(48, 48, 48, 0.15);
}
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index cc4e44f6765..ff39ce8708c 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -1,9 +1,5 @@
@charset "utf-8"
-.oe_kanban_column
- .note_text_line_through
- text-decoration: line-through
-
@mixin rotate($a)
-webkit-transform: rotate($a)
-o-transform: rotate($a)
@@ -15,8 +11,20 @@
-ms-transition: $what $duration cubic-bezier(0.5,0,0.5,1)
transition: $what $duration cubic-bezier(0.5,0,0.5,1)
+.oe_kanban_column
+ .note_text_line_through
+ text-decoration: line-through
.openerp
+ .oe_form
+ .oe_form_field.oe_memo
+ margin: 0 -16px 0 -16px
+ padding: 0px
+ width: 100%
+ min-height: 200px
+ .cleditorMain
+ border: none
+ padding: 0px
.oe_kanban_view.oe_notes
.oe_kanban_card_fancy.oe_kanban_color_0
box-shadow: 0px 4px 9px rgba(48,48,48,0.15)
@@ -39,7 +47,7 @@
.oe_kanban_card_fancy.oe_kanban_color_9
box-shadow: 0px 4px 9px rgba(102,0,116,0.15)
.oe_kanban_record
- .oe_kanban_card_fancy
+ .oe_kanban_card_fancy
text-shadow: none
border-radius: 2px
padding: 12px
@@ -48,9 +56,9 @@
padding-bottom: 16px
margin-bottom: 16px
@include rotate(-2deg)
- @include transition($what:all, $duration:300ms)
+ @include transition(all, 300ms)
.oe_kanban_record:nth-of-type(even)
- .oe_kanban_card_fancy
+ .oe_kanban_card_fancy
@include rotate(1deg)
.oe_kanban_record:nth-of-type(3n)
.oe_kanban_card_fancy
@@ -87,7 +95,7 @@
position: relative
z-index: 5
border-color: rgba(0,0,0,0.4)
- @include transition($what:all, $duration:150ms)
+ @include transition(all, 150ms)
-webkit-transform: rotate(0) !important
-o-transform: rotate(0) !important
-moz-transform: rotate(0) !important
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 0cbb6107979..c7641540a0a 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -86,7 +86,7 @@ class pad_common(osv.osv_memory):
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
- for k,v in self._all_columns:
+ for k, v in self._all_columns.iteritems():
field = v.column
if hasattr(field,'pad_content_field'):
pad = self.pad_generate_url(cr, uid, context)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0de5e1773b1..897a462a3aa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -97,7 +97,9 @@
-
+
+ To invoice or setup invoicing and renewal options, go to the related contract: .
+
@@ -237,7 +239,7 @@