Skip to content

Commit 6b67c78

Browse files
committed
[FIX] account_interest: Use correct journal for creating interest invoices
X-original-commit: e8862d2
1 parent d38b8f2 commit 6b67c78

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

account_interests/models/res_company_interest.py

+25
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,21 @@ def _calculate_debts(self, from_date, to_date, groupby=None):
244244

245245
return deuda
246246

247+
def _search_last_journal_for_partner(self, partner, debt):
248+
journal = self.env['account.move'].with_context(
249+
internal_type='debit_note',
250+
default_move_type='out_invoice'
251+
).new({
252+
'partner_id': partner.id,
253+
'move_type': 'out_invoice',
254+
'company_id':self.company_id.id
255+
}).journal_id
256+
257+
if self.receivable_account_ids != journal.default_account_id:
258+
journal = self.env['account.journal'].search([('default_account_id','in',self.receivable_account_ids.ids)], limit=1) or journal
259+
260+
return journal
261+
247262
def create_invoices(self, from_date, to_date):
248263
"""
249264
Crea facturas de intereses a cada partner basadas en los cálculos de deuda.
@@ -261,6 +276,7 @@ def create_invoices(self, from_date, to_date):
261276
# Calcular deudas e intereses
262277
deuda = self._calculate_debts(from_date, to_date)
263278

279+
<<<<<<< HEAD
264280
journal = self.env["account.journal"].search(
265281
[("type", "=", "sale"), ("company_id", "=", self.company_id.id)], limit=1
266282
)
@@ -278,11 +294,20 @@ def create_invoices(self, from_date, to_date):
278294
if self.domain:
279295
move_line_domain += safe_eval(self.domain)
280296

297+
||||||| parent of 6b679d21 (temp)
298+
journal = self.env['account.journal'].search([
299+
('type', '=', 'sale'),
300+
('company_id', '=', self.company_id.id)], limit=1)
301+
302+
=======
303+
>>>>>>> 6b679d21 (temp)
281304
total_items = len(deuda)
282305
_logger.info("%s interest invoices will be generated", total_items)
283306

284307
# Crear facturas
285308
for idx, partner in enumerate(deuda):
309+
journal = self._search_last_journal_for_partner(partner,deuda[partner])
310+
286311
move_vals = self._prepare_interest_invoice(partner, deuda[partner], to_date, journal)
287312
if not move_vals:
288313
continue

0 commit comments

Comments
 (0)