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

Proposed by jftempo
Status: Needs review
Proposed branch: lp:~julie-w/unifield-server/US-9813
Merge into: lp:unifield-server
Diff against target: 52 lines (+11/-9)
3 files modified
bin/addons/account/account.py (+11/-2)
bin/addons/account/account_bank_statement.py (+0/-2)
bin/addons/msf_profile/i18n/fr_MF.po (+0/-5)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-9813
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+417813@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

6201. By Julie Nuguet

US-9813 [FIX] Journal inactivation: fix the check on the last register's balance (make sure the register checked is the last one)

6200. By jftempo

Release UF25.0dev

6199. By jftempo

US-9671 [FIX] Pick / PPL import: prevent modification on closed documents
   + prevent modifications of lines/qty/RT on OUT/Pick coming from workflow

lp:~dorian-kemps/unifield-server/US-9671

6198. By jftempo

US-9567 [IMP] Financing Contract: perfomance on quad reporting lines and account only display

lp:~jfb-tempo-consulting/unifield-server/US-9567

6197. By jftempo

US-9736 [IMP] Users: added filter to see non-synchronized users

lp:~dorian-kemps/unifield-server/US-9736

6196. By jftempo

US-6475 [IMP] PO: VAT corner

lp:~jfb-tempo-consulting/unifield-server/US-6475

6195. By jftempo

US-9604 [IMP] FO / PO perf: use sql join between lines and document, sql indexes, use sql instead of browse

lp:~jfb-tempo-consulting/unifield-server/po-confirmation

6194. By jftempo

Release UF24.0

6193. By jftempo

[FIX] Claim: forward to supplier in French

6192. By jftempo

Release UF24.0rc3

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 2022-02-10 15:35:09 +0000
3+++ bin/addons/account/account.py 2022-03-29 15:45:41 +0000
4@@ -822,8 +822,17 @@
5 _("Please post all the manual Journal Entries on the journal %s before inactivating it.") %
6 journal.code)
7 if journal.type in ['bank', 'cash']:
8- last_reg_id = reg_obj.search(cr, uid, [('journal_id', '=', journal.id)],
9- order='period_start_date DESC', limit=1, context=context)
10+ last_reg_sql = """
11+ SELECT reg.id
12+ FROM account_bank_statement reg
13+ INNER JOIN account_period p ON reg.period_id = p.id
14+ INNER JOIN account_journal j ON reg.journal_id = j.id
15+ WHERE j.id = %s
16+ ORDER BY p.date_start DESC LIMIT 1
17+ """
18+ cr.execute(last_reg_sql, (journal.id,))
19+ last_reg_id = cr.fetchone()
20+
21 if last_reg_id:
22 balance_end = reg_obj.browse(cr, uid, last_reg_id[0], fields_to_fetch=['balance_end']).balance_end or 0.0
23 if abs(balance_end) > 10**-3:
24
25=== modified file 'bin/addons/account/account_bank_statement.py'
26--- bin/addons/account/account_bank_statement.py 2022-01-21 15:35:54 +0000
27+++ bin/addons/account/account_bank_statement.py 2022-03-29 15:45:41 +0000
28@@ -129,8 +129,6 @@
29 'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
30 'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True),
31 'period_id': fields.many2one('account.period', 'Period', required=True),
32- 'period_start_date': fields.related('period_id', 'date_start', type='date', string='Period Start Date',
33- store=False, write_relate=False),
34 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
35 states={'confirm':[('readonly',True)]}),
36 'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]},
37
38=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
39--- bin/addons/msf_profile/i18n/fr_MF.po 2022-03-22 10:40:31 +0000
40+++ bin/addons/msf_profile/i18n/fr_MF.po 2022-03-29 15:45:41 +0000
41@@ -113656,11 +113656,6 @@
42 msgstr "Statut du journal"
43
44 #. module: account
45-#: field:account.bank.statement,period_start_date:0
46-msgid "Period Start Date"
47-msgstr "Date de Début de la Période"
48-
49-#. module: account
50 #: code:addons/account/account.py:798
51 #, python-format
52 msgid "Please close the registers linked to the journal %s before inactivating it."

Subscribers

People subscribed via source and target branches