fix: audit report quiery

core-initiative · Jul 3, 2024 · ccfd5f9 · ccfd5f9
1 parent 12a574b
commit ccfd5f9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/inn/inn_hotels/doctype/inn_room_charge_posting/inn_room_charge_posting.py b/inn/inn_hotels/doctype/inn_room_charge_posting/inn_room_charge_posting.py
@@ -399,7 +399,7 @@ def post_room_charges(parent_id, tobe_posted_list):
 		if is_channel_commision:
 			# add commission first
 			room_commision_doc = frappe.new_doc('Inn Folio Transaction')
-			room_commision_doc.flag = 'Credit'
+			room_commision_doc.flag = 'Debit'
 			room_commision_doc.is_void = 0
 			room_commision_doc.idx = get_idx(item["folio_id"])
 
@@ -478,7 +478,7 @@ def post_room_charges(parent_id, tobe_posted_list):
 			if is_channel_commision:
 				# add commission first
 				breakfast_commission = frappe.new_doc('Inn Folio Transaction')
-				breakfast_commission.flag = 'Credit'
+				breakfast_commission.flag = 'Debit'
 				breakfast_commission.is_void = 0
 				breakfast_commission.idx = get_idx(item["folio_id"])
 

diff --git a/inn/inn_hotels/report/audit_report/audit_report.py b/inn/inn_hotels/report/audit_report/audit_report.py
@@ -12,6 +12,27 @@
 BREAKFAST_REVENUE_ACCOUNT = ""
 ROOM_REVENUE_ACCOUNT = ""
 
+'''goals:
+
+i want to see all reservation that have in house status in specified date
+from all those reservation i want all transaction from that specified date on those reservation
+
+question:
+
+- apa yang menandakan bahwa reservasi sedang berstatus in house pada tanggal tsb?
+jawab:
+opt1:  
+    - cek apakah reservasi sekarang berstatus in house memiliki expected date dibawah tanggal tersebut? 
+        => tandanya pada tanggal tersebut terdapat transaksi pada reservasi tersebut
+    - untuk reservasi status Reserved, Canceled, No Show berarti belum inhouse pada tanggal tersebut
+    - untuk reservasi status finished, check apakah actual arrival dan actual 
+        departure berada diantara tanggal tersebut 
+        => tandanya pada tanggal tersebut terdapat transaksi pada reservasi
+    - untuk seluruh transaksi pada reservasi, ambil transaksi yang terjadi pada tanggal tersebut
+
+
+'''
+
 
 def execute(filters=None):
     columns = [
@@ -126,15 +147,17 @@ def get_data_detail(start_date, is_show_mode_payment):
         from `tabInn Reservation` as ir
         left join `tabInn Folio` as `if`
         on if.reservation_id = ir.name
-        where {FILTER_FIELD_DATE} = '{start_date}' and ir.{FILTER_FIELD_STATUS} != '{STATUS_RESERVED}'
+        where 
+        (ir.status = 'In House' and ir.expected_arrival = '{start_date}') or
+        (ir.status = 'Finish' and ir.expected_arrival <= '{start_date}' and ir.expected_departure > '{start_date} ')
     """
 
     reservation = frappe.db.sql(query=query, as_dict=1)
     if len(reservation) == 0:
         return []
 
     folio_name = tuple([x.folio for x in reservation])
-    folio_detail = get_folio_detail(folio_name)
+    folio_detail = get_folio_detail(folio_name, start_date)
 
     if is_show_mode_payment:
         res = [
@@ -179,7 +202,7 @@ def get_data_detail(start_date, is_show_mode_payment):
     return res
 
 
-def get_folio_detail(folio_id: list):
+def get_folio_detail(folio_id: list, start_date: str):
     # folio detail
     # need data:
     # actual room nett, breakfast revenue, mode of payment, total_amount (payment_amount?), payment_date
@@ -198,8 +221,10 @@ def get_folio_detail(folio_id: list):
         from `tabInn Folio Transaction` as ift
         where ift.parent {folio_id_query}
         and
-        ift.transaction_type in {transaction_type_list}
+        ift.transaction_type in {transaction_type_list} and
+        ift.audit_date = '{start_date} '
     """
+    print(query)
     folio_detail = frappe.db.sql(query=query, as_dict=1)
     res = {folio: {
         "actual_room_nett": 0,