thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Oct 08: [FIX] Bug Fixed 'account_journal_discount'

pull/345/merge
Cybrosys Technologies 1 year ago
parent
f0ff8eb17a
commit
03a50e9d65
3 changed files with 55 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      account_journal_discount/__manifest__.py
  2. 6
      account_journal_discount/doc/RELEASE_NOTES.md
  3. 46
      account_journal_discount/models/account_move.py

2
account_journal_discount/__manifest__.py
View File

@ -21,7 +21,7 @@
############################################################################# #############################################################################
{ {
'name': 'Journal Discount on Invoices And Bills', 'name': 'Journal Discount on Invoices And Bills',
'version': '16.0.1.0.1', 'version': '16.0.1.0.2',
'category': 'Accounting', 'category': 'Accounting',
'summary': """Create discount journal items for discounts in invoices and 'summary': """Create discount journal items for discounts in invoices and
bills""", bills""",

6
account_journal_discount/doc/RELEASE_NOTES.md
View File

@ -11,3 +11,9 @@
#### UPDT #### UPDT
- Fixed the issue in calculation of debit and credit value of discounted journal - Fixed the issue in calculation of debit and credit value of discounted journal
#### 04.10.2024
#### Version 16.0.1.0.2
#### UPDT
- Fixed the looping issue in action_post method

46
account_journal_discount/models/account_move.py
View File

@ -33,63 +33,65 @@ class AccountMove(models.Model):
"""Redefining the function to create new journal entries whenever """Redefining the function to create new journal entries whenever
journal discounts are provided. journal discounts are provided.
""" """
if self.move_type == 'out_invoice': for move in self:
for line in self.invoice_line_ids: if move.move_type == 'out_invoice':
for line in move.invoice_line_ids:
if line.discount > 0 and \ if line.discount > 0 and \
line.product_id.categ_id.customer_account_discount_id: line.product_id.categ_id.customer_account_discount_id:
debit_credit_value = abs( debit_credit_value = abs(
float_round((line.price_subtotal - (line.quantity * line.price_unit)), float_round((line.price_subtotal - (line.quantity * line.price_unit)),
precision_digits= precision_digits=
self.currency_id.decimal_places)) move.currency_id.decimal_places))
self.env['account.move.line'].create({ move.env['account.move.line'].create({
'move_id': self.id, 'move_id': move.id,
'currency_id': self.currency_id.id, 'currency_id': move.currency_id.id,
'display_type': 'tax', 'display_type': 'tax',
'name': line.name, 'name': line.name,
'account_id': line.product_id.categ_id.customer_account_discount_id.id, 'account_id': line.product_id.categ_id.customer_account_discount_id.id,
'journal_id': self.journal_id, 'journal_id': move.journal_id.id,
'credit': 0, 'credit': 0,
'debit': debit_credit_value, 'debit': debit_credit_value,
}) })
self.env['account.move.line'].create({ move.env['account.move.line'].create({
'move_id': self.id, 'move_id': move.id,
'display_type': 'tax', 'display_type': 'tax',
'currency_id': self.currency_id.id, 'currency_id': move.currency_id.id,
'name': line.name, 'name': line.name,
'account_id': line.account_id.id, 'account_id': line.account_id.id,
'journal_id': self.journal_id, 'journal_id': move.journal_id.id,
'credit': debit_credit_value, 'credit': debit_credit_value,
'debit': 0, 'debit': 0,
}) })
elif self.move_type == 'in_invoice': elif move.move_type == 'in_invoice':
for line in self.invoice_line_ids: for line in move.invoice_line_ids:
if line.discount > 0 and \ if line.discount > 0 and \
line.product_id.categ_id.vendor_account_discount_id: line.product_id.categ_id.vendor_account_discount_id:
debit_credit_value = abs( debit_credit_value = abs(
float_round((line.price_subtotal - (line.quantity * line.price_unit)), float_round((line.price_subtotal - (line.quantity * line.price_unit)),
precision_digits= precision_digits=
self.currency_id.decimal_places)) move.currency_id.decimal_places))
self.env['account.move.line'].with_context( move.env['account.move.line'].with_context(
check_move_validity=False).create({ check_move_validity=False).create({
'move_id': self.id, 'move_id': move.id,
'display_type': 'tax', 'display_type': 'tax',
'name': line.name, 'name': line.name,
'account_id': line.product_id.categ_id.vendor_account_discount_id.id, 'account_id': line.product_id.categ_id.vendor_account_discount_id.id,
'journal_id': self.journal_id, 'journal_id': move.journal_id.id,
'currency_id': self.currency_id.id, 'currency_id': move.currency_id.id,
'credit': 0, 'credit': 0,
'debit': debit_credit_value, 'debit': debit_credit_value,
}) })
self.env['account.move.line'].with_context( move.env['account.move.line'].with_context(
check_move_validity=False).create({ check_move_validity=False).create({
'move_id': self.id, 'move_id': move.id,
'display_type': 'tax', 'display_type': 'tax',
'name': line.name, 'name': line.name,
'account_id': line.account_id.id, 'account_id': line.account_id.id,
'journal_id': self.journal_id, 'journal_id': move.journal_id.id,
'currency_id': self.currency_id.id, 'currency_id': move.currency_id.id,
'credit': debit_credit_value, 'credit': debit_credit_value,
'debit': 0, 'debit': 0,
}) })
res = super(AccountMove, self).action_post() res = super(AccountMove, self).action_post()
return res return res

Write Preview
Loading…
Cancel
Save