From d9aec75ec42cc94ec7c753228c7fa0ac7534fc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 16 Sep 2008 19:43:07 +0200
Subject: [PATCH] Add type on period It allows to create adjustment period that
 can ovrelaps other periods

---
 fiscalyear.py |  1 +
 period.py     | 25 +++++++++++++++++++------
 period.xml    |  8 ++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/fiscalyear.py b/fiscalyear.py
index acb8e6586e..adf97f816b 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -127,6 +127,7 @@ class FiscalYear(OSV):
                     'end_date': period_end_date.strftime('%Y-%m-%d'),
                     'fiscalyear': fiscalyear.id,
                     'post_move_sequence': fiscalyear.post_move_sequence.id,
+                    'type': 'standard',
                     }, context=context)
                 period_start_date = period_end_date + \
                         mx.DateTime.RelativeDateTime(days=1)
diff --git a/period.py b/period.py
index fe23dd27cd..06c5ad592b 100644
--- a/period.py
+++ b/period.py
@@ -15,18 +15,24 @@ class Period(OSV):
     _name = 'account.period'
     _description = __doc__
 
-    name = fields.Char('Name', size=None, required=True)
-    code = fields.Char('Code', size=None)
-    start_date = fields.Date('Starting Date', required=True, states=_STATES)
-    end_date = fields.Date('Ending Date', required=True, states=_STATES)
+    name = fields.Char('Name', required=True)
+    code = fields.Char('Code')
+    start_date = fields.Date('Starting Date', required=True, states=_STATES,
+            select=1)
+    end_date = fields.Date('Ending Date', required=True, states=_STATES,
+            select=1)
     fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
-            required=True, states=_STATES)
+            required=True, states=_STATES, select=1)
     state = fields.Selection([
         ('open', 'Open'),
         ('close', 'Close'),
         ], 'State', readonly=True, required=True)
     post_move_sequence =fields.Many2One('ir.sequence', 'Post Move Sequence',
             required=True, domain="[('code', '=', 'account.move')]")
+    type = fields.Selection([
+        ('standard', 'Standard'),
+        ('adjustment', 'Adjustment'),
+        ], 'Type', required=True, select=1, states=_STATES, select=1)
 
     def __init__(self):
         super(Period, self).__init__()
@@ -56,14 +62,20 @@ class Period(OSV):
     def default_state(self, cursor, user, context=None):
         return 'open'
 
+    def default_type(self, cursor, user, context=None):
+        return 'standard'
+
     def check_dates(self, cursor, user, ids):
         for period in self.browse(cursor, user, ids):
+            if period.type != 'standard':
+                continue
             cursor.execute('SELECT id ' \
                     'FROM ' + self._table + ' ' \
                     'WHERE ((start_date <= %s AND end_date >= %s) ' \
                             'OR (start_date <= %s AND end_date >= %s) ' \
                             'OR (start_date >= %s AND end_date <= %s)) ' \
                         'AND fiscalyear = %s ' \
+                        'AND type = \'standard\' ' \
                         'AND id != %s',
                     (period.start_date, period.start_date,
                         period.end_date, period.end_date,
@@ -82,7 +94,7 @@ class Period(OSV):
                 return False
         return True
 
-    def find(self, cursor, user, company_id, date=None, exception=True, 
+    def find(self, cursor, user, company_id, date=None, exception=True,
             context=None):
         '''
         Return the period for the company_id
@@ -96,6 +108,7 @@ class Period(OSV):
             ('start_date', '<=', date),
             ('end_date', '>=', date),
             ('fiscalyear.company', '=', company_id),
+            ('type', '=', 'standard'),
             ], order=[('start_date', 'DESC')], limit=1, context=context)
         if not ids:
             if exception:
diff --git a/period.xml b/period.xml
index a4c86aeb4d..9e67d67da4 100644
--- a/period.xml
+++ b/period.xml
@@ -12,12 +12,15 @@
                     <field name="name"/>
                     <label name="code"/>
                     <field name="code"/>
+                    <label name="fiscalyear"/>
+                    <field name="fiscalyear"/>
+                    <newline/>
                     <label name="start_date"/>
                     <field name="start_date"/>
                     <label name="end_date"/>
                     <field name="end_date"/>
-                    <label name="fiscalyear"/>
-                    <field name="fiscalyear"/>
+                    <label name="type"/>
+                    <field name="type"/>
                     <newline/>
                     <label name="post_move_sequence"/>
                     <field name="post_move_sequence" required="0"/>
@@ -36,6 +39,7 @@
                 <tree string="Periods">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
+                    <field name="type" select="1"/>
                     <field name="state" select="1"/>
                 </tree>
                 ]]>