Merge lp:~julie-w/unifield-server/US-1562 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2017-05-12 09:58:49 +0000
+++ bin/addons/account/account.py	2017-07-18 08:09:45 +0000
@@ -901,7 +901,7 @@
     _description = "Account period"
     _columns = {
         'name': fields.char('Period Name', size=64, required=True),
-        'code': fields.char('Code', size=12),
+        'code': fields.char('Code', size=24),
         'special': fields.boolean('Opening/Closing Period', size=12,
                                   help="These periods can overlap."),
         'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),

=== modified file 'bin/addons/account_period_closing_level/account_fiscalyear.py'
--- bin/addons/account_period_closing_level/account_fiscalyear.py	2016-11-02 10:05:34 +0000
+++ bin/addons/account_period_closing_level/account_fiscalyear.py	2017-07-18 08:09:45 +0000
@@ -102,6 +102,7 @@
     }
 
     def create_period(self,cr, uid, ids, context=None, interval=1):
+        period_obj = self.pool.get('account.period')
         for fy in self.browse(cr, uid, ids, context=context):
             ds = datetime.datetime.strptime(fy.date_start, '%Y-%m-%d')
             i = 0
@@ -112,7 +113,7 @@
                 if de.strftime('%Y-%m-%d')>fy.date_stop:
                     de = datetime.datetime.strptime(fy.date_stop, '%Y-%m-%d')
 
-                self.pool.get('account.period').create(cr, uid, {
+                period_obj.create(cr, uid, {
                     'name': ds.strftime('%b %Y'),
                     'code': ds.strftime('%b %Y'),
                     'date_start': ds.strftime('%Y-%m-%d'),
@@ -125,9 +126,9 @@
 
             ds = datetime.datetime.strptime(fy.date_stop, '%Y-%m-%d')
             for period_nb in (13, 14, 15):
-                self.pool.get('account.period').create(cr, uid, {
-                    'name': 'Period %d' % (period_nb),
-                    'code': 'Period %d' % (period_nb),
+                period_obj.create(cr, uid, {
+                    'name': 'Period %d %d' % (period_nb, ds.year),
+                    'code': 'Period %d %d' % (period_nb, ds.year),
                     'date_start': '%d-12-01' % (ds.year),
                     'date_stop': '%d-12-31' % (ds.year),
                     'fiscalyear_id': fy.id,

=== modified file 'bin/addons/account_period_closing_level/account_year_end_closing.py'
--- bin/addons/account_period_closing_level/account_year_end_closing.py	2016-07-06 10:23:25 +0000
+++ bin/addons/account_period_closing_level/account_year_end_closing.py	2017-07-18 08:09:45 +0000
@@ -233,7 +233,7 @@
 
         for pn in period_numbers:
             period_year_month = (fy_year, self._period_month_map[pn], )
-            code = "Period %d" % (pn, )
+            code = "Period %d %s" % (pn, fy_year)
             if not period_obj.search(cr, uid, [('fiscalyear_id', '=', fy_id), ('number', '=', pn), ('active', 'in', ['t', 'f'])],
                     order='NO_ORDER', context=context):
                 vals = {

=== modified file 'bin/addons/account_period_closing_level/wizard/account_period_create.py'
--- bin/addons/account_period_closing_level/wizard/account_period_create.py	2016-11-02 10:14:39 +0000
+++ bin/addons/account_period_closing_level/wizard/account_period_create.py	2017-07-18 08:09:45 +0000
@@ -44,6 +44,7 @@
         end_date = datetime.date(year, 12, 31)
 
         fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
 
         ds = start_date
         while ds < end_date:
@@ -60,8 +61,8 @@
                     'date_start': ds,
                     'date_stop': end_date})
 
-            if not self.pool.get('account.period').name_search(cr, uid, ds.strftime('%b %Y'), [('fiscalyear_id', '=', fiscalyear_id)]):
-                self.pool.get('account.period').create(cr, uid, {
+            if not period_obj.name_search(cr, uid, ds.strftime('%b %Y'), [('fiscalyear_id', '=', fiscalyear_id)]):
+                period_obj.create(cr, uid, {
                     'name': ds.strftime('%b %Y'),
                     'code': ds.strftime('%b %Y'),
                     'date_start': ds.strftime('%Y-%m-%d'),
@@ -73,10 +74,11 @@
 
         fiscalyear_id = fiscalyear_obj.find(cr, uid, start_date, exception=False, context=context)
         for period_nb in (13, 14, 15):
-            if not self.pool.get('account.period').name_search(cr, uid, 'Period %d' % (period_nb), [('fiscalyear_id', '=', fiscalyear_id)]):
-                self.pool.get('account.period').create(cr, uid, {
-                    'name': 'Period %d' % (period_nb),
-                    'code': 'Period %d' % (period_nb),
+            if not period_obj.name_search(cr, uid, 'Period %d' % (period_nb),
+                                          [('fiscalyear_id', '=', fiscalyear_id)], operator='ilike'):
+                period_obj.create(cr, uid, {
+                    'name': 'Period %d %d' % (period_nb, start_date.year),
+                    'code': 'Period %d %d' % (period_nb, start_date.year),
                     'date_start': '%d-12-01' % (start_date.year),
                     'date_stop': '%d-12-31' % (start_date.year),
                     'fiscalyear_id': fiscalyear_id,

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2017-05-22 16:04:34 +0000
+++ bin/addons/msf_doc_import/account.py	2017-07-18 08:09:45 +0000
@@ -421,7 +421,7 @@
                                 continue
                             r_fp = fp_ids[0]
                     # US-937: use period of import file
-                    if line[cols['Period']] == 'Period 16':
+                    if line[cols['Period']].startswith('Period 16'):
                         raise osv.except_osv(_('Warning'), _("You can't import entries in Period 16."))
                     period_ids = period_obj.search(
                         cr, uid, [

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-07-10 07:14:10 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-07-18 08:09:45 +0000
@@ -189,5 +189,9 @@
         <record id="us_1359_update_move_shipment" model="patch.scripts">
             <field name="method">us_1359_update_move_shipment</field>
         </record>
+
+        <record id="us_1562_rename_special_periods" model="patch.scripts">
+            <field name="method">us_1562_rename_special_periods</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-07-11 10:25:38 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-07-18 08:09:45 +0000
@@ -1363,6 +1363,25 @@
 
         return True
 
+    def us_1562_rename_special_periods(self, cr, uid, *a, **b):
+        """
+        Update the name and code of the special Periods from "Period xx" to "Period xx YYYY" (ex: Period 13 2017)
+        """
+        update_name_and_code = """
+            UPDATE account_period AS p
+            SET name = name || ' ' || (SELECT SUBSTR(code, 3, 4) FROM account_fiscalyear AS fy WHERE p.fiscalyear_id = fy.id),
+            code = code || ' ' || (SELECT SUBSTR(code, 3, 4) FROM account_fiscalyear AS fy WHERE p.fiscalyear_id = fy.id)
+            WHERE name like 'Period %';
+            """
+        update_translation = """
+            UPDATE ir_translation AS t 
+            SET src = (SELECT t.src || ' ' || to_char(date_start,'YYYY') FROM account_period WHERE id=t.res_id), 
+            value = (SELECT t.value || ' ' || to_char(date_start,'YYYY') FROM account_period WHERE id=t.res_id) 
+            WHERE name='account.period,name' AND src LIKE 'Period%' AND type='model';
+        """
+        cr.execute(update_name_and_code)
+        cr.execute(update_translation)
+
 
 patch_scripts()