Skip to content

Commit

Permalink
Merge pull request #7 from Lucky-Tsuma/develop
Browse files Browse the repository at this point in the history 
feat: rewrite reports to use qb
  • Loading branch information
@Lucky-Tsuma
Lucky-Tsuma authored Jan 13, 2024
2 parents a832127 + ad26cbb commit 7a307b4
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 73 deletions.
0 ...llers/delete_linked_cost_distributions.py → ...llers/cancel_linked_cost_distributions.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion navari_kayes/hooks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

doc_events = {
"Journal Entry": {
"on_cancel": "navari_kayes.controllers.delete_linked_cost_distributions.custom_on_cancel"
"on_cancel": "navari_kayes.controllers.cancel_linked_cost_distributions.custom_on_cancel"
}
}

Expand Down
96 changes: 57 additions & 39 deletions navari_kayes/navari_kayes/report/navari_expense_summary/navari_expense_summary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import frappe
from frappe import _
from pypika import Criterion, Case

def execute(filters=None):
if filters.from_date > filters.to_date:
Expand Down Expand Up @@ -59,13 +60,13 @@ def get_data(filters):
first_account_no = frappe.db.get_value('Account', root_account, 'account_number');
last_account_no = frappe.db.get_value('Account', to_account, 'account_number') if to_account else None;

def is_group(account):
return frappe.db.get_value('Account', account, 'is_group');
def is_group(account_name):
return frappe.db.get_value('Account', account_name, 'is_group');

def get_pending_accounts(accounts_list):
for account in accounts_list:
def get_list_of_account_names(list_of_fetched_account_names_starting_from_root):
for account in list_of_fetched_account_names_starting_from_root:
if is_group(account):
insert_index = accounts_list.index(account) + 1;
insert_index = list_of_fetched_account_names_starting_from_root.index(account) + 1;
child_accounts = None;
if last_account_no:
child_accounts = frappe.db.get_all('Account',
Expand All @@ -78,48 +79,65 @@ def get_pending_accounts(accounts_list):
filters = { 'root_type': 'Expense', 'parent_account': account, 'account_number': ['>=', first_account_no] },
pluck = 'name'
);
accounts_list[ insert_index:insert_index ] = child_accounts;
list_of_fetched_account_names_starting_from_root[ insert_index:insert_index ] = child_accounts;

return accounts_list;
return list_of_fetched_account_names_starting_from_root;

pending_accounts = get_pending_accounts([root_account]);
list_of_account_names = get_list_of_account_names([root_account]);

conditions = " AND gle.docstatus = 1 ";
def append_accounts(account_name, indent, from_date, to_date):
gl_entry = frappe.qb.DocType("GL Entry");
account = frappe.qb.DocType("Account");

if company:
conditions += f" AND gle.company = '{company}'";
if cost_center:
conditions += f" AND gle.cost_center = '{cost_center}'";
def get_conditions():
conditions = [gl_entry.docstatus == 1];

def append_accounts(account, indent, conditions, from_date, to_date, from_account, to_account):
conditions += f" AND gle.account LIKE '%{account}'"
if is_group(account):
parent = None if indent == 0 else frappe.db.get_value('Account', account, 'parent_account');
if company:
conditions.append(gl_entry.company == company);
if cost_center:
conditions.append(gl_entry.cost_center == cost_center);

return conditions;

conditions = get_conditions();
conditions.append(gl_entry.account.like(f'{account_name}%'))
conditions.append(gl_entry.posting_date[from_date:to_date])

if is_group(account_name):
parent = None if indent == 0 else frappe.db.get_value('Account', account_name, 'parent_account');

data.append({ 'account': account, 'indent': indent, 'parent': parent, 'debit': 0, 'credit': 0, 'balance': 0 });
data.append({ 'account': account_name, 'indent': indent, 'parent': parent, 'debit': 0, 'credit': 0, 'balance': 0 });
else:
gl_entry = frappe.db.sql(f"""
SELECT IFNULL(gle.account, '{account}') as "account",
SUM(gle.credit_in_account_currency) as "credit",
SUM(gle.debit_in_account_currency) as "debit",
SUM(gle.debit_in_account_currency - gle.credit_in_account_currency) as "balance",
gle.cost_center as "cost_center",
ac.parent_account as "parent"
FROM `tabGL Entry` as gle
INNER JOIN `tabAccount` as ac
ON gle.account = ac.name
WHERE (gle.posting_date BETWEEN '{from_date}' AND '{to_date}') {conditions}
""", as_dict = True);

if gl_entry:
gl_entry = gl_entry[0];
gl_entry['indent'] = indent;
sum_credit_in_account_currency = frappe.qb.functions("SUM", gl_entry.credit_in_account_currency).as_("credit")
sum_debit_in_account_currency = frappe.qb.functions("SUM", gl_entry.debit_in_account_currency).as_("debit")
sum_balance = frappe.qb.functions("SUM", gl_entry.debit_in_account_currency - gl_entry.credit_in_account_currency).as_("balance")

