Add module pos_journal_sequence.

This commit is contained in:
Alexis de Lattre
2014-11-17 23:13:49 +01:00
parent 7c515b6273
commit a33c3a1a21
5 changed files with 148 additions and 0 deletions

View File

@@ -0,0 +1,23 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# POS Journal Sequence module for Odoo
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# 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/>.
#
##############################################################################
from . import account

View File

@@ -0,0 +1,43 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# POS Journal Sequence module for Odoo
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# 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': 'POS Journal Sequence',
'version': '0.1',
'category': 'Point Of Sale',
'license': 'AGPL-3',
'summary': 'Order payment buttons in Point of Sale',
'description': """
This module adds a field *POS Sequence* on account journals that will
allow you to control the order of the payment buttons in the interface
of the point of sale. It requires a patch on the Javascript code of the
point of sale (cf file odoo-point_of_sale.patch).
This module has been written by Alexis de Lattre
<alexis.delattre@akretion.com>.
""",
'author': 'Akretion',
'website': 'http://www.akretion.com',
'depends': ['point_of_sale'],
'data': ['pos_journal_sequence_view.xml'],
'installable': True,
}

View File

@@ -0,0 +1,31 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# Purchase Auto Invoice Method module for OpenERP
# Copyright (C) 2013 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# 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/>.
#
##############################################################################
from openerp import models, fields
class AccountJournal(models.Model):
_inherit = 'account.journal'
pos_sequence = fields.Integer(
string='POS Sequence',
help='Sequence used to order Payment buttons in the Point of Sale')

View File

@@ -0,0 +1,15 @@
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 8e02ddd..b95c113 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -90,6 +90,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
renderElement: function() {
var self = this;
this._super();
+ // sort cashregisters by pos_sequence
+ this.pos.cashregisters.sort(function(obj1, obj2) {
+ return obj1.journal.pos_sequence - obj2.journal.pos_sequence;
+ });
_.each(this.pos.cashregisters,function(cashregister) {
var button = new module.PaypadButtonWidget(self,{

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 Akretion (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py
-->
<openerp>
<data>
<record id="view_account_journal_pos_user_form" model="ir.ui.view">
<field name="name">pos.sequence.account.journal.form</field>
<field name="model">account.journal</field>
<field name="inherit_id" ref="point_of_sale.view_account_journal_pos_user_form"/>
<field name="arch" type="xml">
<field name="amount_authorized_diff" position="after">
<field name="pos_sequence"/>
</field>
</field>
</record>
<record id="view_pos_config_form" model="ir.ui.view">
<field name="name">pos.sequence.account.journal.tree.pos.config</field>
<field name="model">pos.config</field>
<field name="inherit_id" ref="point_of_sale.view_pos_config_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='journal_ids']/tree/field[@name='cash_control']" position="after">
<field name="pos_sequence"/>
</xpath>
</field>
</record>
</data>
</openerp>