main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Showing only changes of commit 744e147a1a - Show all commits

View File

@@ -448,7 +448,7 @@ class Fee(ModelSQL,ModelView):
move_line.amount_second_currency = amount_converted move_line.amount_second_currency = amount_converted
move_line_.debit = Decimal(0) move_line_.debit = Decimal(0)
move_line_.credit = amount move_line_.credit = amount
move_line_.account = self.product.account_stock_in_used if in_out == 'in' else self.product.account_stock_out_used move_line_.account = self.product.account_stock_in_used if in_out == 'in' else self.product.account_cogs_used
if hasattr(move_line_, 'second_currency') and move_line_.second_currency: if hasattr(move_line_, 'second_currency') and move_line_.second_currency:
move_line_.amount_second_currency = -amount_converted move_line_.amount_second_currency = -amount_converted
else: else:
@@ -459,7 +459,7 @@ class Fee(ModelSQL,ModelView):
move_line.amount_second_currency = -amount_converted move_line.amount_second_currency = -amount_converted
move_line_.debit = amount move_line_.debit = amount
move_line_.credit = Decimal(0) move_line_.credit = Decimal(0)
move_line_.account = self.product.account_stock_in_used if in_out == 'in' else self.product.account_stock_out_used move_line_.account = self.product.account_stock_in_used if in_out == 'in' else self.product.account_cogs_used
if hasattr(move_line_, 'second_currency') and move_line_.second_currency: if hasattr(move_line_, 'second_currency') and move_line_.second_currency:
move_line_.amount_second_currency = amount_converted move_line_.amount_second_currency = amount_converted