Skip to content

Fix accounting report (STAM-29) #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jopesy merged 1 commit into from
Jul 10, 2025
Merged

Fix accounting report (STAM-29) #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions resources/api/reservation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from resources.models.utils import (
generate_reservation_csv,
generate_reservation_xlsx,
get_ceepos_cost_center_code_value,
get_object_or_none,
)
from resources.pagination import ReservationPagination
Expand Down Expand Up @@ -437,17 +438,23 @@ def add_report_data(self, request, instance, data):
price = order.get_price()
if price:
order_line = order.order_lines.first()
unit = instance.resource.unit

ceepos_cc_code = get_ceepos_cost_center_code_value(
unit.cost_center_code,
order_line.tax_percentage if order_line else None
)

data = {
**data,
"total_price": price,
"cost_center_code": instance.resource.unit.cost_center_code,
"sap_cost_center_code": instance.resource.unit.sap_cost_center_code,
"sap_sales_organization": instance.resource.unit.sap_sales_organization,
"cost_center_code": ceepos_cc_code,
"sap_cost_center_code": unit.sap_cost_center_code,
"sap_sales_organization": unit.sap_sales_organization,
"invoice_generated_at": instance.invoice_generated_at,
"tax_percentage": order_line.tax_percentage if order_line else None,
"quantity": order_line.quantity if order_line else None,
"unit_price": order_line.unit_price if order_line else None,
"tax_percentage": getattr(order_line, "tax_percentage", None),
"quantity": getattr(order_line, "quantity", None),
"unit_price": getattr(order_line, "unit_price", None),
}
return data

Expand Down
2 changes: 0 additions & 2 deletions resources/models/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ def convert_value(reservation, name):
value = reservation.get(name) or ""
if value and name in RESERVATION_DATETIME_FIELDS:
return localtime(value).replace(tzinfo=None)
if name == "cost_center_code":
return get_ceepos_cost_center_code_value(value, reservation["tax_percentage"])
return value


Expand Down