diff --git a/taxes_az/taxes_az/report/agricultural_goods_stock_report/agricultural_goods_stock_report.py b/taxes_az/taxes_az/report/agricultural_goods_stock_report/agricultural_goods_stock_report.py index a7baa27..4c622bd 100644 --- a/taxes_az/taxes_az/report/agricultural_goods_stock_report/agricultural_goods_stock_report.py +++ b/taxes_az/taxes_az/report/agricultural_goods_stock_report/agricultural_goods_stock_report.py @@ -61,6 +61,21 @@ def get_columns(filters=None): "fieldname": "closing_balance", "fieldtype": "Currency", "width": 200 + }, + { + # Cari hesabat dövründə satılmış mallara görə ticarət əlavəsi + "label": _("Trade markup on goods sold"), + "fieldname": "trade_markup", + "fieldtype": "Currency", + "width": 220 + }, + { + # Cari hesabat dövründə satılmış mallara görə ticarət əlavəsinin + # ƏDV məbləği = ticarət əlavəsi * 18% + "label": _("VAT on trade markup"), + "fieldname": "trade_markup_vat", + "fieldtype": "Currency", + "width": 200 } ] @@ -241,8 +256,17 @@ def get_data(filters=None): else: sold_purchase_price = _fifo_sold_purchase_price(purchases, sales, from_date, to_date) - # Closing balance keeps the simplified formula (sale price for sold). - closing_balance = opening_balance + purchased - sold + # Closing balance at purchase price = opening + purchased - cost of goods + # sold (COGS, valued per the company's stock valuation method). + closing_balance = opening_balance + purchased - sold_purchase_price + + # Cari hesabat dövründə satılmış mallara görə ticarət əlavəsi: + # sold (sale price) - (opening + purchased - closing) + # The parenthesised term is the COGS, so this is sale value minus cost. + trade_markup = sold - (opening_balance + purchased - closing_balance) + + # ƏDV on the trade markup (18%). + trade_markup_vat = trade_markup * 0.18 if from_date and to_date: period = f"{from_date} — {to_date}" @@ -257,7 +281,9 @@ def get_data(filters=None): "purchased": purchased, "sold": sold, "sold_purchase_price": sold_purchase_price, - "closing_balance": closing_balance + "closing_balance": closing_balance, + "trade_markup": trade_markup, + "trade_markup_vat": trade_markup_vat }]