Merge branch '7.0' of https://github.com/grap/odoo-addons-grap into 7…

….0-internal-trade

.travis.yml

@@ -4,8 +4,10 @@ python:
   - "2.7"
 
 env:
-  - VERSION="7.0" ODOO_REPO="odoo/odoo"
-  - VERSION="7.0" ODOO_REPO="OCA/OCB"
+  - LINT_CHECK="1"
+  - VERSION="7.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
+  - VERSION="7.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
+  - VERSION="7.0" UNIT_TEST="1" LINT_CHECK="0"
 
 virtualenv:
   system_site_packages: true

account_delete_move_null_amount/security/res_groups.yml

@@ -23,5 +23,3 @@
 - !record {model: res.groups, id: res_groups_account_move_null_amount_manager}:
     category_id: base.module_category_usability
     name: Delete Account Move With Null Amount Manager
-    users:
-        - base.user_root

account_group_move_lines/i18n/fr.po

@@ -0,0 +1,112 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_group_move_lines
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-12-13 23:03+0000\n"
+"PO-Revision-Date: 2014-12-13 23:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:128
+#, python-format
+msgid "Configuration Error!"
+msgstr "Erreur de configuration !"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:47
+#: code:addons/account_group_move_lines/model/pos_session.py:91
+#: code:addons/account_group_move_lines/model/pos_session.py:142
+#, python-format
+msgid "Error!"
+msgstr "Erreur !"
+
+#. module: account_group_move_lines
+#: code:_description:0
+#: model:ir.model,name:account_group_move_lines.model_account_invoice
+#, python-format
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:147
+#, python-format
+msgid "No Analytic Journal!"
+msgstr "Pas de journal analytique !"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:92
+#, python-format
+msgid "Please set your profit and loss accounts on your payment method '%s'. This will allow OpenERP to post the difference of %.2f in your ending balance. To close this session, you can update the 'Closing Cash Control' to avoid any difference."
+msgstr "Merci de paramétrer des comptes de pertes et profits sur votre moyen de paiement '%s'. Cel a va permettre à OpenERP d'écrire la différence de %.2f dans votre balance de fin."
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:129
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Merci de vérifier qu'un compte est défini dans le journal."
+
+#. module: account_group_move_lines
+#: code:_description:0
+#: model:ir.model,name:account_group_move_lines.model_pos_order
+#, python-format
+msgid "Point of Sale"
+msgstr "Point de Vente"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:89
+#, python-format
+msgid "Point of Sale Loss"
+msgstr "Perte Point de Vente"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:85
+#, python-format
+msgid "Point of Sale Profit"
+msgstr "Gain Point de Vente"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:177
+#, python-format
+msgid "Statement %s confirmed, journal items were created."
+msgstr "Relevé %s confirmé, Les écritures du journal ont été créées."
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:143
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr "Les lignes comptables ne sont pas dans un état valide."
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_order.py:36
+#, python-format
+msgid "Various Products"
+msgstr "Produits variés"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:48
+#, python-format
+msgid "You cannot confirm all orders of this session, because they have not the 'paid' status"
+msgstr "Vous ne pouvez pas confirmer toutes le ventes de cette session, car elle ne sont pas toutes à l'état payé"
+
+#. module: account_group_move_lines
+#: code:addons/account_group_move_lines/model/pos_session.py:147
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "Vous devez paramétrer un journal analytique sur le journal '%s' !"
+
+#. module: account_group_move_lines
+#: code:_description:0
+#: model:ir.model,name:account_group_move_lines.model_pos_session
+#, python-format
+msgid "pos.session"
+msgstr "pos.session"
+

account_group_move_lines/model/pos_order.py

@@ -20,17 +20,20 @@
 #
 ##############################################################################
 
+from openerp.tools.translate import _
 from openerp.osv.orm import Model
 
 
 class pos_order(Model):
-    _inherit = "pos.order"
+    _inherit = 'pos.order'
 
     def _get_key(self, cr, uid, data_type, values, context=None):
         key = False
         if data_type == 'product':
-            key = ('product', values['tax_code_id'], values['debit'] > 0)
-            values.update({'name': 'various products'})
+            key = (
+                'product', values['tax_code_id'], values['account_id'],
+                values['debit'] > 0)
+            values.update({'name': _('Various Products')})
         elif data_type == 'tax':
             key = ('tax', values['tax_code_id'], values['debit'] > 0)
         elif data_type == 'counter_part':

account_group_move_lines/tests/__init__.py

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account - Group Move Line Module for Odoo
+#    Copyright (C) 2014-Today 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/>.
+#
+##############################################################################
+from . import tests
+
+fast_suite = [
+    tests,
+]