CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 03:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(subscription): include days before

Browse Source 
(cherry picked from commit 9164162a9e)
This commit is contained in:
ravibharathi656
2025-09-19 16:23:26 +05:30
committed by Mergify
parent 95387b4bf0
commit f27b754570
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
erpnext/accounts/doctype/subscription/subscription.py
View File

@@ -490,11 +490,18 @@ class Subscription(Document):
if prorate is None: if prorate is None:
prorate = False prorate = False
prorate_factor = 1
if prorate: if prorate:
prorate_factor = get_prorata_factor( prorate_factor = get_prorata_factor(
self.current_invoice_end, self.current_invoice_end,
self.current_invoice_start, self.current_invoice_start,
cint(self.generate_invoice_at == "Beginning of the current subscription period"), cint(
self.generate_invoice_at
in [
"Beginning of the current subscription period",
"Days before the current subscription period",
]
),
) )
items = [] items = []
@@ -511,33 +518,19 @@ class Subscription(Document):
deferred = frappe.db.get_value("Item", item_code, deferred_field) deferred = frappe.db.get_value("Item", item_code, deferred_field)
if not prorate: item = {
item = { "item_code": item_code,
"item_code": item_code, "qty": plan.qty,
"qty": plan.qty, "rate": get_plan_rate(
"rate": get_plan_rate( plan.plan,
plan.plan, plan.qty,
plan.qty, party,
party, self.current_invoice_start,
self.current_invoice_start, self.current_invoice_end,
self.current_invoice_end, prorate_factor,
), ),
"cost_center": plan_doc.cost_center, "cost_center": plan_doc.cost_center,
} }
else:
item = {
"item_code": item_code,
"qty": plan.qty,
"rate": get_plan_rate(
plan.plan,
plan.qty,
party,
self.current_invoice_start,
self.current_invoice_end,
prorate_factor,
),
"cost_center": plan_doc.cost_center,
}
if deferred: if deferred:
item.update( item.update(