Merge lp:~jfb-tempo-consulting/unifield-server/US-8557 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 6391
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-8557
Merge into: lp:unifield-server
Diff against target: 24 lines (+6/-1)
1 file modified
bin/addons/account/account.py (+6/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-8557
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+434181@code.launchpad.net
To post a comment you must log in.
6361. By jftempo

US-10290 [FIX] Homere PERMOIS import: process only the current contract

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

6362. By jftempo

US-10838 [IMP] Import Invoice lines: specific message when analytic account is missing

lp:~mukunde/unifield-server/US-10838

6363. By jftempo

US-10653 [IMP] Liquidity Balances: on HQ all instances with a single click

lp:~mukunde/unifield-server/US-10653

6364. By jftempo

US-10736 [IMP] Product deactivation: ignore Open invoices on non-reconcilable header account

lp:~mukunde/unifield-server/US-10736

6365. By jftempo

US-10410 [IMP] Combined journal reports: allow multiple sequence numbers on the selection

lp:~mukunde/unifield-server/US-10410

6366. By jftempo

US-10637 [IMP] Register line: replace non-breaking space by space

lp:~mukunde/unifield-server/US-10637

6367. By jftempo

US-9995 [FIX] AD on IVI/IVO: when creating new F1 or F2 lines, do not put by default any analytical account

lp:~mukunde/unifield-server/US-9995

6368. By jftempo

US-10279 [IMP] Open Advance on register: restrict list to advances on the same journal

lp:~mukunde/unifield-server/US-10279

6369. By jftempo

US-9215 [IMP] IVO/IVI rename Reference field to Description

lp:~mukunde/unifield-server/US-9215

6370. By jftempo

US-9281 [IMP] Register cashcount lines: limitation on max digits allowed

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

6371. By jftempo

US-10784 [IMP] Electronic Validation: reconfigure to deactivate signature

lp:~jfb-tempo-consulting/unifield-server/us-10784

6372. By jftempo

US-10652 [IMP] Partner object: change property to m2o on property_product_pricelist_purchase, property_product_pricelist, property_account_receivable and property_account_payable

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

6373. By jftempo

US-7624 [IMP] Auto Import Employees: import all or nothing

lp:~mukunde/unifield-server/US-7624

6374. By jftempo

US-10566 [FIX] PO merge: merge Customer field

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

6375. By jftempo

US-10894 [IMP] French translation Fiscal Year

lp:~mukunde/unifield-server/US-10894

6376. By jftempo

US-9996 [FIX] AD total amount: sum amounts only on balance sheet accounts lines

lp:~mukunde/unifield-server/US-9996

6377. By jftempo

US-10363 [IMP] Commitment lines: add default filter on ENGI

lp:~mukunde/unifield-server/US-10363

6378. By jftempo

Version UF28.0dev

6379. By jftempo

US-8557 MERGE TRUNK

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-10-31 15:13:09 +0000
3+++ bin/addons/account/account.py 2023-01-16 16:21:14 +0000
4@@ -1767,6 +1767,7 @@
5 valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
6 obj_analytic_line = self.pool.get('account.analytic.line')
7 obj_move_line = self.pool.get('account.move.line')
8+ cr.execute('select id from account_move_line where move_id in %s for update', (tuple(ids),))
9 for move in self.browse(cr, uid, ids, context):
10 # Unlink old analytic lines on move_lines
11 # UTP-803: condition on context added, if this context is set analytic lines won't be created,
12@@ -1782,7 +1783,11 @@
13 for obj_line in move.line_id:
14 for obj in obj_line.analytic_lines:
15 obj_analytic_line.unlink(cr,uid,obj.id)
16-
17+ # TO DO REMOVE ME
18+ #import time
19+ #print 'sleep...'
20+ #time.sleep(10)
21+ #print 'ok'
22 journal = move.journal_id
23 amount = 0
24 amount_currency = 0

Subscribers

People subscribed via source and target branches