Click to add a component to a bill of material.
@@ -524,6 +524,7 @@
action="mrp_bom_form_action2"
id="menu_mrp_bom_form_action2"
parent="menu_mrp_configuration"
+ groups="base.group_no_one"
sequence="20"/>
@@ -647,50 +648,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
Manufacturing Order
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/addons/note/__init__.py b/addons/note/__init__.py
new file mode 100644
index 00000000000..9bf064877b5
--- /dev/null
+++ b/addons/note/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import note
+
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
new file mode 100644
index 00000000000..62d9962634a
--- /dev/null
+++ b/addons/note/__openerp__.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ 'name': 'Notes',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'description': """
+This module allows users to create their own notes inside OpenERP
+=================================================================
+
+Use notes to write meeting minutes, organize ideas, organize personnal todo
+lists, etc. Each user manages his own personnal notes. Notes are available to
+their authors only, but they can share notes to others users so that several
+people can work on the same note in real time. It's very efficient to share
+meeting minutes.
+
+Notes can be found in the 'Home' menu.
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://openerp.com',
+ 'summary': 'Sticky Notes, Collaborative',
+ 'depends': [
+ 'base_tools',
+ 'mail',
+ 'pad',
+ ],
+ 'data': [
+ 'security/note_security.xml',
+ 'security/ir.model.access.csv',
+ 'note_data.xml',
+ 'note_view.xml',
+ ],
+ 'demo': [
+ 'note_demo.xml',
+ ],
+ 'css': [
+ 'static/src/css/note.css',
+ ],
+ 'installable': True,
+ 'application': True,
+ 'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note.py b/addons/note/note.py
new file mode 100644
index 00000000000..f6a46c72c88
--- /dev/null
+++ b/addons/note/note.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from tools.translate import _
+
+class note_stage(osv.osv):
+ """ Category of Note """
+ _name = "note.stage"
+ _description = "Note Stage"
+ _columns = {
+ 'name': fields.char('Category Name', size=64, required=True),
+ 'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+ 'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
+ 'fold': fields.boolean('Folded'),
+ }
+ _order = 'sequence asc'
+ _defaults = {
+ 'fold': 0,
+ 'user_id': lambda self, cr, uid, ctx: uid,
+ 'sequence' : 1,
+ }
+
+class note_note(osv.osv):
+ """ Note """
+ _name = 'note.note'
+ _inherit = ['mail.thread','pad.common']
+ _pad_fields = ['note_pad']
+ _description = "Note"
+
+ def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for note in self.browse(cr, uid, ids, context=context):
+ res[note.id] = (note.note or '').strip().split('\n')[0]
+ return res
+
+ def _get_default_stage_id(self,cr,uid,context=None):
+ ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)])
+ return ids and ids[0] or False
+
+ def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+ access_rights_uid = access_rights_uid or uid
+ stage_obj = self.pool.get('note.stage')
+
+ # only show stage groups not folded and owned by user
+ search_domain = [('fold', '=', False),('user_id', '=', uid)]
+
+ stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+ result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+ return result
+
+ _columns = {
+ 'name': fields.function(_get_note_first_line, string='Note Summary', type="text", store=True),
+ 'note': fields.text('Pad Content'),
+ 'note_pad_url': fields.char('Pad Url', size=250),
+ 'sequence': fields.integer('Sequence'),
+ 'stage_id': fields.many2one('note.stage', 'Stage'),
+ 'active': fields.boolean('Active'),
+ 'color': fields.integer('Color Index'),
+ # to be replaced by message_follower_ids
+ 'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers')
+ }
+
+ _defaults = {
+ 'active' : 1,
+ 'stage_id' : _get_default_stage_id,
+ 'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+ }
+ _order = 'sequence asc'
+ _group_by_full = {
+ 'stage_id' : _read_group_stage_ids,
+ }
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..670b4c89269
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Todo today
+ 1
+
+
+
+
+ Todo later
+ 2
+
+
+
+
+ For Info
+ 3
+
+
+
+
+
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
new file mode 100644
index 00000000000..e322f362ef5
--- /dev/null
+++ b/addons/note/note_demo.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+ 7
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..a7c17a29869
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+ note.stage.form
+ note.stage
+
+
+
+
+
+
+
+ note.stage.tree
+ note.stage
+
+
+
+
+
+
+
+
+
+
+
+
+ Stages
+ note.stage
+ tree,form
+ [('user_id','=',uid)]
+
+
+
+
+
+
+ note.note.kanban
+ note.note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ í
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ note.note.form
+ note.note
+
+
+
+
+
+
+
+ note.note.search
+ note.note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Notes
+ note.note
+ form
+ kanban,tree,form
+
+
+
+
+
+
+
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..fdd6030ca51
--- /dev/null
+++ b/addons/note/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
+access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
new file mode 100644
index 00000000000..46eebee629c
--- /dev/null
+++ b/addons/note/security/note_security.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ My notes
+
+
+ [('follower_ids','=',user.id)]
+
+
+
+
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..d6019f4ed4a
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+ sass -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
new file mode 100644
index 00000000000..e5a3d1455c2
--- /dev/null
+++ b/addons/note/static/src/css/note.css
@@ -0,0 +1,81 @@
+
+
+.openerp .oe_fold_column .oe_kanban_card {
+ text-decoration:none;
+ color:#000;
+ display:block;
+ padding:1em;
+ margin-right: 1em;
+ margin-bottom: 1em;
+
+ -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
+ -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+ box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+}
+
+.oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(4deg);
+ -o-transform: rotate(4deg);
+ -moz-transform:rotate(4deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(2deg);
+ -o-transform: rotate(2deg);
+ -moz-transform:rotate(2deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(-3deg);
+ -o-transform: rotate(-3deg);
+ -moz-transform:rotate(-3deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(-1deg);
+ -o-transform: rotate(-1deg);
+ -moz-transform:rotate(-1deg);
+}
+
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
+{
+ box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
+ -webkit-transform: rotate(0);
+ -moz-transform: rotate(0);
+ -o-transform: rotate(0);
+ position:relative;
+ z-index:5;
+}
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
new file mode 100644
index 00000000000..cd04015dcbb
--- /dev/null
+++ b/addons/note/static/src/css/note.sass
@@ -0,0 +1,137 @@
+@charset "utf-8"
+
+// Variables {{{
+$section-title-color: #8786b7
+$tag-bg-light: #f0f0fa
+$tag-bg-dark: #8786b7
+$tag-border: #afafb6
+$tag-border-selected: #a6a6fe
+$hover-background: #f0f0fa
+$link-color: #8a89ba
+$sheet-max-width: 860px
+// }}}
+// Mixins {{{
+@font-face
+ font-family: 'mnmliconsRegular'
+ src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@font-face
+ font-family: 'EntypoRegular'
+ src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+ src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+ src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+ src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@mixin reset()
+ border: none
+ padding: 0
+ margin: 0
+ background: none
+ @include radius(none)
+ @include box-shadow(none)
+
+@mixin vertical-gradient($startColor: #555, $endColor: #333)
+ background-color: $startColor
+ background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
+ background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+ background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+ background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+ background-image: linear-gradient(to bottom, $startColor, $endColor)
+
+@mixin radial-gradient($gradient)
+ background-position: center center
+ background-image: -webkit-radial-gradient(circle, $gradient)
+ background-image: -moz-radial-gradient($gradient)
+ background-image: -ms-radial-gradient($gradient)
+ background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+ -moz-border-radius: $radius
+ -webkit-border-radius: $radius
+ border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+ -moz-box-shadow: $bsval
+ -webkit-box-shadow: $bsval
+ box-shadow: $bsval
+
+@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
+ -webkit-transition: $transval
+ -moz-transition: $transval
+ -ms-transition: $transval
+ -o-transition: $transval
+ transition: $transval
+
+@mixin opacity($opacity: .5)
+ filter: alpha(opacity=$opacity * 100)
+ opacity: $opacity
+
+@mixin background-clip($clip: padding-box)
+ -webkit-background-clip: $clip
+ -moz-background-clip: $clip
+ background-clip: $clip
+
+@mixin box-sizing($type: content)
+ // type = border || content || padding
+ -webkit-box-sizing: #{$type}-box
+ -moz-box-sizing: #{$type}-box
+ -ms-box-sizing: #{$type}-box
+ box-sizing: #{$type}-box
+
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+ font-size: 1px
+ letter-spacing: -1px
+ color: transparent
+ &:before
+ font: 21px "mnmliconsRegular"
+ content: $icon-name
+ color: $color
+
+// }}}
+// CSS animation bounces {{{
+@-moz-keyframes bounce
+ 0%
+ -moz-transform: scale(0)
+ opacity: 0
+ 50%
+ -moz-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -moz-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -moz-transform: scale(1)
+ opacity: 1
+
+@-webkit-keyframes bounce
+ 0%
+ -webkit-transform: scale(0)
+ opacity: 0
+ 50%
+ -webkit-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -webkit-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -webkit-transform: scale(1)
+ opacity: 1
+// }}}
+
+
+.oe_kanban_color_2
+ background-color:red
+
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css"
+
diff --git a/addons/note/static/src/img/icon.png b/addons/note/static/src/img/icon.png
new file mode 100644
index 00000000000..b6ad0548a40
Binary files /dev/null and b/addons/note/static/src/img/icon.png differ
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index ad5998d968e..9e549424e26 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -8,31 +8,32 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-22 08:03+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-09-03 22:22+0000\n"
+"Last-Translator: Nicolas JEUDY \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
#. module: pad_project
#: constraint:project.task:0
msgid "Error ! Task end-date must be greater then task start-date"
msgstr ""
+"Erreur ! la date de fin de la tâche doit être supérieure a celle de début"
#. module: pad_project
#: model:ir.model,name:pad_project.model_project_task
msgid "Task"
-msgstr ""
+msgstr "Tâche"
#. module: pad_project
#: view:project.task:0
msgid "Pad"
-msgstr ""
+msgstr "Pad"
#. module: pad_project
#: constraint:project.task:0
msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index bcc1eeda001..ec5add595a7 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -92,7 +92,8 @@ Main features:
'static/src/js/main.js',
],
'css': [
- 'static/src/css/pos.css',
+ 'static/src/css/pos.css', # this is the default css with hover effects
+ #'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens)
'static/src/css/keyboard.css'
],
'qweb': ['static/src/xml/pos.xml'],
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index b17e672cb9c..24c482bd53c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1242,7 +1242,7 @@ import io, StringIO
class ean_wizard(osv.osv_memory):
_name = 'pos.ean_wizard'
_columns = {
- 'ean13_pattern': fields.char('Ean13 Pattern', size=32, required=True, translate=True),
+ 'ean13_pattern': fields.char('Reference', size=32, required=True, translate=True),
}
def sanitize_ean13(self, cr, uid, ids, context):
for r in self.browse(cr,uid,ids):
@@ -1306,7 +1306,7 @@ class product_product(osv.osv):
def edit_ean(self, cr, uid, ids, context):
return {
- 'name': "Edit Ean",
+ 'name': _("Assign a Custom EAN"),
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 0e906186285..42abaf96418 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -608,35 +608,21 @@
[('date_order','like',time.strftime('%Y-%m'))]
-
- product.normal.pos.form.inherit
- product.product
-
-
-
-
-
-
-
-
-
-
-
-
product.normal.form.inherit
product.product
-
-
-
+
+
+
+
-
+
@@ -1070,9 +1056,17 @@
form
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index a9baf041942..bfe2ef7f9dc 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1072,12 +1072,14 @@
-webkit-transition-timing-function: ease-out;
}
-.point-of-sale .pos-actionbar .button.disabled{
- color:#AAA;
+.point-of-sale .pos-actionbar .button.disabled *{
+ opacity: 0.5;
}
.point-of-sale .pos-actionbar .button.disabled:hover{
border: 1px solid #cacaca;
border-radius: 4px;
+ color: #555;
+ cursor: default;
background: #e2e2e2;
background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
diff --git a/addons/point_of_sale/static/src/css/pos_nohover.css b/addons/point_of_sale/static/src/css/pos_nohover.css
new file mode 100644
index 00000000000..6f24abda53b
--- /dev/null
+++ b/addons/point_of_sale/static/src/css/pos_nohover.css
@@ -0,0 +1,1168 @@
+@font-face{
+ font-family: 'Inconsolata';
+ src: url(../fonts/Inconsolata.otf);
+}
+
+.point-of-sale {
+ padding: 0;
+ margin: 0;
+ background-color: #f0eeee;
+ font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+ color: #555555;
+ font-size: 12px;
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+}
+
+.point-of-sale .shadow-top{
+ position: absolute;
+ top:0;
+ left:0;
+ right:0;
+ height:10px;
+ background: -webkit-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+ background: -moz-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+ background: -ms-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+ background: linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+}
+
+.point-of-sale .darker-shadow-top{
+ position: absolute;
+ top:0;
+ left:0;
+ right:0;
+ height:10px;
+ background: -webkit-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+ background: -moz-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+ background: -ms-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+ background: linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+}
+
+/* ********* The black loading screen ********* */
+
+.point-of-sale .loader{
+ background-color: #222;
+ position:absolute;
+ left:0px;
+ top:0px;
+ width:100%;
+ height:100%;
+ z-index: 999;
+ text-align: center;
+}
+.point-of-sale .loader img{
+ position:absolute;
+ top:50%;
+ left:50%;
+}
+
+/* ********* Generic element styling ********* */
+
+.point-of-sale a {
+ text-decoration: none;
+ color: #555555;
+}
+.point-of-sale button, .point-of-sale a.button {
+ display: inline-block;
+ cursor: pointer;
+ padding: 4px 10px;
+ font-size: 11px;
+ border: 1px solid #cacaca;
+ border-radius: 4px;
+ background: #e2e2e2;
+ background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2));
+ background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -ms-linear-gradient(#f0f0f0, #e2e2e2);
+ background: linear-gradient(#f0f0f0, #e2e2e2);
+}
+.point-of-sale ul, .point-of-sale ol {
+ padding: 0;
+ margin: 0;
+}
+.point-of-sale li {
+ list-style-type: none;
+}
+.point-of-sale .pos-right-align {
+ text-align: right;
+}
+.point-of-sale .pos-right-align input {
+ text-align: right;
+ border: 1px solid #cecbcb;
+ border-radius: 4px;
+}
+
+/* ********* The black header bar ********* */
+
+
+.point-of-sale #topheader {
+ position:absolute;
+ left:0;
+ top:0;
+ width: 100%;
+ height: 33px;
+ margin:0;
+ padding:0;
+ color: gray;
+ border-top: solid 1px #d3d3d3;
+ border-bottom: solid 1px black;
+ background: #393939;
+ background: -moz-linear-gradient(#7b7979, #393939);
+ background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+}
+
+/* a) The left part of the top-bar */
+
+.point-of-sale #branding{
+ position: absolute;
+ display: table-cell;
+ left:0;
+ top:0;
+ width:439px;
+ height:100%;
+ margin:0;
+ padding:0;
+ border-right: 1px solid #373737;
+ text-align:left;
+ line-height:100%;
+ vertical-align: middle;
+}
+.point-of-sale #branding img {
+ height: 32px;
+ width: 116px;
+ margin-left:5px;
+ vertical-align:middle;
+}
+.point-of-sale #branding .username{
+ float:right;
+ color:#DDD;
+ font-size:16px;
+ margin-right:32px;
+ margin-top:10px;
+ font-style:italic;
+}
+
+/* b) The right part of the top-bar */
+
+.point-of-sale #rightheader {
+ position: absolute;
+ left:440px;
+ right:0;
+ top:0;
+ height:100%;
+}
+
+.point-of-sale #rightheader button {
+ color: #273072;
+ height:27px;
+ margin:3px;
+ margin-right:0px;
+ border: 1px solid #353A7E;
+ background: #7f82ac;
+ background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
+ background: -moz-linear-gradient(#b2b3d7, #7f82ac);
+ background: -ms-linear-gradient(#b2b3d7, #7f82ac);
+ background: linear-gradient(#b2b3d7, #7f82ac);
+}
+
+.point-of-sale #rightheader button.neworder-button {
+ width: 32px;
+ margin-left:4px;
+ margin-right:4px;
+}
+
+.point-of-sale div#order-selector {
+ display: inline;
+}
+.point-of-sale ol#orders {
+ display: inline;
+}
+.point-of-sale li.order-selector-button {
+ display: inline;
+}
+.point-of-sale li.selected-order button {
+ font-weight: 900;
+}
+
+/* c) The session buttons */
+
+.point-of-sale #rightheader .header-button{
+ float:right;
+ height:32px;
+ padding-left:10px;
+ padding-right:10px;
+ border-right: 1px solid #3a3a3a;
+ border-left: 1px solid #3a3a3a;
+ color:#DDD;
+ line-height:32px;
+ text-align:center;
+ cursor: pointer;
+
+ -webkit-transition-property: background;
+ -webkit-transition-duration: 0.2s;
+ -webkit-transition-timing-function: ease-out;
+}
+.point-of-sale #rightheader .header-button:last-child{
+ border-left: 1px solid #3a3a3a;
+}
+
+/* c) The notifications indicator */
+
+.point-of-sale .oe_pos_synch-notification{
+ float:right;
+ color: rgba(255,255,255,0.4);
+ padding: 8px;
+ line-height:16px;
+ font-size:16px;
+ vertical-align:middle;
+ font-style: italic;
+ cursor:pointer;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_red{
+ display:inline-block;
+ cursor:pointer;
+ width:16px; height:16px;
+ background: url("../img/gtk-no.png") no-repeat ;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_green{
+ display:inline-block;
+ width:16px; height:16px;
+ background: url("../img/gtk-yes.png") no-repeat;
+}
+
+/* ********* Contains everything below the bar ********* */
+
+.point-of-sale #content {
+ width: 100%;
+ position: absolute;
+ top: 35px;
+ bottom: 0;
+ background: #F0EEEE;
+}
+
+/* ********* The leftpane contains the order, numpad and paypad ********* */
+
+.point-of-sale #leftpane {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ position:absolute;
+ left:0;
+ width:440px;
+ top:0px;
+ /*bottom:105px;*/
+ bottom:0;
+ border-right: solid 1px #CECBCB;
+ background-color: white;
+}
+.point-of-sale #leftpane footer {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ background: #F0EEEE;
+ white-space: nowrap;
+}
+
+/* ********* The paypad contains the payment buttons ********* */
+
+.point-of-sale #paypad {
+ padding: 8px 4px 8px 8px;
+ display: inline-block;
+ text-align: center;
+ vertical-align: top;
+}
+.point-of-sale #paypad button {
+ height: 54px;
+ width: 208px;
+ margin: 0 -3px;
+ font-weight: bold;
+ vertical-align: middle;
+ color: #555555;
+ border-top: 1px solid #efefef;
+ font-size: 14px;
+}
+
+/* ********* The Numpad ********* */
+
+.point-of-sale #numpad {
+ padding: 8px 8px 8px 4px;
+ display: inline-block;
+ text-align: center;
+}
+.point-of-sale #numpad button {
+ height: 54px;
+ width: 54px;
+ margin: 0 -3px;
+ font-weight: bold;
+ vertical-align: middle;
+ color: #555555;
+ border-top: 1px solid #efefef;
+}
+.point-of-sale #numpad .selected-mode {
+ color: white;
+ background: #7f82ac;
+ background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+ background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+ background: -ms-linear-gradient(#9d9fc5, #7f82ac);
+ background: linear-gradient(#9d9fc5, #7f82ac);
+}
+.point-of-sale .input-button {
+ font-size: 24px;
+}
+.point-of-sale .mode-button, .point-of-sale #numpad-delete, .point-of-sale #numpad-minus {
+ font-size: 14px;
+}
+
+/* ********* The right pane contains the screens and headers ********* */
+
+.point-of-sale #rightpane {
+ position: absolute;
+ top: 0;
+ /*bottom: 105px;*/
+ bottom:0;
+ left: 440px;
+ right: 0;
+ vertical-align: top;
+}
+
+.point-of-sale #rightpane header {
+ padding: 0;
+ height: 32px;
+ border-bottom: 1px solid #cecbcb;
+ background: #d3d3d3;
+ background: -moz-linear-gradient(white, #d3d3d3);
+ background: -webkit-gradient(linear, left top, left bottom, from(white), to(#d3d3d3));
+}
+
+/* ********* The product list ********* */
+
+.point-of-sale .product-list {
+ padding:10px;
+}
+
+.point-of-sale .product-list-scroller{
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ width:100%;
+ height:100%;
+ overflow: hidden;
+}
+.point-of-sale .product-list-container {
+ position:absolute;
+ top:0px;
+ bottom:0px;
+ left:0px;
+ right:0px;
+ background: #eeedff;
+}
+
+/* a) the product list navigation bar */
+
+.point-of-sale .breadcrumb li {
+ float: left;
+ line-height: 32px;
+ height: 32px;
+}
+.point-of-sale .breadcrumb li:last-child {
+ padding-right: 3px;
+ border-right: 1px solid #c5c5c5;
+}
+.point-of-sale .breadcrumb a {
+ display: inline-block;
+ padding: 0 9px;
+ vertical-align: top;
+ text-shadow: #f7f7f7 0 1px 1px;
+ color: #555555;
+ font-weight: bold;
+}
+.point-of-sale .bc-arrow {
+ height: 33px;
+}
+.point-of-sale .homeimg {
+ width: 19px;
+ height: 19px;
+ margin: 6px 0;
+}
+
+/* b) the search box */
+
+.point-of-sale .searchbox {
+ position: absolute;
+ right: 2px;
+}
+.point-of-sale .searchbox input {
+ width: 130px;
+ border-radius: 11px;
+ border: 1px solid #cecbcb;
+ padding: 3px 19px;
+ margin: 6px;
+ background: url("../img/search.png") no-repeat 5px;
+ background-color: white;
+}
+.point-of-sale .search-clear {
+ position: absolute;
+ top: 11px;
+ right: 11px;
+ cursor: pointer;
+ display: none;
+}
+
+/* c) the categories list */
+
+.point-of-sale #categories {
+ /*background:#f0f0f0;*/
+ position: relative;
+ background-image: url('../img/bg.png');
+ border-bottom: 1px solid #cecbcb;
+}
+.point-of-sale #categories .white-gradient{
+ position: absolute;
+ top:50%;
+ left:0;
+ right:0;
+ bottom:0;
+ background: -webkit-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+ background: -moz-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+ background: -ms-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+ background: linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+}
+.point-of-sale #categories h4 {
+ display: inline-block;
+ margin: 9px 5px;
+}
+
+.point-of-sale .category-list{
+ padding:10px;
+}
+/* d) the category button */
+
+.point-of-sale .category-button {
+ position: relative;
+ vertical-align: top;
+ display: inline-block;
+ font-size: 11px;
+ margin: 5px;
+ width: 120px;
+ height:120px;
+ background:#fff;
+ border: 1px solid #fff;
+ border-radius: 3px;
+ -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+ -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+ box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+ cursor: pointer;
+}
+
+.point-of-sale .category-simple-button{
+ position: relative;
+ display: inline-block;
+ font-size: 14px;
+ margin-right:10px;
+ padding:5px;
+
+ cursor: pointer;
+ border: 1px solid #cacaca;
+ border-radius: 4px;
+
+ background: #e2e2e2;
+ background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -ms-linear-gradient(#f0f0f0, #e2e2e2);
+ background: linear-gradient(#f0f0f0, #e2e2e2);
+ -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+ -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+ box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+
+.point-of-sale .category-button .category-img {
+ position: relative;
+ width: 120px;
+ height: 100px;
+ text-align: center;
+ cursor: pointer;
+}
+
+.point-of-sale .category-button .category-img img {
+ max-height: 100px;
+ max-width: 120px;
+}
+
+.point-of-sale .category-button .category-name {
+ position: absolute;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ top:auto;
+ left: 2px;
+ right: 2px;
+ bottom: 2px;
+ background: #8a89ba; /*-webkit-linear-gradient(-90deg,rgba(138,137,186,0),rgba(138,137,186,1), rgba(138,137,186,1));*/
+ padding: 3px;
+ /*color:#8a89ba;*/
+ color: #FFF;
+ cursor: pointer;
+ border-radius: 3px;
+}
+
+/* e) the product */
+
+.point-of-sale .product {
+ position:relative;
+ vertical-align: top;
+ display: inline-block;
+ line-height: 100px;
+ font-size: 11px;
+ margin: 5px;
+ width: 120px;
+ height:120px;
+ background:#fff;
+ border: 1px solid #fff;
+ border-radius: 3px;
+ -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+ -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+ box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+}
+
+.point-of-sale .product .product-img {
+ position: relative;
+ width: 120px;
+ height: 100px;
+ background: white;
+ text-align: center;
+}
+
+.point-of-sale .product .product-img img {
+ max-height: 100px;
+ max-width: 120px;
+}
+
+.point-of-sale .product .price-tag {
+ position: absolute;
+ top: 2px;
+ right: 2px;
+ vertical-align: top;
+ color: white;
+ line-height: 14px;
+ background: #7f82ac;
+ padding: 2px 5px;
+ border-radius: 3px;
+}
+
+.point-of-sale .product .product-name {
+ position: absolute;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ bottom:0;
+ top:auto;
+ line-height: 14px;
+ width:100%;
+ background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+ background: -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+ background: -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+ background: linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+ /*background:#FFF;*/
+ padding: 3px;
+ padding-top:15px;
+}
+
+
+/* ********* The Screens ********* */
+
+.point-of-sale .screen {
+ position:absolute;
+ text-align: center;
+ top:0px;
+ bottom:0px;
+ width:100%;
+}
+.point-of-sale .screen header h2 {
+ margin-top: 0px;
+ padding-top: 7px;
+}
+.point-of-sale .screen p{
+ font-size: 18px;
+}
+
+/* a) Layout for the Product Screen */
+
+.point-of-sale .screen .layout-table {
+ border:none;
+ width:100%;
+ height:100%;
+}
+
+.point-of-sale .screen .header-row {
+ border:none;
+ width:100%;
+ height:0px;
+}
+
+.point-of-sale .screen .header-cell{
+ border:none;
+ width:100%;
+ height:0px;
+}
+.point-of-sale .screen .content-row {
+ width:100%;
+ height:100%;
+}
+.point-of-sale .screen .content-cell{
+ width:100%;
+}
+.point-of-sale .screen .content-cell .content-container{
+ height:100%;
+ position:relative;
+}
+
+/* b) The payment screen */
+
+.point-of-sale .pos-step-container {
+ display: inline-block;
+ font-size: 1.5em;
+}
+.point-of-sale .greyed-out{
+ color: #AAA;
+}
+.point-of-sale .pos-step-container input{
+ font-size: 1em;
+}
+
+.point-of-sale .pos-payment-container {
+ text-align: left;
+ min-width: 500px;
+}
+.point-of-sale .pos-payment-container .left-block{
+ display: inline-block;
+ width:49%;
+ margin:0;
+ padding:0;
+ text-align:left;
+}
+.point-of-sale .pos-payment-container .header{
+ margin-top: 50px;
+ margin-bottom:20px;
+ font-weight: bold;
+}
+.point-of-sale .pos-payment-container .infoline{
+ margin-top:5px;
+ margin-bottom:5px;
+}
+.point-of-sale .pos-payment-container .right-block{
+ display: inline-block;
+ width:49%;
+ margin:0;
+ padding:0;
+ text-align:right;
+}
+.point-of-sale .pos-payment-container table {
+ width: 100%;
+ margin-bottom: 20px;
+}
+.point-of-sale .pos-payment-container td {
+ vertical-align: middle;
+}
+.point-of-sale .pos-payment-container .paymentline-type {
+ font-size: 1em;
+ font-weight: bold;
+ margin-right:10px;
+}
+
+/* c) The receipt screen */
+
+.point-of-sale .pos-receipt-container {
+ font-size: 0.75em;
+}
+
+.point-of-sale .pos-sale-ticket {
+ text-align: left;
+ width: 300px;
+ background-color: white;
+ margin: 20px;
+ padding: 15px;
+ padding-bottom:30px;
+ display: inline-block;
+ font-family: "Inconsolata";
+ -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+ -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+ box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+}
+.point-of-sale .pos-sale-ticket .emph{
+ font-size: 20px;
+ margin:5px;
+}
+.point-of-sale .pos-sale-ticket table {
+ width: 100%;
+ border: 0;
+}
+.point-of-sale .pos-sale-ticket table td {
+ border: 0;
+}
+
+@media print {
+ .point-of-sale #topheader, .point-of-sale #leftpane {
+ display: none !important;
+ }
+ .point-of-sale #content {
+ top: 0px !important;
+ }
+ .point-of-sale #rightpane {
+ left: 0px !important;
+ background-color: white;
+ }
+ #receipt-screen header {
+ display: none !important;
+ }
+ #receipt-screen {
+ text-align: left;
+ }
+ .pos-sale-ticket {
+ margin: 0;
+ }
+}
+
+/* d) The Scale screen */
+
+.point-of-sale .scale-screen .display{
+ position:relative;
+ width:600px;
+ height:190px;
+ margin-top: 100px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.point-of-sale .scale-screen .product-picture {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ display: float;
+ float: right;
+ margin: 5px;
+ width: 180px;
+ height:180px;
+ line-height:180px;
+ cursor:pointer;
+
+ background:#fff;
+ border: 1px solid #fff;
+ border-radius: 3px;
+ -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+ -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+ box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+}
+
+.point-of-sale .scale-screen .product-picture img{
+ vertical-align: middle;
+ cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-picture .product-price{
+ position: absolute;
+ top:8px;
+ right:8px;
+ width:auto;
+ height:auto;
+ line-height:1;
+ color:white;
+ background: #7f82ac;
+ padding: 2px 5px;
+ border-radius: 3px;
+ cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-name {
+ position: absolute;
+ left:0;
+ top:20px;
+ height:50px;
+ font-size:40px;
+ line-height:50px;
+ text-align:right;
+ right:225px;
+}
+.point-of-sale .scale-screen .weight{
+ position: absolute;
+ left:0;
+ height:90px;
+ bottom:15px;
+ right:220px;
+ padding:5px;
+}
+.point-of-sale .scale-screen .weight p{
+ display: inline-block;
+ text-align:right;
+ line-height: 90px;
+ font-size: 80px;
+ width:100%;
+ height:100%;
+ margin:0;
+ font-family: "Inconsolata";
+}
+
+/* e) The Welcome Screen */
+.point-of-sale .goodbye-message{
+ position: absolute;
+ left:50%;
+ top:30%;
+ width:500px;
+ height:400px;
+ margin-left: -250px;
+ margin-top: -200px;
+ padding:10px;
+ padding-top:20px;
+ text-align:center;
+ font-size:20px;
+ font-weight:bold;
+ background-color: #F0EEEE;
+ border: 1px solid #E0DDDD;
+ -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ z-index:1150;
+}
+
+/* ********* The OrderWidget ********* */
+
+.point-of-sale .order-container{
+ position: absolute;
+ top: 0px;
+ bottom: 232px;
+ width:100%;
+ background: #F0EEEE;
+}
+
+.point-of-sale .order-scroller{
+ width:100%;
+ height:100%;
+ overflow:hidden;
+}
+
+.point-of-sale .order{
+ background: #F00;
+ background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+ background: -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+ background: -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+ background: linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+ padding-bottom:15px;
+ padding-top:15px;
+ margin-left:16px;
+ margin-right:16px;
+ margin-top:16px;
+ margin-bottom:16px;
+ font-size:16px;
+ -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+ -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+ box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+
+}
+
+.point-of-sale .order .empty{
+ text-align:center;
+ margin-top: 15px;
+ margin-bottom: 5px;
+ color:#999;
+ font-weight: normal;
+}
+
+.point-of-sale .order .summary{
+ width:100%;
+ text-align:right;
+ font-weight: bold;
+ margin-top:20px;
+ margin-bottom:10px;
+}
+.point-of-sale .order .summary .line{
+ margin-right:15px;
+ padding-top:5px;
+ border-top: solid 2px;
+ border-color:#777;
+}
+.point-of-sale .order .summary .line.empty{
+ border-color:#BBB;
+ color:#999;
+}
+
+/* ********* The OrderLineWidget ********* */
+
+.point-of-sale .order .orderline{
+ width:100%;
+ margin:0px;
+ padding-top:3px;
+ padding-bottom:10px;
+ padding-left:15px;
+ padding-right:15px;
+ cursor: pointer;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ -webkit-transition: background 250ms ease-in-out;
+ -moz-transition: background 250ms ease-in-out;
+ transition: background 250ms ease-in-out;
+}
+
+.point-of-sale .order .orderline.selected{
+ background: rgba(140,143,183,0.2);
+ -webkit-transition: background 250ms ease-in-out;
+ -moz-transition: background 250ms ease-in-out;
+ transition: background 250ms ease-in-out;
+ cursor: default;
+}
+.point-of-sale .order .orderline .product-name{
+ padding:0;
+ display:inline-block;
+ font-weight: bold;
+ width:80%;
+ overflow:hidden;
+}
+.point-of-sale .order .orderline .price{
+ padding:0;
+ font-weight: bold;
+ float:right;
+}
+.point-of-sale .order .orderline .info-list{
+ color: #888;
+ margin-left:10px;
+}
+.point-of-sale .order .orderline .info-list em{
+ color: #777;
+ font-weight: bold;
+ font-style:normal;
+}
+
+/* ********* The ActionBarWidget ********* */
+
+.point-of-sale .pos-actionbar{
+ position:absolute;
+ left: 0;
+ bottom: 0px;
+ height: 105px;
+ width: 100%;
+ margin: 0;
+ background: #f5f5f5; /*#ebebeb;*/
+ border-top: solid 1px #afafb6;
+ z-index:900;
+}
+
+.point-of-sale .pos-actionbar ul{
+ list-style: none;
+}
+
+.point-of-sale .pos-actionbar-left-pane{
+ height: 100%;
+ width: 434px;
+ margin: 0px;
+ padding-left:3px;
+ padding-right:3px;
+ border-right: solid 1px #dfdfdf;
+ float: left;
+}
+
+.point-of-sale .pos-actionbar-button-list{
+ height: 100%;
+ margin: 0px;
+ padding-left:3px;
+ padding-right:3px;
+ overflow:hidden;
+}
+
+.point-of-sale .pos-actionbar .button{
+ width: 90px;
+ height: 90px;
+ text-align:center;
+ margin:3px;
+ margin-top:6px;
+ float:left;
+
+ font-size: 14px;
+ font-weight: bold;
+
+ cursor: pointer;
+
+ border: 1px solid #cacaca;
+ border-radius: 4px;
+
+ background: #e2e2e2;
+ background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -ms-linear-gradient(#f0f0f0, #e2e2e2);
+ background: linear-gradient(#f0f0f0, #e2e2e2);
+ -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+ -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+ box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+.point-of-sale .pos-actionbar .button .label{
+ margin-top: 37px;
+}
+.point-of-sale .pos-actionbar .button .icon{
+ margin-top: 10px;
+}
+
+.point-of-sale .pos-actionbar .button.disabled *{
+ opacity: 0.5;
+}
+
+.point-of-sale .pos-actionbar .button.rightalign{
+ float:right;
+}
+
+/* ********* The PopupWidgets ********* */
+
+.point-of-sale .modal-dialog{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height:100%;
+ background-color: rgba(0,0,0,0.5);
+ z-index:1000;
+}
+.point-of-sale .modal-dialog .popup{
+ position: absolute;
+ left:50%;
+ top:50%;
+ width:500px;
+ height:400px;
+ margin-left: -250px;
+ margin-top: -200px;
+ padding:10px;
+ padding-top:20px;
+ text-align:center;
+ font-size:20px;
+ font-weight:bold;
+ background-color: #F0EEEE;
+ border: 1px solid #E0DDDD;
+ -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+ z-index:1200;
+}
+.point-of-sale .popup .footer{
+ position:absolute;
+ bottom:0;
+ left:0;
+ width:100%;
+ height:60px;
+ border-top: 1px solid #E0DDDD;
+}
+.point-of-sale .popup .button{
+ float:right;
+ width: 110px;
+ height: 40px;
+ line-height:40px;
+ text-align:center;
+ margin:3px;
+ margin-top:10px;
+ margin-right:10px;
+
+ font-size: 14px;
+ font-weight: bold;
+
+ cursor: pointer;
+
+ border: 1px solid #cacaca;
+ border-radius: 4px;
+
+ background: #e2e2e2;
+ background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+ background: -ms-linear-gradient(#f0f0f0, #e2e2e2);
+ background: linear-gradient(#f0f0f0, #e2e2e2);
+ -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+ -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+ box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+}
+
+.point-of-sale .popup .button.big-left{
+ position:absolute;
+ top: 120px;
+ left:40px;
+ width: 180px;
+ height: 180px;
+ line-height:180px;
+}
+
+.point-of-sale .popup .button.big-right{
+ position:absolute;
+ top: 120px;
+ right:40px;
+ width: 180px;
+ height: 180px;
+ line-height:180px;
+}
+
+/* ********* The ScrollBarWidget ********* */
+
+.point-of-sale .scrollbar{
+ position:absolute;
+ top:7px;
+ right:7px;
+ width:48px;
+ bottom:7px;
+ background: rgba(0,0,0,0.1);
+
+}
+.point-of-sale .scrollbar .button{
+ width:100%;
+ height: 48px;
+ line-height: 38px;
+ text-align: center;
+ font-size:48px;
+ border-radius: 4px;
+ cursor: pointer;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button{
+ color:white;
+ background: rgba(0,0,0,0.6);
+ -webkit-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+ -moz-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+ box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+ text-shadow: rgba(255,255,255,0.5) 0px 0px 10px;
+ -webkit-transition: all 250ms ease-in-out;
+ -moz-transition: all 250ms ease-in-out;
+ transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button.disabled{
+ background: rgba(0,0,0,0.3);
+ color:rgba(255,255,255,0.5);
+ -webkit-transition: all 250ms ease-in-out;
+ -moz-transition: all 250ms ease-in-out;
+ transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .down-button{
+ position:absolute;
+ bottom:0px;
+}
+.point-of-sale .scrollbar .up-button{
+ position:absolute;
+ top:0px;
+}
+.point-of-sale .scrollbar .scroller{
+ position:absolute;
+ top:33%;
+ bottom:50%;
+ width:100%;
+ background: rgba(0,0,0,0.1);
+ border-radius: 4px;
+}
+
diff --git a/addons/point_of_sale/static/src/js/TODO.txt b/addons/point_of_sale/static/src/js/TODO.txt
index edadbe188ea..1696f0b117d 100644
--- a/addons/point_of_sale/static/src/js/TODO.txt
+++ b/addons/point_of_sale/static/src/js/TODO.txt
@@ -47,11 +47,12 @@ TODO AUG 20
v supprimer l'écran
v bloquer sur l'impression
v L'impression est foireuse
+ - description_sales
* CLIENT
- - create a new branch
+ v create a new branch
- Self-checkout welcome screen
- - removal of products for the root category
+ ~ removal of products for the root category
- Terminal de payement
- Code à barres
- Vidanges
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index a6be16b3835..e36070414b6 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -184,6 +184,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
* price_with_tax: (number) the price paid for this orderline, tax included
* price_without_tax: (number) the price paid for this orderline, without taxes
* tax: (number) the price paid in taxes on this orderline
+ * product_description: (string) generic description of the product
+ * product_description_sale: (string) sales related information of the product
* }
* - paymentlines : list of paymentlines :
* {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index a1f6def6bf3..93860697492 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -58,6 +58,21 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
// We fetch the backend data on the server asynchronously. this is done only when the pos user interface is launched,
// Any change on this data made on the server is thus not reflected on the point of sale until it is relaunched.
+ // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used.
+ $.when(this.load_server_data())
+ .then(function(){
+ //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
+ self.ready.resolve();
+ },function(){
+ //we failed to load some backend data, or the backend was badly configured.
+ //the error messages will be displayed in PosWidget
+ self.ready.reject();
+ });
+ },
+
+ // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded.
+ load_server_data: function(){
+ var self = this;
var loaded = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]])
.pipe(function(users){
@@ -142,8 +157,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return fetch(
'product.product',
- ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
- [['pos_categ_id','!=', false]],
+ ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13',
+ 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
+ [['pos_categ_id','!=', false],['sale_ok','=',true]],
{pricelist: self.get('shop').pricelist_id[0]} // context for price
);
}).pipe(function(products){
@@ -173,17 +189,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
}
self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
});
-
- // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used.
- $.when(loaded)
- .then(function(){
- //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
- self.ready.resolve();
- },function(){
- //we failed to load some backend data, or the backend was badly configured.
- //the error messages will be displayed in PosWidget
- self.ready.reject();
- });
+
+ return loaded;
},
// logs the usefull posmodel data to the console for debug purposes
@@ -417,6 +424,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
price_with_tax : this.get_price_with_tax(),
price_without_tax: this.get_price_without_tax(),
tax: this.get_tax(),
+ product_description: this.get_product().get('description'),
+ product_description_sale: this.get_product().get('description_sale'),
};
},
get_price_without_tax: function(){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 4d4e09575ea..9a2071c6335 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -735,11 +735,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
this.validate_button = this.add_action_button({
label: 'Validate',
+ name: 'validation',
icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
click: function(){
self.validateCurrentOrder();
},
});
+
+ this.updatePaymentSummary();
},
close: function(){
this._super();
@@ -806,6 +809,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
this.$('#payment-paid-total').html(paidTotal.toFixed(2));
this.$('#payment-remaining').html(remaining.toFixed(2));
this.$('#payment-change').html(change.toFixed(2));
+ if(this.pos_widget.action_bar){
+ this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+ }
},
set_numpad_state: function(numpadState) {
if (this.numpadState) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 5b98865a971..6de31c88dfd 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -370,14 +370,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
this.label = options.label || 'button';
this.rightalign = options.rightalign || false;
this.click_action = options.click;
+ this.disabled = options.disabled || false;
if(options.icon){
this.icon = options.icon;
this.template = this.icon_template;
}
},
+ set_disabled: function(disabled){
+ if(this.disabled != disabled){
+ this.disabled = !!disabled;
+ this.renderElement();
+ }
+ },
renderElement: function(){
this._super();
- if(this.click_action){
+ if(this.click_action && !this.disabled){
this.$el.click(_.bind(this.click_action, this));
}
},
@@ -388,12 +395,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
init: function(parent, options){
this._super(parent,options);
this.button_list = [];
- this.fake_buttons = {};
+ this.buttons = {};
this.visibility = {};
},
set_element_visible: function(element, visible, action){
if(visible != this.visibility[element]){
- this.visibility[element] = visible;
+ this.visibility[element] = !!visible;
if(visible){
this.$('.'+element).show();
}else{
@@ -401,14 +408,22 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
}
}
if(visible && action){
+ this.action[element] = action;
this.$('.'+element).off('click').click(action);
}
},
+ set_button_disabled: function(name, disabled){
+ var b = this.buttons[name];
+ if(b){
+ b.set_disabled(disabled);
+ }
+ },
destroy_buttons:function(){
for(var i = 0; i < this.button_list.length; i++){
this.button_list[i].destroy();
}
this.button_list = [];
+ this.buttons = {};
return this;
},
get_button_count: function(){
@@ -417,6 +432,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
add_new_button: function(button_options){
var button = new module.ActionButtonWidget(this,button_options);
this.button_list.push(button);
+ if(button_options.name){
+ this.buttons[button_options.name] = button;
+ }
button.appendTo(this.$('.pos-actionbar-button-list'));
return button;
},
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 81f929d50e2..bbe278758d5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -540,7 +540,7 @@
-
+
@@ -548,7 +548,7 @@
-
+
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 4d2e7553371..9228fcc323b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,13 +9,21 @@
make.procurement
-
+
+ Procurement Request
+ make.procurement
+ product.product
+ form
+ new
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 7d26b47519d..16b08e67cee 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -288,13 +288,13 @@ class product_template(osv.osv):
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
- 'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+ 'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
'volume': fields.float('Volume', help="The volume in m3."),
'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
- 'warranty': fields.float('Warranty (months)'),
+ 'warranty': fields.float('Warranty'),
'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),
@@ -302,7 +302,7 @@ class product_template(osv.osv):
('sellable','Normal'),
('end','End of Lifecycle'),
('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
- 'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
+ 'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default Unit of Measure.'),
@@ -354,7 +354,7 @@ class product_template(osv.osv):
'list_price': lambda *a: 1,
'cost_method': lambda *a: 'standard',
'supply_method': lambda *a: 'buy',
- 'standard_price': lambda *a: 1,
+ 'standard_price': lambda *a: 0.0,
'sale_ok': lambda *a: 1,
'sale_delay': lambda *a: 7,
'produce_delay': lambda *a: 1,
@@ -535,9 +535,9 @@ class product_product(osv.osv):
'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
- 'code': fields.function(_product_code, type='char', string='Reference'),
+ 'code': fields.function(_product_code, type='char', string='Internal Reference'),
'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
- 'default_code' : fields.char('Reference', size=64, select=True),
+ 'default_code' : fields.char('Internal Reference', size=64, select=True),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
'variants': fields.char('Variants', size=64),
'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d341b5883d6..ae769528d3c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -12,8 +12,6 @@
-
-
@@ -71,6 +69,12 @@
+
+
+
+
+
+
@@ -78,57 +82,77 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+ days
+
+
+
+ months
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -162,42 +188,30 @@
-
+
+
Product Kanban
product.product
-
+
- oe_kanban_color_red
-
-
-
-
-
-
-
![]()
- Code:
-
No Stock
-
- Stock: on hand, available
- Public Price:
-
- Cost :
-
-
-
-
+
+
![]()
+
@@ -227,7 +241,7 @@
Products
ir.actions.act_window
product.product
-
tree,form,kanban
+
kanban,tree,form
form
{"search_default_filter_to_sell":1}
@@ -250,7 +264,7 @@
tree
-
+
@@ -264,8 +278,8 @@
kanban
-
-
+
+
@@ -534,7 +548,7 @@
product.packaging
-
+
@@ -606,7 +620,7 @@
product.supplierinfo
-
+
@@ -716,7 +730,10 @@
-
+
+
+ days
+
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index f883ca55fe0..88ea6f365e8 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -21,14 +21,14 @@
product.product
-
-
+
+
-
-
+
+
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 5f620747d64..88f528693df 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -7,23 +7,21 @@
product.product
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8a8f784f62e..eb3dac77967 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,7 +218,7 @@
project.project.kanban
project.project
-
+
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 841a61e6c31..f9e761117b6 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -16,8 +16,8 @@
product.product
-
-
+
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6a997916a9a..c6f3745eccb 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -73,7 +73,7 @@
parent="base.menu_purchase_root" sequence="6"/>
- Based on Draft Invoices
+ On Draft Invoices
account.invoice
form
tree,form,calendar,graph
@@ -95,7 +95,7 @@
-
-
+
product.normal.procurement.locations.inherit
product.product
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ days
+
+
+
+
+
+
+
+
+
+
+
@@ -93,8 +83,8 @@
- -
-
+
@@ -132,19 +122,17 @@
-
+
-
-
-
- (+ -)
-
+
+
+
@@ -164,7 +152,6 @@
[('picking_id.type','=','in')]
-
Click to register a reception for this product.
@@ -185,7 +172,6 @@
[('picking_id.type','=','out')]
-
Click to add a delivery order for this product.
@@ -197,50 +183,27 @@
-
- Product Kanban
+
+ Product Kanban Stock
product.product
+
-
-
-
-
-
+
-
-
-
-
-
![]()
-
-
-
-
- - Code:
- - Stock on hand:
- - Stock available:
- - Price:
-
- - Cost:
-
-
-
-
-
-
-
-
-
+
+
+
+ Receptions
+
+
+ Deliveries
+
+
+
+ - On hand:
+ - Available:
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..3560b255ab5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -113,13 +113,14 @@
-
-
- -
-
-
-
+
+
+
+
+
+
+
@@ -267,7 +268,8 @@
-
+
-
+
+
-
+
@@ -1389,8 +1392,10 @@
-
+
+
+
@@ -1413,8 +1418,13 @@
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
-
+
+
@@ -1435,54 +1445,6 @@
-
- stock.move.incoming.search2
- stock.move
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- stock.move.outgoing.search2
- stock.move
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Receive Products
stock.move
@@ -1491,8 +1453,7 @@
tree,form
['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
-
-
+
Click to register a product reception.
@@ -1627,8 +1588,7 @@
tree,form
['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
-
-
+
You will find in this list all products you have to deliver to
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 720c7753df6..ddb2efc21e5 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -38,62 +38,59 @@
product.product
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 3f3bbefdbab..fd12ce53ac9 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -45,16 +45,14 @@
-
-
-
-
+
+
-
-
-
-
+
+