Merge lp:~sylvain-legal/openerp-pos/7.0_pos_second_header into lp:openerp-pos

[Sylvain LE GAL (GRAP)]

[ADD] Add new module to display a second header in Point Of Sale

new module "pos_second_header" that add a second toolbar in the point of sale module (front-end).
This module is useless alone, but some modules depend on it. (pos_restaurant, pos_select_customer, etc.)

Flake8: OK.

Thanks for your reviews.

[Cristian Salamea (ovnicraft)]

I dont know if its necessary license header at XML template.

LGTM

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Sylvain, thanks for the module. You have to put files inside a directory called 'pos_second_header' or something similar, but the rest LGTM.

review: Needs Fixing (code review)

[Sylvain LE GAL (GRAP) (sylvain-legal)]

> Hi, Sylvain, thanks for the module. You have to put files inside a directory
> called 'pos_second_header' or something similar, but the rest LGTM.

Hi thanks for the review. Sorry i'll change that when i'll go back from hollidays.
Regards.

[Sylvain LE GAL (GRAP) (sylvain-legal)]

> I dont know if its necessary license header at XML template.
>
> LGTM
Hi. Thanks for the review. My PoV is that code is python file + xml + css + js files. So i put licences in all filds basically.
Regards.

[lp:~sylvain-legal/openerp-pos/7.0_pos_second_header]

3. By Sylvain LE GAL (GRAP) on 2014-09-11

[FIX] 'pos_second_header'. Add folder of the module and move files into.

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi Pedro,

I did the change. Are you ok with the new Merge Proposal ?

Regards.

[Pedro Manuel Baeza (pedro.baeza)]

Yeah, sure!

review: Approve (code review)

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Project has moved into github.
https://github.com/odoo-pos/odoo-pos/tree/7.0

review: Disapprove (obsolete)

Unmerged revisions

3. By Sylvain LE GAL (GRAP) on 2014-09-11

[FIX] 'pos_second_header'. Add folder of the module and move files into.

2. By Sylvain LE GAL (GRAP) on 2014-07-30

[REF] Change some descriptions.

1. By Sylvain LE GAL (GRAP) on 2014-07-30

[ADD] Add new module to display a second header in Point Of Sale

=== added directory 'pos_second_header'
=== added file 'pos_second_header/__init__.py'
--- pos_second_header/__init__.py	1970-01-01 00:00:00 +0000
+++ pos_second_header/__init__.py	2014-09-11 15:07:38 +0000
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Point Of Sale - Second Header module for OpenERP
+#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
+#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################

=== added file 'pos_second_header/__openerp__.py'
--- pos_second_header/__openerp__.py	1970-01-01 00:00:00 +0000
+++ pos_second_header/__openerp__.py	2014-09-11 15:07:38 +0000
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Point Of Sale - Second Header module for OpenERP
+#    Copyright (C) 2014 GRAP (http://www.grap.coop)
+#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Point Of Sale - Second Header',
+    'summary': 'Add a second header in the Point Of Sale (front-end)',
+    'version': '0.1',
+    'category': 'sale',
+    'description': """
+Add a second header in the Point Of Sale (front-end)
+====================================================
+
+Functionality:
+--------------
+    * Add a second banner in the point of sale page under the the first one,"""
+    """dedicated to extra-information of the current pos order;
+
+Copyright, Authors and Licence:
+-------------------------------
+    * Copyright: 2014, GRAP: Groupement Régional Alimentaire de Proximité;
+    * Author:
+        * Sylvain LE GAL (https://twitter.com/legalsylvain);
+    * Licence: AGPL-3 (http://www.gnu.org/licenses/);""",
+    'author': 'GRAP',
+    'website': 'http://www.grap.coop',
+    'license': 'AGPL-3',
+    'depends': [
+        'point_of_sale',
+        ],
+    'qweb': [
+        'static/src/xml/psh.xml',
+    ],
+    'js': [
+        'static/src/js/psh.js',
+    ],
+    'css': [
+        'static/src/css/psh.css',
+    ],
+}

