nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 18:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixing Item-wise sales register #41373

Browse Source
This commit is contained in:
Poorvi-R-Bhat
2024-05-22 12:39:22 +05:30
parent 76073ae228
commit eafa88b8e9
4 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -320,7 +320,6 @@ def get_items(filters, additional_query_columns):
frappe.qb.from_(pi)
.join(pii)
.on(pi.name == pii.parent)
# added left join
.left_join(Item)
.on(pii.item_code == Item.name)
.select(

93
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -402,46 +402,65 @@ def get_group_by_conditions(filters, doctype):
return "ORDER BY `tab{}`.{}".format(doctype, frappe.scrub(filters.get("group_by")))
def get_items(filters, additional_query_columns,additional_conditions=None):
si = frappe.qb.DocType('Sales Invoice')
sii = frappe.qb.DocType('Sales Invoice Item')
Item = frappe.qb.DocType('Item')
query = (
frappe.qb.from_(si)
.join(sii).on(si.name == sii.parent)
.left_join(Item).on(sii.item_code == Item.name)
.select(
sii.name, sii.parent,
si.posting_date, si.debit_to,
si.unrealized_profit_loss_account,
si.is_internal_customer,
si.customer, si.remarks,
si.territory, si.company, si.base_net_total,
sii.project,
sii.item_code, sii.description,
sii.item_name, sii.item_group,
sii.item_name.as_('si_item_name'), sii.item_group.as_('si_item_group'),
Item.item_name.as_('i_item_name'), Item.item_group.as_('i_item_group'),
sii.sales_order, sii.delivery_note,
sii.income_account, sii.cost_center,
sii.enable_deferred_revenue, sii.deferred_revenue_account,
sii.stock_qty, sii.stock_uom,
sii.base_net_rate, sii.base_net_amount,
si.customer_name, si.customer_group, sii.so_detail,
si.update_stock, sii.uom, sii.qty
)
.where(si.docstatus == 1)
)
if filters.get("customer"):
query = query.where(si.customer == filters['customer'])
def get_items(filters, additional_query_columns, additional_conditions=None):
si = frappe.qb.DocType("Sales Invoice")
sii = frappe.qb.DocType("Sales Invoice Item")
Item = frappe.qb.DocType("Item")
if filters.get("customer_group"):
query = query.where(si.customer_group == filters['customer_group'])
return query.run(as_dict=True)
query = (
frappe.qb.from_(si)
.join(sii)
.on(si.name == sii.parent)
# added left join
.left_join(Item)
.on(sii.item_code == Item.name)
.select(
sii.name,
sii.parent,
si.posting_date,
si.debit_to,
si.unrealized_profit_loss_account,
si.is_internal_customer,
si.customer,
si.remarks,
si.territory,
si.company,
si.base_net_total,
sii.project,
sii.item_code,
sii.description,
sii.item_name,
sii.item_group,
sii.item_name.as_("si_item_name"),
sii.item_group.as_("si_item_group"),
Item.item_name.as_("i_item_name"),
Item.item_group.as_("i_item_group"),
sii.sales_order,
sii.delivery_note,
sii.income_account,
sii.cost_center,
sii.enable_deferred_revenue,
sii.deferred_revenue_account,
sii.stock_qty,
sii.stock_uom,
sii.base_net_rate,
sii.base_net_amount,
si.customer_name,
si.customer_group,
sii.so_detail,
si.update_stock,
sii.uom,
sii.qty,
)
.where(si.docstatus == 1)
)
if filters.get("customer"):
query = query.where(si.customer == filters["customer"])
if filters.get("customer_group"):
query = query.where(si.customer_group == filters["customer_group"])
return query.run(as_dict=True)
def get_delivery_notes_against_sales_order(item_list):

6
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@@ -377,7 +377,7 @@ def get_account_columns(invoice_list, include_payments):
def get_invoices(filters, additional_query_columns):
pi = frappe.qb.DocType("Purchase Invoice")
query = (
frappe.qb.from_(pi)
frappe.qb.from_(pi) # qb
.select(
ConstantColumn("Purchase Invoice").as_("doctype"),
pi.name,
@@ -386,7 +386,7 @@ def get_invoices(filters, additional_query_columns):
pi.supplier,
pi.supplier_name,
pi.tax_id,
pi.bill_no,
pi.bill_no,
pi.bill_date,
pi.remarks,
pi.base_net_total,
@@ -395,7 +395,7 @@ def get_invoices(filters, additional_query_columns):
pi.outstanding_amount,
pi.mode_of_payment,
)
.where((pi.docstatus == 1))
.where(pi.docstatus == 1)
.orderby(pi.posting_date, pi.name, order=Order.desc)
)

4
erpnext/accounts/report/sales_register/sales_register.py
View File

@@ -415,7 +415,7 @@ def get_account_columns(invoice_list, include_payments):
def get_invoices(filters, additional_query_columns):
si = frappe.qb.DocType("Sales Invoice")
query = (
frappe.qb.from_(si)
frappe.qb.from_(si) # qb
.select(
ConstantColumn("Sales Invoice").as_("doctype"),
si.name,
@@ -437,7 +437,7 @@ def get_invoices(filters, additional_query_columns):
si.represents_company,
si.company,
)
.where((si.docstatus == 1))
.where(si.docstatus == 1)
.orderby(si.posting_date, si.name, order=Order.desc)
)