query = frappe.qb.from_(gl_entry)\
.inner_join(account)\
.on(gl_entry.account == account.name)\
.select(
Case()
.when(gl_entry.account.isnull(), account_name)
.else_(gl_entry.account)
.as_("account"),
sum_credit_in_account_currency,
sum_debit_in_account_currency,
sum_balance,
gl_entry.cost_center.as_("cost_center"),
account.parent_account.as_("parent")
).where(Criterion.all(conditions))

gl_entry_record = query.run(as_dict=True);

if gl_entry_record:
gl_entry_record = gl_entry_record[0];
gl_entry_record['indent'] = indent;

data.append(gl_entry);
data.append(gl_entry_record);

# fill credit, debit and balance for all parent accounts on the tree.
if indent > 0:
child_row = gl_entry;
child_row = gl_entry_record;
parent_account = child_row['parent'];

while parent_account:
Expand All @@ -133,14 +151,14 @@ def append_accounts(account, indent, conditions, from_date, to_date, from_accoun

parent_account = totals_row['parent'];

for account in pending_accounts:
parent_account = frappe.db.get_value('Account', account, 'parent_account');
for account_name in list_of_account_names:
parent_account = frappe.db.get_value('Account', account_name, 'parent_account');

parent_row = list(filter(lambda x: x['account'] == parent_account, data));

indent = (parent_row[0]['indent']) + 1 if parent_row else 0;

append_accounts(account, indent, conditions, from_date, to_date, from_account, to_account);
append_accounts(account_name, indent, from_date, to_date);

if not show_zero_values:
data = list(filter(lambda x: x['balance'], data));
Expand Down
69 changes: 36 additions & 33 deletions navari_kayes/navari_kayes/report/navari_shipments_follow_up/navari_shipments_follow_up.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import frappe
from frappe import _
from pypika import Criterion

def execute(filters=None):
if filters.from_date > filters.to_date:
Expand Down Expand Up @@ -92,44 +93,46 @@ def get_columns():
];

def get_data(filters):
company = filters.get('company');
from_date = filters.get('from_date');
to_date = filters.get('to_date');
purchase_order = filters.get('purchase_order');
supplier = filters.get('supplier');
customer = filters.get('customer');
cost_center = filters.get('cost_center');

conditions = " AND 1 = 1 ";
purchase_order = frappe.qb.DocType("Purchase Order");
purchase_order_item = frappe.qb.DocType("Purchase Order Item");
sales_order = frappe.qb.DocType("Sales Order");

if company:
conditions += f" AND po.company = '{company}'";
if purchase_order:
conditions += f" AND po.name = '{purchase_order}'";
if supplier:
conditions += f" AND po.supplier = '{supplier}'";
if cost_center:
conditions += f" AND poi.cost_center = '{cost_center}'";
if customer:
conditions += f" AND po.customer = '{customer}'";
conditions = [purchase_order.transaction_date[from_date:to_date]];

shipment_details = frappe.db.sql(f"""
SELECT po.name as purchase_order,
po.supplier as supplier,
po.incoterm as shipping_terms_and_method,
poi.cost_center as cost_center,
poi.description as description,
poi.schedule_date as expected_shipping_date,
poi.expected_delivery_date as expected_arrival_date,
poi.sales_order as sales_order,
poi.sales_order_item as sales_order_item,
so.customer_address as delivery_place,
so.shipping_info as shipping_info
FROM `tabPurchase Order` as po
INNER JOIN `tabPurchase Order Item` as poi ON po.name = poi.parent
LEFT JOIN `tabSales Order` as so ON poi.sales_order = so.name
WHERE (po.transaction_date BETWEEN '{from_date}' AND '{to_date}') {conditions}
""", as_dict = True);
if filters.get('company'):
conditions.append(purchase_order.company == filters.get('company'));
if filters.get('purchase_order'):
conditions.append(purchase_order.name == filters.get('purchase_order'));
if filters.get('supplier'):
conditions.append(purchase_order.supplier == filters.get('supplier'));
if filters.get('cost_center'):
conditions.append(purchase_order_item.cost_center == filters.get('cost_center'));
if filters.get('customer'):
conditions.append(purchase_order.customer == filters.get('customer'));

query = frappe.qb.from_(purchase_order)\
.inner_join(purchase_order_item)\
.on(purchase_order.name == purchase_order_item.parent)\
.left_join(sales_order)\
.on(purchase_order_item.sales_order == sales_order.name)\
.select(
purchase_order.name.as_("purchase_order"),
purchase_order.supplier.as_("supplier"),
purchase_order.incoterm.as_("shipping_terms_and_method"),
purchase_order_item.cost_center.as_("cost_center"),
purchase_order_item.description.as_("description"),
purchase_order_item.schedule_date.as_("expected_shipping_date"),
purchase_order_item.expected_delivery_date.as_("expected_arrival_date"),
purchase_order_item.sales_order.as_("sales_order"),
purchase_order_item.sales_order_item.as_("sales_order_item"),
sales_order.customer_address.as_("delivery_place"),
sales_order.shipping_info.as_("shipping_info")
).where(Criterion.all(conditions))

shipment_details = query.run(as_dict=True);

if shipment_details:
for row in shipment_details:
Expand Down

0 comments on commit 7a307b4

Please sign in to comment.