From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Sun, 8 Nov 2015 20:20:38 +0000 (+0100)
Subject: Merge commit '14d224c'
X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fbikecoop.git;a=commitdiff_plain;h=cc60058cbe68d271a1ba290e25c827db046fe683;hp=-c

Merge commit '14d224c'
---

cc60058cbe68d271a1ba290e25c827db046fe683
diff --combined bikecoop.py
index bc8516b,a945c8a..07f8614
--- a/bikecoop.py
+++ b/bikecoop.py
@@@ -1,15 -1,15 +1,15 @@@
  # -*- coding: utf-8 -*-
  ##############################################################################
  #
 -#    Bikecoop module for OpenERP, Custom module for bike coop'
 -#    Copyright (C) 2012-2014 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 +#    Bikecoop module for OpenERP, Custom module for bike coop' Copyright (C)
 +#    2012-2015 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
  #
  #    This file is a part of Bikecoop
  #
 -#    Bikecoop is free software: you can redistribute it and/or modify
 -#    it under the terms of the GNU General Public License as published by
 -#    the Free Software Foundation, either version 3 of the License, or
 -#    (at your option) any later version.
 +#    Bikecoop is free software: you can redistribute it and/or modify it under
 +#    the terms of the GNU General Public License as published by the Free
 +#    Software Foundation, either version 3 of the License, or (at your option)
 +#    any later version.
  #
  #    Bikecoop is distributed in the hope that it will be useful,
  #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@@ -29,20 -29,20 +29,22 @@@ from datetime import dat
  class Theme(osv.osv):
      _name = 'bikecoop.partner.theme'
      _description = 'Themes that could be related to a partner'
+     _order = 'domain,sequence,name'
  
      _columns = {
          'code': fields.char('Code', size=8, help='Code of the occupation'),
          'name': fields.char('Name', size=128, help='Name of the job or studies', required=True, translate=True),
          'domain': fields.selection([('gender', 'Gender'), ('occupation', 'Occupation'), ('volunteer', 'Volunteer')], 'Domain', required=True, size=24),
          'active': fields.boolean('Active', help='If check, this object is always available'),
+         'sequence': fields.integer('Sequence', help='To order by sequence'),
      }
  
      _defaults = {
          'active': lambda *a: 1,
      }
  
 +    _order = 'name'
 +
  Theme()