Unifield Server

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

  1. US-5826
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5665
Proposed branch: lp:~julie-w/unifield-server/US-5826
Merge into: lp:unifield-server
Diff against target: 55 lines (+4/-5)
3 files modified
bin/addons/account/account.py (+2/-3)
bin/addons/account_period_closing_level/account_period.py (+1/-1)
bin/addons/data_finance/import_analytic_lines.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5826
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+380673@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/account.py'
2--- bin/addons/account/account.py 2020-02-24 17:11:37 +0000
3+++ bin/addons/account/account.py 2020-03-13 09:53:28 +0000
4@@ -828,7 +828,7 @@
5 'state': 'draft',
6 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
7 }
8- _order = "date_start"
9+ _order = "date_start DESC"
10
11 def _check_fiscal_year(self, cr, uid, ids, context=None):
12 current_fiscal_yr = self.browse(cr, uid, ids, context=context)[0]
13@@ -920,7 +920,6 @@
14 _defaults = {
15 'state': 'draft',
16 }
17- _order = "date_start"
18
19 def _check_duration(self,cr,uid,ids,context=None):
20 obj_period = self.browse(cr, uid, ids[0], context=context)
21@@ -951,7 +950,7 @@
22 ]
23
24 def next(self, cr, uid, period, step, context=None):
25- ids = self.search(cr, uid, [('date_start','>',period.date_start)])
26+ ids = self.search(cr, uid, [('date_start','>',period.date_start)], order='date_start, number')
27 if len(ids)>=step:
28 return ids[step-1]
29 return False
30
31=== modified file 'bin/addons/account_period_closing_level/account_period.py'
32--- bin/addons/account_period_closing_level/account_period.py 2019-09-03 16:08:33 +0000
33+++ bin/addons/account_period_closing_level/account_period.py 2020-03-13 09:53:28 +0000
34@@ -362,7 +362,7 @@
35 'is_system': fields.function(_get_is_system, fnct_search=_get_search_is_system, method=True, type='boolean', string="System period ?", readonly=True),
36 }
37
38- _order = 'date_start, number'
39+ _order = 'date_start DESC, number DESC'
40
41 def create(self, cr, uid, vals, context=None):
42 if not context:
43
44=== modified file 'bin/addons/data_finance/import_analytic_lines.py'
45--- bin/addons/data_finance/import_analytic_lines.py 2017-12-21 16:34:38 +0000
46+++ bin/addons/data_finance/import_analytic_lines.py 2020-03-13 09:53:28 +0000
47@@ -175,7 +175,7 @@
48 date += DateTime.RelativeDateTime(months=DateTime.now().month-1)
49 key_reg = '%s-%s'%(row[1], date.strftime('%m-%Y'))
50 if key_reg not in register_id:
51- p_ids = period_obj.search(cr, uid, [('date_start', '=', date.strftime('%Y-%m-01'))])
52+ p_ids = period_obj.search(cr, uid, [('date_start', '=', date.strftime('%Y-%m-01')), ('special', '=', False)], limit=1)
53 reg_id = reg_obj.search(cr, uid, [('journal_id', '=', journal[row[1]]), ('period_id', '=', p_ids[0])])
54 if not reg_id:
55 logging.getLogger('import analytic').info("No register: journal: %s, period: %s, date: %s"%(journal[row[1]], p_ids[0], date.strftime('%Y-%m-01')))

Subscribers

People subscribed via source and target branches