=== added directory 'pos_second_header/static'
=== added directory 'pos_second_header/static/src'
=== added directory 'pos_second_header/static/src/css'
=== added file 'pos_second_header/static/src/css/psh.css'
--- pos_second_header/static/src/css/psh.css	1970-01-01 00:00:00 +0000
+++ pos_second_header/static/src/css/psh.css	2014-09-11 15:07:38 +0000
@@ -0,0 +1,59 @@
+/******************************************************************************
+    Point Of Sale - Second Header module for OpenERP
+    Copyright (C) 2014 GRAP (http://www.grap.coop)
+    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+
+    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 <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+/* 
+    Overload: default display of point of sale
+*/
+.point-of-sale #topheader {
+    height: 65px;
+}
+
+.point-of-sale #content {
+    top: 65px;
+}
+
+/* 
+    Define: PosOrderHeaderWidget CSS
+*/
+.point-of-sale #topheader #rightheader #pos_order_header{
+    height: 32px;
+    border-top: 1px solid #373737;
+}
+
+/* 
+    Define: New class for further content
+*/
+.point-of-sale #rightheader .extra-label{
+    float:left;
+    color:#DDD;
+/*    border-right: 1px solid #373737;*/
+    height:100%;
+    overflow:hidden;
+    text-overflow: ellipsis;
+    text-align:center;
+}
+
+.point-of-sale #rightheader .extra-label .extra-text{
+    font-size:15px;
+    font-style:italic;
+    position: relative;
+    top: 50%;
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%);
+}

=== added directory 'pos_second_header/static/src/img'
=== added file 'pos_second_header/static/src/img/icon.png'
Binary files pos_second_header/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and pos_second_header/static/src/img/icon.png	2014-09-11 15:07:38 +0000 differ
=== added directory 'pos_second_header/static/src/js'
=== added file 'pos_second_header/static/src/js/psh.js'
--- pos_second_header/static/src/js/psh.js	1970-01-01 00:00:00 +0000
+++ pos_second_header/static/src/js/psh.js	2014-09-11 15:07:38 +0000
@@ -0,0 +1,47 @@
+/******************************************************************************
+    Point Of Sale - Second Header module for OpenERP
+    Copyright (C) 2014 GRAP (http://www.grap.coop)
+    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+
+    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 <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+openerp.pos_second_header = function (instance) {
+    module = instance.point_of_sale;
+
+    /* 
+        Define : PosOrderHeaderWidget to allow possibility to include inside 
+        some extra informations.
+    */
+    module.PosOrderHeaderWidget = module.PosBaseWidget.extend({
+        template: 'PosOrderHeaderWidget',
+
+        init: function(parent, options){
+            this._super(parent,options);
+        },
+    });
+
+    /* 
+        Overload : PosWidget to include PosOrderHeaderWidget inside.
+    */
+    module.PosWidget = module.PosWidget.extend({
+        build_widgets: function(){
+            this._super();
+            this.pos_order_header = new module.PosOrderHeaderWidget(this,{});
+            this.pos_order_header.appendTo(this.$('#rightheader'));
+
+        },
+    });
+
+};

=== added directory 'pos_second_header/static/src/xml'
=== added file 'pos_second_header/static/src/xml/psh.xml'
--- pos_second_header/static/src/xml/psh.xml	1970-01-01 00:00:00 +0000
+++ pos_second_header/static/src/xml/psh.xml	2014-09-11 15:07:38 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ********************************************************************** -->
+<!--Point Of Sale - Second Header module for OpenERP                        -->
+<!--Copyright (C) 2014 GRAP (http://www.grap.coop)                          -->
+<!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
+
+<!--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 <http://www.gnu.org/licenses/>.   -->
+<!-- ********************************************************************** -->
+<templates id="template" xml:space="preserve">
+
+    <t t-name="PosOrderHeaderWidget">
+        <div id="pos_order_header" />
+    </t>
+
+</templates>