| {{ _("Sr") }} | +{{ _("Details") }} | +{{ _("Qty") }} | +{{ _("Rate") }} | +{{ _("Amount") }} | +
|---|---|---|---|---|
| {{ loop.index }} | +
+ {{ item.item_code }}: {{ item.item_name }}
+ {% if (item.description != item.item_name) %}
+ {{ item.description }} + {% endif %} + |
+ + {{ item.get_formatted("qty", 0) }} + {{ item.get_formatted("uom", 0) }} + | +{{ item.get_formatted("net_rate", doc) }} | +{{ item.get_formatted("net_amount", doc) }} | +
{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
\ No newline at end of file +{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 7e795fbe3c1..01f5a205cea 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -56,6 +56,7 @@ frappe.query_reports["Accounts Receivable"] = { fieldname: "party", label: __("Party"), fieldtype: "MultiSelectList", + options: "party_type", get_data: function (txt) { if (!frappe.query_report.filters) return; @@ -89,32 +90,10 @@ frappe.query_reports["Accounts Receivable"] = { default: "Due Date", }, { - fieldname: "range1", - label: __("Ageing Range 1"), - fieldtype: "Int", - default: "30", - reqd: 1, - }, - { - fieldname: "range2", - label: __("Ageing Range 2"), - fieldtype: "Int", - default: "60", - reqd: 1, - }, - { - fieldname: "range3", - label: __("Ageing Range 3"), - fieldtype: "Int", - default: "90", - reqd: 1, - }, - { - fieldname: "range4", - label: __("Ageing Range 4"), - fieldtype: "Int", - default: "120", - reqd: 1, + fieldname: "range", + label: __("Ageing Range"), + fieldtype: "Data", + default: "30, 60, 90, 120", }, { fieldname: "customer_group", diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index f8511d2f497..9625a86f05f 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -50,6 +50,11 @@ class ReceivablePayableReport: getdate(nowdate()) if self.filters.report_date > getdate(nowdate()) else self.filters.report_date ) + if not self.filters.range: + self.filters.range = "30, 60, 90, 120" + self.ranges = [num.strip() for num in self.filters.range.split(",") if num.strip().isdigit()] + self.range_numbers = [num for num in range(1, len(self.ranges) + 2)] + def run(self, args): self.filters.update(args) self.set_defaults() @@ -112,6 +117,25 @@ class ReceivablePayableReport: self.build_data() + def build_voucher_dict(self, ple): + return frappe._dict( + voucher_type=ple.voucher_type, + voucher_no=ple.voucher_no, + party=ple.party, + party_account=ple.account, + posting_date=ple.posting_date, + account_currency=ple.account_currency, + remarks=ple.remarks, + invoiced=0.0, + paid=0.0, + credit_note=0.0, + outstanding=0.0, + invoiced_in_account_currency=0.0, + paid_in_account_currency=0.0, + credit_note_in_account_currency=0.0, + outstanding_in_account_currency=0.0, + ) + def init_voucher_balance(self): # build all keys, since we want to exclude vouchers beyond the report date for ple in self.ple_entries: @@ -123,24 +147,11 @@ class ReceivablePayableReport: key = (ple.account, ple.voucher_type, ple.voucher_no, ple.party) if key not in self.voucher_balance: - self.voucher_balance[key] = frappe._dict( - voucher_type=ple.voucher_type, - voucher_no=ple.voucher_no, - party=ple.party, - party_account=ple.account, - posting_date=ple.posting_date, - account_currency=ple.account_currency, - remarks=ple.remarks, - invoiced=0.0, - paid=0.0, - credit_note=0.0, - outstanding=0.0, - invoiced_in_account_currency=0.0, - paid_in_account_currency=0.0, - credit_note_in_account_currency=0.0, - outstanding_in_account_currency=0.0, - cost_center=ple.cost_center, - ) + self.voucher_balance[key] = self.build_voucher_dict(ple) + + if ple.voucher_type == ple.against_voucher_type and ple.voucher_no == ple.against_voucher_no: + self.voucher_balance[key].cost_center = ple.cost_center + self.get_invoices(ple) if self.filters.get("group_by_party"): @@ -208,6 +219,18 @@ class ReceivablePayableReport: row = self.voucher_balance.get(key) + # Build and use a separate row for Employee Advances. + # This allows Payments or Journals made against Emp Advance to be processed. + if ( + not row + and ple.against_voucher_type == "Employee Advance" + and self.filters.handle_employee_advances + ): + _d = self.build_voucher_dict(ple) + _d.voucher_type = ple.against_voucher_type + _d.voucher_no = ple.against_voucher_no + row = self.voucher_balance[key] = _d + if not row: # no invoice, this is an invoice / stand-alone payment / credit note if self.filters.get("ignore_accounts"): @@ -254,9 +277,6 @@ class ReceivablePayableReport: row.paid -= amount row.paid_in_account_currency -= amount_in_account_currency - if not row.cost_center and ple.cost_center: - row.cost_center = str(ple.cost_center) - def update_sub_total_row(self, row, party): total_row = self.total_row_map.get(party) @@ -289,8 +309,8 @@ class ReceivablePayableReport: must_consider = False if self.filters.get("for_revaluation_journals"): - if (abs(row.outstanding) >= 0.0 / 10**self.currency_precision) or ( - abs(row.outstanding_in_account_currency) >= 0.0 / 10**self.currency_precision + if (abs(row.outstanding) >= 1.0 / 10**self.currency_precision) or ( + abs(row.outstanding_in_account_currency) >= 1.0 / 10**self.currency_precision ): must_consider = True else: @@ -364,6 +384,7 @@ class ReceivablePayableReport: self.delivery_notes = frappe._dict() # delivery note link inside sales invoice + # nosemgrep si_against_dn = frappe.db.sql( """ select parent, delivery_note @@ -379,6 +400,7 @@ class ReceivablePayableReport: if d.delivery_note: self.delivery_notes.setdefault(d.parent, set()).add(d.delivery_note) + # nosemgrep dn_against_si = frappe.db.sql( """ select distinct parent, against_sales_invoice @@ -396,13 +418,16 @@ class ReceivablePayableReport: def get_invoice_details(self): self.invoice_details = frappe._dict() if self.account_type == "Receivable": + # nosemgrep si_list = frappe.db.sql( """ select name, due_date, po_no from `tabSales Invoice` where posting_date <= %s + and company = %s + and docstatus = 1 """, - self.filters.report_date, + (self.filters.report_date, self.filters.company), as_dict=1, ) for d in si_list: @@ -410,6 +435,7 @@ class ReceivablePayableReport: # Get Sales Team if self.filters.show_sales_person: + # nosemgrep sales_team = frappe.db.sql( """ select parent, sales_person @@ -424,25 +450,33 @@ class ReceivablePayableReport: ) if self.account_type == "Payable": + # nosemgrep for pi in frappe.db.sql( """ select name, due_date, bill_no, bill_date from `tabPurchase Invoice` - where posting_date <= %s + where + posting_date <= %s + and company = %s + and docstatus = 1 """, - self.filters.report_date, + (self.filters.report_date, self.filters.company), as_dict=1, ): self.invoice_details.setdefault(pi.name, pi) # Invoices booked via Journal Entries + # nosemgrep journal_entries = frappe.db.sql( """ select name, due_date, bill_no, bill_date from `tabJournal Entry` - where posting_date <= %s + where + posting_date <= %s + and company = %s + and docstatus = 1 """, - self.filters.report_date, + (self.filters.report_date, self.filters.company), as_dict=1, ) @@ -451,6 +485,8 @@ class ReceivablePayableReport: self.invoice_details.setdefault(je.name, je) def set_party_details(self, row): + if not row.party: + return # customer / supplier name party_details = self.get_party_details(row.party) or {} row.update(party_details) @@ -475,16 +511,18 @@ class ReceivablePayableReport: def get_payment_terms(self, row): # build payment_terms for row + # nosemgrep payment_terms_details = frappe.db.sql( f""" select si.name, si.party_account_currency, si.currency, si.conversion_rate, si.total_advance, ps.due_date, ps.payment_term, ps.payment_amount, ps.base_payment_amount, - ps.description, ps.paid_amount, ps.discounted_amount + ps.description, ps.paid_amount, ps.base_paid_amount, ps.discounted_amount from `tab{row.voucher_type}` si, `tabPayment Schedule` ps where - si.name = ps.parent and - si.name = %s + si.name = ps.parent and ps.parenttype = '{row.voucher_type}' and + si.name = %s and + si.is_return = 0 order by ps.paid_amount desc, due_date """, row.voucher_no, @@ -502,22 +540,24 @@ class ReceivablePayableReport: # Deduct that from paid amount pre allocation row.paid -= flt(payment_terms_details[0].total_advance) + company_currency = frappe.get_value("Company", self.filters.get("company"), "default_currency") + # If single payment terms, no need to split the row if len(payment_terms_details) == 1 and payment_terms_details[0].payment_term: - self.append_payment_term(row, payment_terms_details[0], original_row) + self.append_payment_term(row, payment_terms_details[0], original_row, company_currency) return for d in payment_terms_details: term = frappe._dict(original_row) - self.append_payment_term(row, d, term) + self.append_payment_term(row, d, term, company_currency) - def append_payment_term(self, row, d, term): - if ( - self.filters.get("customer") or self.filters.get("supplier") - ) and d.currency == d.party_account_currency: + def append_payment_term(self, row, d, term, company_currency): + invoiced = d.base_payment_amount + paid_amount = d.base_paid_amount + + if company_currency == d.party_account_currency or self.filters.get("in_party_currency"): invoiced = d.payment_amount - else: - invoiced = d.base_payment_amount + paid_amount = d.paid_amount row.payment_terms.append( term.update( @@ -526,15 +566,15 @@ class ReceivablePayableReport: "invoiced": invoiced, "invoice_grand_total": row.invoiced, "payment_term": d.description or d.payment_term, - "paid": d.paid_amount + d.discounted_amount, + "paid": paid_amount + d.discounted_amount, "credit_note": 0.0, - "outstanding": invoiced - d.paid_amount - d.discounted_amount, + "outstanding": invoiced - paid_amount - d.discounted_amount, } ) ) - if d.paid_amount: - row["paid"] -= d.paid_amount + d.discounted_amount + if paid_amount: + row["paid"] -= paid_amount + d.discounted_amount def allocate_closing_to_term(self, row, term, key): if row[key]: @@ -687,16 +727,19 @@ class ReceivablePayableReport: def get_return_entries(self): doctype = "Sales Invoice" if self.account_type == "Receivable" else "Purchase Invoice" filters = { + "posting_date": ("<=", self.filters.report_date), "is_return": 1, "docstatus": 1, "company": self.filters.company, "update_outstanding_for_self": 0, } + or_filters = {} - for party_type in self.party_type: + if party_type := self.filters.party_type: party_field = scrub(party_type) - if self.filters.get(party_field): - or_filters.update({party_field: self.filters.get(party_field)}) + if parties := self.filters.get("party"): + or_filters.update({party_field: ["in", parties]}) + self.return_entries = frappe._dict( frappe.get_all( doctype, filters=filters, or_filters=or_filters, fields=["name", "return_against"], as_list=1 @@ -717,37 +760,22 @@ class ReceivablePayableReport: # ageing buckets should not have amounts if due date is not reached if getdate(entry_date) > getdate(self.filters.report_date): - row.range1 = row.range2 = row.range3 = row.range4 = row.range5 = 0.0 + [setattr(row, f"range{i}", 0.0) for i in self.range_numbers] - row.total_due = row.range1 + row.range2 + row.range3 + row.range4 + row.range5 + row.total_due = sum(row[f"range{i}"] for i in self.range_numbers) def get_ageing_data(self, entry_date, row): # [0-30, 30-60, 60-90, 90-120, 120-above] - row.range1 = row.range2 = row.range3 = row.range4 = row.range5 = 0.0 + [setattr(row, f"range{i}", 0.0) for i in self.range_numbers] if not (self.age_as_on and entry_date): return row.age = (getdate(self.age_as_on) - getdate(entry_date)).days or 0 - index = None - if not (self.filters.range1 and self.filters.range2 and self.filters.range3 and self.filters.range4): - self.filters.range1, self.filters.range2, self.filters.range3, self.filters.range4 = ( - 30, - 60, - 90, - 120, - ) - - for i, days in enumerate( - [self.filters.range1, self.filters.range2, self.filters.range3, self.filters.range4] - ): - if cint(row.age) <= cint(days): - index = i - break - - if index is None: - index = 4 + index = next( + (i for i, days in enumerate(self.ranges) if cint(row.age) <= cint(days)), len(self.ranges) + ) row["range" + str(index + 1)] = row.outstanding def get_ple_entries(self): @@ -809,6 +837,7 @@ class ReceivablePayableReport: if self.filters.get("sales_person"): lft, rgt = frappe.db.get_value("Sales Person", self.filters.get("sales_person"), ["lft", "rgt"]) + # nosemgrep records = frappe.db.sql( """ select distinct parent, parenttype @@ -987,22 +1016,29 @@ class ReceivablePayableReport: def get_columns(self): self.columns = [] - self.add_column("Posting Date", fieldtype="Date") + self.add_column(_("Posting Date"), fieldname="posting_date", fieldtype="Date") self.add_column( - label="Party Type", + label=_("Party Type"), fieldname="party_type", fieldtype="Data", width=100, ) self.add_column( - label="Party", + label=_("Party"), fieldname="party", fieldtype="Dynamic Link", options="party_type", width=180, ) + if self.account_type == "Receivable": + label = _("Receivable Account") + elif self.account_type == "Payable": + label = _("Payable Account") + else: + label = _("Party Account") + self.add_column( - label=self.account_type + " Account", + label=label, fieldname="party_account", fieldtype="Link", options="Account", @@ -1011,10 +1047,10 @@ class ReceivablePayableReport: if self.party_naming_by == "Naming Series": if self.account_type == "Payable": - label = "Supplier Name" + label = _("Supplier Name") fieldname = "supplier_name" else: - label = "Customer Name" + label = _("Customer Name") fieldname = "customer_name" self.add_column( label=label, @@ -1040,7 +1076,7 @@ class ReceivablePayableReport: width=180, ) - self.add_column(label="Due Date", fieldtype="Date") + self.add_column(label=_("Due Date"), fieldname="due_date", fieldtype="Date") if self.account_type == "Payable": self.add_column(label=_("Bill No"), fieldname="bill_no", fieldtype="Data") @@ -1059,6 +1095,7 @@ class ReceivablePayableReport: self.add_column(_("Debit Note"), fieldname="credit_note") self.add_column(_("Outstanding Amount"), fieldname="outstanding") + self.add_column(label=_("Age (Days)"), fieldname="age", fieldtype="Int", width=80) self.setup_ageing_columns() self.add_column( @@ -1117,34 +1154,26 @@ class ReceivablePayableReport: def setup_ageing_columns(self): # for charts self.ageing_column_labels = [] - self.add_column(label=_("Age (Days)"), fieldname="age", fieldtype="Int", width=80) + ranges = [*self.ranges, "Above"] + + prev_range_value = 0 + for idx, curr_range_value in enumerate(ranges): + label = f"{prev_range_value}-{curr_range_value}" + self.add_column(label=label, fieldname="range" + str(idx + 1)) - for i, label in enumerate( - [ - "0-{range1}".format(range1=self.filters["range1"]), - "{range1}-{range2}".format( - range1=cint(self.filters["range1"]) + 1, range2=self.filters["range2"] - ), - "{range2}-{range3}".format( - range2=cint(self.filters["range2"]) + 1, range3=self.filters["range3"] - ), - "{range3}-{range4}".format( - range3=cint(self.filters["range3"]) + 1, range4=self.filters["range4"] - ), - _("{range4}-Above").format(range4=cint(self.filters["range4"]) + 1), - ] - ): - self.add_column(label=label, fieldname="range" + str(i + 1)) self.ageing_column_labels.append(label) + if curr_range_value.isdigit(): + prev_range_value = cint(curr_range_value) + 1 + def get_chart_data(self): + precision = cint(frappe.db.get_default("float_precision")) or 2 rows = [] for row in self.data: row = frappe._dict(row) if not cint(row.bold): - values = [row.range1, row.range2, row.range3, row.range4, row.range5] - precision = cint(frappe.db.get_default("float_precision")) or 2 - rows.append({"values": [flt(val, precision) for val in values]}) + values = [flt(row.get(f"range{i}", None), precision) for i in self.range_numbers] + rows.append({"values": values}) self.chart = { "data": {"labels": self.ageing_column_labels, "datasets": rows}, diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py index c4baa4e4842..44fee120d8b 100644 --- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py @@ -21,7 +21,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): def tearDown(self): frappe.db.rollback() - def create_sales_invoice(self, no_payment_schedule=False, do_not_submit=False): + def create_sales_invoice(self, no_payment_schedule=False, do_not_submit=False, **args): frappe.set_user("Administrator") si = create_sales_invoice( item=self.item, @@ -34,6 +34,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): rate=100, price_list_rate=100, do_not_save=1, + **args, ) if not no_payment_schedule: si.append( @@ -83,10 +84,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "party": [self.customer], "report_date": add_days(today(), 2), "based_on_payment_terms": 0, - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "show_remarks": False, } @@ -111,15 +109,12 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): self.assertEqual(expected_data[0], [row.invoiced, row.paid, row.credit_note]) pos_inv.cancel() - def test_accounts_receivable(self): + def test_accounts_receivable_with_payment(self): filters = { "company": self.company, "based_on_payment_terms": 1, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "show_remarks": True, } @@ -151,11 +146,15 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): cr_note = self.create_credit_note(si.name, do_not_submit=True) cr_note.update_outstanding_for_self = False cr_note.save().submit() + + # as the invoice partially paid and returning the full amount so the outstanding amount should be True + self.assertEqual(cr_note.update_outstanding_for_self, True) + report = execute(filters) - expected_data_after_credit_note = [100, 0, 0, 40, -40, self.debit_to] + expected_data_after_credit_note = [0, 0, 100, 0, -100, self.debit_to] - row = report[1][0] + row = report[1][-1] self.assertEqual( expected_data_after_credit_note, [ @@ -168,14 +167,104 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): ], ) + def test_accounts_receivable_without_payment(self): + filters = { + "company": self.company, + "based_on_payment_terms": 1, + "report_date": today(), + "range": "30, 60, 90, 120", + "show_remarks": True, + } + + # check invoice grand total and invoiced column's value for 3 payment terms + si = self.create_sales_invoice() + + report = execute(filters) + + expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]] + + for i in range(3): + row = report[1][i - 1] + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + + # check invoice grand total, invoiced, paid and outstanding column's value after credit note + cr_note = self.create_credit_note(si.name, do_not_submit=True) + cr_note.update_outstanding_for_self = False + cr_note.save().submit() + + self.assertEqual(cr_note.update_outstanding_for_self, False) + + report = execute(filters) + + row = report[1] + self.assertTrue(len(row) == 0) + + def test_accounts_receivable_with_partial_payment(self): + filters = { + "company": self.company, + "based_on_payment_terms": 1, + "report_date": today(), + "range": "30, 60, 90, 120", + "show_remarks": True, + } + + # check invoice grand total and invoiced column's value for 3 payment terms + si = self.create_sales_invoice(qty=2) + + report = execute(filters) + + expected_data = [[200, 60, "No Remarks"], [200, 100, "No Remarks"], [200, 40, "No Remarks"]] + + for i in range(3): + row = report[1][i - 1] + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + + # check invoice grand total, invoiced, paid and outstanding column's value after payment + self.create_payment_entry(si.name) + report = execute(filters) + + expected_data_after_payment = [[200, 60, 40, 20], [200, 100, 0, 100], [200, 40, 0, 40]] + + for i in range(3): + row = report[1][i - 1] + self.assertEqual( + expected_data_after_payment[i - 1], + [row.invoice_grand_total, row.invoiced, row.paid, row.outstanding], + ) + + # check invoice grand total, invoiced, paid and outstanding column's value after credit note + cr_note = self.create_credit_note(si.name, do_not_submit=True) + cr_note.update_outstanding_for_self = False + cr_note.save().submit() + + self.assertFalse(cr_note.update_outstanding_for_self) + + report = execute(filters) + + expected_data_after_credit_note = [ + [200, 100, 0, 80, 20, self.debit_to], + [200, 40, 0, 0, 40, self.debit_to], + ] + + for i in range(2): + row = report[1][i - 1] + self.assertEqual( + expected_data_after_credit_note[i - 1], + [ + row.invoice_grand_total, + row.invoiced, + row.paid, + row.credit_note, + row.outstanding, + row.party_account, + ], + ) + def test_cr_note_flag_to_update_self(self): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "show_remarks": True, } @@ -266,10 +355,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "company": self.company, "based_on_payment_terms": 0, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } report = execute(filters) @@ -328,10 +414,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } report = execute(filters) @@ -397,10 +480,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } report = execute(filters) self.assertEqual(report[1], []) @@ -416,10 +496,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "group_by_party": True, } report = execute(filters)[1] @@ -493,10 +570,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "show_future_payments": True, } report = execute(filters)[1] @@ -555,10 +629,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "sales_person": sales_person.name, "show_sales_person": True, } @@ -575,10 +646,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "cost_center": self.cost_center, } report = execute(filters)[1] @@ -593,10 +661,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "customer_group": cus_group, } report = execute(filters)[1] @@ -618,10 +683,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "customer_group": cus_groups_list, # Use the list of customer groups } report = execute(filters)[1] @@ -660,10 +722,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "party_account": self.debit_to, } report = execute(filters)[1] @@ -711,10 +770,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "party_type": "Customer", "party": [self.customer], "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "in_party_currency": 1, } @@ -754,10 +810,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "party_type": "Customer", "party": [self.customer1, self.customer3], "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } si1 = self.create_sales_invoice(no_payment_schedule=True, do_not_submit=True) @@ -837,10 +890,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } report_ouput = execute(filters)[1] @@ -903,10 +953,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", "show_future_payments": True, "in_party_currency": False, } @@ -965,10 +1012,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } # check invoice grand total and invoiced column's value for 3 payment terms @@ -991,10 +1035,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): filters = { "company": self.company, "report_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } # check invoice grand total and invoiced column's value for 3 payment terms diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js index 964abc23747..17ee5e0b323 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js @@ -24,32 +24,10 @@ frappe.query_reports["Accounts Receivable Summary"] = { default: "Due Date", }, { - fieldname: "range1", - label: __("Ageing Range 1"), - fieldtype: "Int", - default: "30", - reqd: 1, - }, - { - fieldname: "range2", - label: __("Ageing Range 2"), - fieldtype: "Int", - default: "60", - reqd: 1, - }, - { - fieldname: "range3", - label: __("Ageing Range 3"), - fieldtype: "Int", - default: "90", - reqd: 1, - }, - { - fieldname: "range4", - label: __("Ageing Range 4"), - fieldtype: "Int", - default: "120", - reqd: 1, + fieldname: "range", + label: __("Ageing Range"), + fieldtype: "Data", + default: "30, 60, 90, 120", }, { fieldname: "finance_book", @@ -88,6 +66,7 @@ frappe.query_reports["Accounts Receivable Summary"] = { fieldname: "party", label: __("Party"), fieldtype: "MultiSelectList", + options: "party_type", get_data: function (txt) { if (!frappe.query_report.filters) return; diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py index 6a1b1057724..87fc7ea68be 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py @@ -104,25 +104,23 @@ class AccountsReceivableSummary(ReceivablePayableReport): self.set_party_details(d) def init_party_total(self, row): + default_dict = { + "invoiced": 0.0, + "paid": 0.0, + "credit_note": 0.0, + "outstanding": 0.0, + "total_due": 0.0, + "future_amount": 0.0, + "sales_person": [], + "party_type": row.party_type, + } + for i in self.range_numbers: + range_key = f"range{i}" + default_dict[range_key] = 0.0 + self.party_total.setdefault( row.party, - frappe._dict( - { - "invoiced": 0.0, - "paid": 0.0, - "credit_note": 0.0, - "outstanding": 0.0, - "range1": 0.0, - "range2": 0.0, - "range3": 0.0, - "range4": 0.0, - "range5": 0.0, - "total_due": 0.0, - "future_amount": 0.0, - "sales_person": [], - "party_type": row.party_type, - } - ), + frappe._dict(default_dict), ) def set_party_details(self, row): @@ -173,6 +171,7 @@ class AccountsReceivableSummary(ReceivablePayableReport): self.add_column(_("Difference"), fieldname="diff") self.setup_ageing_columns() + self.add_column(label="Total Amount Due", fieldname="total_due") if self.filters.show_future_payments: self.add_column(label=_("Future Payment Amount"), fieldname="future_amount") @@ -206,27 +205,6 @@ class AccountsReceivableSummary(ReceivablePayableReport): label=_("Currency"), fieldname="currency", fieldtype="Link", options="Currency", width=80 ) - def setup_ageing_columns(self): - for i, label in enumerate( - [ - "0-{range1}".format(range1=self.filters["range1"]), - "{range1}-{range2}".format( - range1=cint(self.filters["range1"]) + 1, range2=self.filters["range2"] - ), - "{range2}-{range3}".format( - range2=cint(self.filters["range2"]) + 1, range3=self.filters["range3"] - ), - "{range3}-{range4}".format( - range3=cint(self.filters["range3"]) + 1, range4=self.filters["range4"] - ), - "{range4}-{above}".format(range4=cint(self.filters["range4"]) + 1, above=_("Above")), - ] - ): - self.add_column(label=label, fieldname="range" + str(i + 1)) - - # Add column for total due amount - self.add_column(label="Total Amount Due", fieldname="total_due") - def get_gl_balance(report_date, company): return frappe._dict( diff --git a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py index 4ef607bab28..a98cc6af7a3 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py @@ -27,10 +27,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "company": self.company, "customer": self.customer, "posting_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } si = create_sales_invoice( @@ -121,10 +118,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase): "company": self.company, "customer": self.customer, "posting_date": today(), - "range1": 30, - "range2": 60, - "range3": 90, - "range4": 120, + "range": "30, 60, 90, 120", } si = create_sales_invoice( diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py index e1545bdcd87..a21103c719d 100644 --- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py @@ -89,7 +89,9 @@ def get_data(filters): & (DepreciationSchedule.schedule_date == d.posting_date) ) ).run(as_dict=True) - asset_data.accumulated_depreciation_amount = query[0]["accumulated_depreciation_amount"] + asset_data.accumulated_depreciation_amount = ( + query[0]["accumulated_depreciation_amount"] if query else 0 + ) else: asset_data.accumulated_depreciation_amount += d.debit diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py index 34cced2ca17..cdeddf3d38b 100644 --- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py @@ -28,14 +28,14 @@ def get_group_by_asset_category_data(filters): for asset_category in asset_categories: row = frappe._dict() - # row.asset_category = asset_category row.update(asset_category) - row.cost_as_on_to_date = ( - flt(row.cost_as_on_from_date) - + flt(row.cost_of_new_purchase) - - flt(row.cost_of_sold_asset) - - flt(row.cost_of_scrapped_asset) + row.value_as_on_to_date = ( + flt(row.value_as_on_from_date) + + flt(row.value_of_new_purchase) + - flt(row.value_of_sold_asset) + - flt(row.value_of_scrapped_asset) + - flt(row.value_of_capitalized_asset) ) row.update( @@ -50,13 +50,14 @@ def get_group_by_asset_category_data(filters): flt(row.accumulated_depreciation_as_on_from_date) + flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated_during_the_period) + - flt(row.depreciation_eliminated_via_reversal) ) - row.net_asset_value_as_on_from_date = flt(row.cost_as_on_from_date) - flt( + row.net_asset_value_as_on_from_date = flt(row.value_as_on_from_date) - flt( row.accumulated_depreciation_as_on_from_date ) - row.net_asset_value_as_on_to_date = flt(row.cost_as_on_to_date) - flt( + row.net_asset_value_as_on_to_date = flt(row.value_as_on_to_date) - flt( row.accumulated_depreciation_as_on_to_date ) @@ -68,7 +69,7 @@ def get_group_by_asset_category_data(filters): def get_asset_categories_for_grouped_by_category(filters): condition = "" if filters.get("asset_category"): - condition += " and asset_category = %(asset_category)s" + condition += " and a.asset_category = %(asset_category)s" if filters.get("finance_book"): condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)" @@ -84,12 +85,12 @@ def get_asset_categories_for_grouped_by_category(filters): end else 0 - end), 0) as cost_as_on_from_date, + end), 0) as value_as_on_from_date, ifnull(sum(case when a.purchase_date >= %(from_date)s then a.gross_purchase_amount else 0 - end), 0) as cost_of_new_purchase, + end), 0) as value_of_new_purchase, ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then @@ -100,7 +101,7 @@ def get_asset_categories_for_grouped_by_category(filters): end else 0 - end), 0) as cost_of_sold_asset, + end), 0) as value_of_sold_asset, ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then @@ -111,10 +112,26 @@ def get_asset_categories_for_grouped_by_category(filters): end else 0 - end), 0) as cost_of_scrapped_asset + end), 0) as value_of_scrapped_asset, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 + and a.disposal_date >= %(from_date)s + and a.disposal_date <= %(to_date)s then + case when a.status = "Capitalized" then + a.gross_purchase_amount + else + 0 + end + else + 0 + end), 0) as value_of_capitalized_asset from `tabAsset` a - where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition} - and not exists(select name from `tabAsset Capitalization Asset Item` where asset = a.name) + where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition} + and not exists( + select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name + where acai.asset = a.name + and ac.posting_date < %(from_date)s + and ac.docstatus=1 + ) group by a.asset_category """, { @@ -128,63 +145,85 @@ def get_asset_categories_for_grouped_by_category(filters): ) -def get_asset_details_for_grouped_by_category(filters): +def get_assets_for_grouped_by_category(filters): condition = "" - if filters.get("asset"): - condition += " and name = %(asset)s" + if filters.get("asset_category"): + condition = f" and a.asset_category = '{filters.get('asset_category')}'" + finance_book_filter = "" if filters.get("finance_book"): - condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = `tabAsset`.name and ads.finance_book = %(finance_book)s)" + finance_book_filter += " and ifnull(gle.finance_book, '')=%(finance_book)s" + condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)" # nosemgrep return frappe.db.sql( f""" - SELECT name, - ifnull(sum(case when purchase_date < %(from_date)s then - case when ifnull(disposal_date, 0) = 0 or disposal_date >= %(from_date)s then - gross_purchase_amount - else + SELECT results.asset_category, + sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date, + sum(results.depreciation_eliminated_via_reversal) as depreciation_eliminated_via_reversal, + sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period, + sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period + from (SELECT a.asset_category, + ifnull(sum(case when gle.posting_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then + gle.debit + else + 0 + end), 0) as accumulated_depreciation_as_on_from_date, + ifnull(sum(case when gle.posting_date <= %(to_date)s and ifnull(a.disposal_date, 0) = 0 then + gle.credit + else + 0 + end), 0) as depreciation_eliminated_via_reversal, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s + and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then + gle.debit + else + 0 + end), 0) as depreciation_eliminated_during_the_period, + ifnull(sum(case when gle.posting_date >= %(from_date)s and gle.posting_date <= %(to_date)s + and (ifnull(a.disposal_date, 0) = 0 or gle.posting_date <= a.disposal_date) then + gle.debit + else + 0 + end), 0) as depreciation_amount_during_the_period + from `tabGL Entry` gle + join `tabAsset` a on + gle.against_voucher = a.name + join `tabAsset Category Account` aca on + aca.parent = a.asset_category and aca.company_name = %(company)s + join `tabCompany` company on + company.name = %(company)s + where + a.docstatus=1 + and a.company=%(company)s + and a.purchase_date <= %(to_date)s + and gle.is_cancelled = 0 + and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account) + {condition} {finance_book_filter} + group by a.asset_category + union + SELECT a.asset_category, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date < %(from_date)s then 0 - end - else - 0 - end), 0) as cost_as_on_from_date, - ifnull(sum(case when purchase_date >= %(from_date)s then - gross_purchase_amount - else - 0 - end), 0) as cost_of_new_purchase, - ifnull(sum(case when ifnull(disposal_date, 0) != 0 - and disposal_date >= %(from_date)s - and disposal_date <= %(to_date)s then - case when status = "Sold" then - gross_purchase_amount else - 0 - end - else - 0 - end), 0) as cost_of_sold_asset, - ifnull(sum(case when ifnull(disposal_date, 0) != 0 - and disposal_date >= %(from_date)s - and disposal_date <= %(to_date)s then - case when status = "Scrapped" then - gross_purchase_amount - else - 0 - end - else - 0 - end), 0) as cost_of_scrapped_asset - from `tabAsset` - where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition} - group by name - """, + a.opening_accumulated_depreciation + end), 0) as accumulated_depreciation_as_on_from_date, + 0 as depreciation_eliminated_via_reversal, + ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then + a.opening_accumulated_depreciation + else + 0 + end), 0) as depreciation_eliminated_during_the_period, + 0 as depreciation_amount_during_the_period + from `tabAsset` a + where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition} + group by a.asset_category) as results + group by results.asset_category + """, { "to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company, - "asset": filters.get("asset"), - "finance_book": filters.get("finance_book"), + "finance_book": filters.get("finance_book", ""), }, as_dict=1, ) @@ -198,14 +237,14 @@ def get_group_by_asset_data(filters): for asset_detail in asset_details: row = frappe._dict() - # row.asset_category = asset_category row.update(asset_detail) - row.cost_as_on_to_date = ( - flt(row.cost_as_on_from_date) - + flt(row.cost_of_new_purchase) - - flt(row.cost_of_sold_asset) - - flt(row.cost_of_scrapped_asset) + row.value_as_on_to_date = ( + flt(row.value_as_on_from_date) + + flt(row.value_of_new_purchase) + - flt(row.value_of_sold_asset) + - flt(row.value_of_scrapped_asset) + - flt(row.value_of_capitalized_asset) ) row.update(next(asset for asset in assets if asset["asset"] == asset_detail.get("name", ""))) @@ -214,13 +253,14 @@ def get_group_by_asset_data(filters): flt(row.accumulated_depreciation_as_on_from_date) + flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated_during_the_period) + - flt(row.depreciation_eliminated_via_reversal) ) - row.net_asset_value_as_on_from_date = flt(row.cost_as_on_from_date) - flt( + row.net_asset_value_as_on_from_date = flt(row.value_as_on_from_date) - flt( row.accumulated_depreciation_as_on_from_date ) - row.net_asset_value_as_on_to_date = flt(row.cost_as_on_to_date) - flt( + row.net_asset_value_as_on_to_date = flt(row.value_as_on_to_date) - flt( row.accumulated_depreciation_as_on_to_date ) @@ -229,62 +269,81 @@ def get_group_by_asset_data(filters): return data -def get_assets_for_grouped_by_category(filters): +def get_asset_details_for_grouped_by_category(filters): condition = "" - if filters.get("asset_category"): - condition = " and a.asset_category = '{}'".format(filters.get("asset_category")) + if filters.get("asset"): + condition += " and a.name = %(asset)s" + if filters.get("finance_book"): + condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)" + + # nosemgrep return frappe.db.sql( - """ - SELECT results.asset_category, - sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date, - sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period, - sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period - from (SELECT a.asset_category, - ifnull(sum(case when gle.posting_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then - gle.debit - else - 0 - end), 0) as accumulated_depreciation_as_on_from_date, - ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s - and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then - gle.debit - else - 0 - end), 0) as depreciation_eliminated_during_the_period, - ifnull(sum(case when gle.posting_date >= %(from_date)s and gle.posting_date <= %(to_date)s - and (ifnull(a.disposal_date, 0) = 0 or gle.posting_date <= a.disposal_date) then - gle.debit - else - 0 - end), 0) as depreciation_amount_during_the_period - from `tabGL Entry` gle - join `tabAsset` a on - gle.against_voucher = a.name - join `tabAsset Category Account` aca on - aca.parent = a.asset_category and aca.company_name = %(company)s - join `tabCompany` company on - company.name = %(company)s - where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account) {0} - group by a.asset_category - union - SELECT a.asset_category, - ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) then - 0 + f""" + SELECT a.name, + ifnull(sum(case when a.purchase_date < %(from_date)s then + case when ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s then + a.gross_purchase_amount else - a.opening_accumulated_depreciation - end), 0) as accumulated_depreciation_as_on_from_date, - ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then - a.opening_accumulated_depreciation - else - 0 - end), 0) as depreciation_eliminated_during_the_period, - 0 as depreciation_amount_during_the_period - from `tabAsset` a - where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {0} - group by a.asset_category) as results - group by results.asset_category - """.format(condition), - {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, + 0 + end + else + 0 + end), 0) as value_as_on_from_date, + ifnull(sum(case when a.purchase_date >= %(from_date)s then + a.gross_purchase_amount + else + 0 + end), 0) as value_of_new_purchase, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 + and a.disposal_date >= %(from_date)s + and a.disposal_date <= %(to_date)s then + case when a.status = "Sold" then + a.gross_purchase_amount + else + 0 + end + else + 0 + end), 0) as value_of_sold_asset, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 + and a.disposal_date >= %(from_date)s + and a.disposal_date <= %(to_date)s then + case when a.status = "Scrapped" then + a.gross_purchase_amount + else + 0 + end + else + 0 + end), 0) as value_of_scrapped_asset, + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 + and a.disposal_date >= %(from_date)s + and a.disposal_date <= %(to_date)s then + case when a.status = "Capitalized" then + a.gross_purchase_amount + else + 0 + end + else + 0 + end), 0) as value_of_capitalized_asset + from `tabAsset` a + where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition} + and not exists( + select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name + where acai.asset = a.name + and ac.posting_date < %(from_date)s + and ac.docstatus=1 + ) + group by a.name + """, + { + "to_date": filters.to_date, + "from_date": filters.from_date, + "company": filters.company, + "asset": filters.get("asset"), + "finance_book": filters.get("finance_book"), + }, as_dict=1, ) @@ -292,11 +351,18 @@ def get_assets_for_grouped_by_category(filters): def get_assets_for_grouped_by_asset(filters): condition = "" if filters.get("asset"): - condition = " and a.name = '{}'".format(filters.get("asset")) + condition = f" and a.name = '{filters.get('asset')}'" + finance_book_filter = "" + if filters.get("finance_book"): + finance_book_filter += " and ifnull(gle.finance_book, '')=%(finance_book)s" + condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)" + + # nosemgrep return frappe.db.sql( - """ + f""" SELECT results.name as asset, sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date, + sum(results.depreciation_eliminated_via_reversal) as depreciation_eliminated_via_reversal, sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period, sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period from (SELECT a.name as name, @@ -305,6 +371,11 @@ def get_assets_for_grouped_by_asset(filters): else 0 end), 0) as accumulated_depreciation_as_on_from_date, + ifnull(sum(case when gle.posting_date <= %(to_date)s and ifnull(a.disposal_date, 0) = 0 then + gle.credit + else + 0 + end), 0) as depreciation_eliminated_via_reversal, ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then gle.debit @@ -324,15 +395,22 @@ def get_assets_for_grouped_by_asset(filters): aca.parent = a.asset_category and aca.company_name = %(company)s join `tabCompany` company on company.name = %(company)s - where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account) {0} + where + a.docstatus=1 + and a.company=%(company)s + and a.purchase_date <= %(to_date)s + and gle.is_cancelled = 0 + and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account) + {finance_book_filter} {condition} group by a.name union SELECT a.name as name, - ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) then + ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date < %(from_date)s then 0 else a.opening_accumulated_depreciation end), 0) as accumulated_depreciation_as_on_from_date, + 0 as depreciation_as_on_from_date_credit, ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then a.opening_accumulated_depreciation else @@ -340,11 +418,16 @@ def get_assets_for_grouped_by_asset(filters): end), 0) as depreciation_eliminated_during_the_period, 0 as depreciation_amount_during_the_period from `tabAsset` a - where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {0} + where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition} group by a.name) as results group by results.name - """.format(condition), - {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, + """, + { + "to_date": filters.to_date, + "from_date": filters.from_date, + "company": filters.company, + "finance_book": filters.get("finance_book", ""), + }, as_dict=1, ) @@ -375,32 +458,38 @@ def get_columns(filters): columns += [ { - "label": _("Cost as on") + " " + formatdate(filters.day_before_from_date), - "fieldname": "cost_as_on_from_date", + "label": _("Value as on") + " " + formatdate(filters.day_before_from_date), + "fieldname": "value_as_on_from_date", "fieldtype": "Currency", "width": 140, }, { - "label": _("Cost of New Purchase"), - "fieldname": "cost_of_new_purchase", + "label": _("Value of New Purchase"), + "fieldname": "value_of_new_purchase", "fieldtype": "Currency", "width": 140, }, { - "label": _("Cost of Sold Asset"), - "fieldname": "cost_of_sold_asset", + "label": _("Value of Sold Asset"), + "fieldname": "value_of_sold_asset", "fieldtype": "Currency", "width": 140, }, { - "label": _("Cost of Scrapped Asset"), - "fieldname": "cost_of_scrapped_asset", + "label": _("Value of Scrapped Asset"), + "fieldname": "value_of_scrapped_asset", "fieldtype": "Currency", "width": 140, }, { - "label": _("Cost as on") + " " + formatdate(filters.to_date), - "fieldname": "cost_as_on_to_date", + "label": _("Value of New Capitalized Asset"), + "fieldname": "value_of_capitalized_asset", + "fieldtype": "Currency", + "width": 140, + }, + { + "label": _("Value as on") + " " + formatdate(filters.to_date), + "fieldname": "value_as_on_to_date", "fieldtype": "Currency", "width": 140, }, @@ -428,6 +517,12 @@ def get_columns(filters): "fieldtype": "Currency", "width": 270, }, + { + "label": _("Depreciation eliminated via reversal"), + "fieldname": "depreciation_eliminated_via_reversal", + "fieldtype": "Currency", + "width": 270, + }, { "label": _("Net Asset value as on") + " " + formatdate(filters.day_before_from_date), "fieldname": "net_asset_value_as_on_from_date", diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py index e89a177a867..fc19c40f8f9 100644 --- a/erpnext/accounts/report/balance_sheet/balance_sheet.py +++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py @@ -7,6 +7,7 @@ from frappe import _ from frappe.utils import cint, flt from erpnext.accounts.report.financial_statements import ( + compute_growth_view_data, get_columns, get_data, get_filtered_list_for_consolidated_report, @@ -95,12 +96,15 @@ def execute(filters=None): filters.periodicity, period_list, filters.accumulated_values, company=filters.company ) - chart = get_chart_data(filters, columns, asset, liability, equity) + chart = get_chart_data(filters, columns, asset, liability, equity, currency) report_summary, primitive_summary = get_report_summary( period_list, asset, liability, equity, provisional_profit_loss, currency, filters ) + if filters.get("selected_view") == "Growth": + compute_growth_view_data(data, period_list) + return columns, data, message, chart, report_summary, primitive_summary @@ -122,13 +126,13 @@ def get_provisional_profit_loss( for period in period_list: key = period if consolidated else period.key - total_assets = flt(asset[0].get(key)) + total_assets = flt(asset[-2].get(key)) effective_liability = 0.00 - if liability: - effective_liability += flt(liability[0].get(key)) - if equity: - effective_liability += flt(equity[0].get(key)) + if liability and liability[-1] == {}: + effective_liability += flt(liability[-2].get(key)) + if equity and equity[-1] == {}: + effective_liability += flt(equity[-2].get(key)) provisional_profit_loss[key] = total_assets - effective_liability total_row[key] = provisional_profit_loss[key] + effective_liability @@ -195,9 +199,9 @@ def get_report_summary( key = period if consolidated else period.key if asset: net_asset += asset[-2].get(key) - if liability: + if liability and liability[-1] == {}: net_liability += liability[-2].get(key) - if equity: + if equity and equity[-1] == {}: net_equity += equity[-2].get(key) if provisional_profit_loss: net_provisional_profit_loss += provisional_profit_loss.get(key) @@ -221,7 +225,7 @@ def get_report_summary( ], (net_asset - net_liability + net_equity) -def get_chart_data(filters, columns, asset, liability, equity): +def get_chart_data(filters, columns, asset, liability, equity, currency): labels = [d.get("label") for d in columns[2:]] asset_data, liability_data, equity_data = [], [], [] @@ -249,4 +253,8 @@ def get_chart_data(filters, columns, asset, liability, equity): else: chart["type"] = "line" + chart["fieldtype"] = "Currency" + chart["options"] = "currency" + chart["currency"] = currency + return chart diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html index eaabc90205f..6957ab41681 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html @@ -1,6 +1,3 @@ -Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js index 9335a8cd65a..2684c87a22a 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js @@ -47,7 +47,7 @@ frappe.query_reports["Bank Reconciliation Statement"] = { }, ], formatter: function (value, row, column, data, default_formatter, filter) { - if (column.fieldname == "payment_entry" && value == "Cheques and Deposits incorrectly cleared") { + if (column.fieldname == "payment_entry" && value == __("Cheques and Deposits incorrectly cleared")) { column.link_onclick = "frappe.query_reports['Bank Reconciliation Statement'].open_utility_report()"; } diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py index c7dba16492e..bfc2f2d56ff 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py @@ -142,7 +142,8 @@ def get_journal_entries(filters): where jvd.parent = jv.name and jv.docstatus=1 and jvd.account = %(account)s and jv.posting_date <= %(report_date)s and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s - and ifnull(jv.is_opening, 'No') = 'No'""", + and ifnull(jv.is_opening, 'No') = 'No' + and jv.company = %(company)s """, filters, as_dict=1, ) @@ -163,6 +164,7 @@ def get_payment_entries(filters): (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1 and posting_date <= %(report_date)s and ifnull(clearance_date, '4000-01-01') > %(report_date)s + and company = %(company)s """, filters, as_dict=1, @@ -181,6 +183,7 @@ def get_pos_entries(filters): sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name and account.name = sip.account and si.posting_date <= %(report_date)s and ifnull(sip.clearance_date, '4000-01-01') > %(report_date)s + and si.company = %(company)s order by si.posting_date ASC, si.name DESC """, diff --git a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py index f6efc8a685c..dc6192e7544 100644 --- a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py +++ b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py @@ -27,6 +27,7 @@ def get_report_filters(report_filters): ["Purchase Invoice", "docstatus", "=", 1], ["Purchase Invoice", "per_received", "<", 100], ["Purchase Invoice", "update_stock", "=", 0], + ["Purchase Invoice", "is_opening", "!=", "Yes"], ] if report_filters.get("purchase_invoice"): diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js index 83bd48c71f3..c74450191aa 100644 --- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js @@ -91,6 +91,7 @@ function get_filters() { fieldname: "budget_against_filter", label: __("Dimension Filter"), fieldtype: "MultiSelectList", + options: "budget_against", get_data: function (txt) { if (!frappe.query_report.filters) return; diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py index e540aa9993c..db42d23a839 100644 --- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py @@ -263,6 +263,7 @@ def get_actual_details(name, filters): and ba.account=gl.account and b.{budget_against} = gl.{budget_against} and gl.fiscal_year between %s and %s + and gl.is_cancelled = 0 and b.{budget_against} = %s and exists( select diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js index c824f0d9f38..bc76ee0a114 100644 --- a/erpnext/accounts/report/cash_flow/cash_flow.js +++ b/erpnext/accounts/report/cash_flow/cash_flow.js @@ -1,7 +1,10 @@ // Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.query_reports["Cash Flow"] = $.extend({}, erpnext.financial_statements); +frappe.query_reports["Cash Flow"] = $.extend(erpnext.financial_statements, { + name_field: "section", + parent_field: "parent_section", +}); erpnext.utils.add_dimensions("Cash Flow", 10); diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py index c034f95ec00..562ac5efb81 100644 --- a/erpnext/accounts/report/cash_flow/cash_flow.py +++ b/erpnext/accounts/report/cash_flow/cash_flow.py @@ -30,7 +30,7 @@ def execute(filters=None): company=filters.company, ) - cash_flow_accounts = get_cash_flow_accounts() + cash_flow_sections = get_cash_flow_accounts() # compute net profit / loss income = get_data( @@ -60,14 +60,14 @@ def execute(filters=None): summary_data = {} company_currency = frappe.get_cached_value("Company", filters.company, "default_currency") - for cash_flow_account in cash_flow_accounts: + for cash_flow_section in cash_flow_sections: section_data = [] data.append( { - "account_name": cash_flow_account["section_header"], - "parent_account": None, + "section_name": "'" + cash_flow_section["section_header"] + "'", + "parent_section": None, "indent": 0.0, - "account": cash_flow_account["section_header"], + "section": cash_flow_section["section_header"], } ) @@ -75,31 +75,40 @@ def execute(filters=None): # add first net income in operations section if net_profit_loss: net_profit_loss.update( - {"indent": 1, "parent_account": cash_flow_accounts[0]["section_header"]} + {"indent": 1, "parent_section": cash_flow_sections[0]["section_header"]} ) data.append(net_profit_loss) section_data.append(net_profit_loss) - for account in cash_flow_account["account_types"]: - account_data = get_account_type_based_data( - filters.company, account["account_type"], period_list, filters.accumulated_values, filters + for row in cash_flow_section["account_types"]: + row_data = get_account_type_based_data( + filters.company, row["account_type"], period_list, filters.accumulated_values, filters ) - account_data.update( + accounts = frappe.get_all( + "Account", + filters={ + "account_type": row["account_type"], + "is_group": 0, + }, + pluck="name", + ) + row_data.update( { - "account_name": account["label"], - "account": account["label"], + "section_name": row["label"], + "section": row["label"], "indent": 1, - "parent_account": cash_flow_account["section_header"], + "accounts": accounts, + "parent_section": cash_flow_section["section_header"], "currency": company_currency, } ) - data.append(account_data) - section_data.append(account_data) + data.append(row_data) + section_data.append(row_data) add_total_row_account( data, section_data, - cash_flow_account["section_footer"], + cash_flow_section["section_footer"], period_list, company_currency, summary_data, @@ -109,9 +118,9 @@ def execute(filters=None): add_total_row_account( data, data, _("Net Change in Cash"), period_list, company_currency, summary_data, filters ) - columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company) + columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company, True) - chart = get_chart_data(columns, data) + chart = get_chart_data(columns, data, company_currency) report_summary = get_report_summary(summary_data, company_currency) @@ -217,8 +226,8 @@ def get_start_date(period, accumulated_values, company): def add_total_row_account(out, data, label, period_list, currency, summary_data, filters, consolidated=False): total_row = { - "account_name": "'" + _("{0}").format(label) + "'", - "account": "'" + _("{0}").format(label) + "'", + "section_name": "'" + _("{0}").format(label) + "'", + "section": "'" + _("{0}").format(label) + "'", "currency": currency, } @@ -229,7 +238,7 @@ def add_total_row_account(out, data, label, period_list, currency, summary_data, period_list = get_filtered_list_for_consolidated_report(filters, period_list) for row in data: - if row.get("parent_account"): + if row.get("parent_section"): for period in period_list: key = period if consolidated else period["key"] total_row.setdefault(key, 0.0) @@ -252,20 +261,23 @@ def get_report_summary(summary_data, currency): return report_summary -def get_chart_data(columns, data): +def get_chart_data(columns, data, currency): labels = [d.get("label") for d in columns[2:]] + print(data) datasets = [ { - "name": account.get("account").replace("'", ""), - "values": [account.get(d.get("fieldname")) for d in columns[2:]], + "name": section.get("section").replace("'", ""), + "values": [section.get(d.get("fieldname")) for d in columns[2:]], } - for account in data - if account.get("parent_account") is None and account.get("currency") + for section in data + if section.get("parent_section") is None and section.get("currency") ] datasets = datasets[:-1] chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"} chart["fieldtype"] = "Currency" + chart["options"] = "currency" + chart["currency"] = currency return chart diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py index 2931b728a42..04625fc76fc 100644 --- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py @@ -115,7 +115,7 @@ def get_balance_sheet_data(fiscal_year, companies, columns, filters): True, ) - chart = get_chart_data(filters, columns, asset, liability, equity) + chart = get_chart_data(filters, columns, asset, liability, equity, company_currency) return data, message, chart, report_summary @@ -173,7 +173,7 @@ def get_profit_loss_data(fiscal_year, companies, columns, filters): if net_profit_loss: data.append(net_profit_loss) - chart = get_pl_chart_data(filters, columns, income, expense, net_profit_loss) + chart = get_pl_chart_data(filters, columns, income, expense, net_profit_loss, company_currency) report_summary, primitive_summary = get_pl_summary( companies, "", income, expense, net_profit_loss, company_currency, filters, True @@ -350,7 +350,7 @@ def get_data(companies, root_type, balance_must_be, fiscal_year, filters=None, i gl_entries_by_account, accounts_by_name, accounts, - ignore_closing_entries=False, + ignore_closing_entries=ignore_closing_entries, root_type=root_type, ) @@ -469,10 +469,13 @@ def update_parent_account_names(accounts): for d in accounts: if d.account_number: - account_name = d.account_number + " - " + d.account_name + account_key = d.account_number + " - " + d.account_name else: - account_name = d.account_name - name_to_account_map[d.name] = account_name + account_key = d.account_name + + d.account_key = account_key + + name_to_account_map[d.name] = account_key for account in accounts: if account.parent_account: @@ -505,33 +508,26 @@ def get_subsidiary_companies(company): def get_accounts(root_type, companies): accounts = [] - added_accounts = [] for company in companies: - for account in frappe.get_all( - "Account", - fields=[ - "name", - "is_group", - "company", - "parent_account", - "lft", - "rgt", - "root_type", - "report_type", - "account_name", - "account_number", - ], - filters={"company": company, "root_type": root_type}, - ): - if account.account_number: - account_key = account.account_number + "-" + account.account_name - else: - account_key = account.account_name - - if account_key not in added_accounts: - accounts.append(account) - added_accounts.append(account_key) + accounts.extend( + frappe.get_all( + "Account", + fields=[ + "name", + "is_group", + "company", + "parent_account", + "lft", + "rgt", + "root_type", + "report_type", + "account_name", + "account_number", + ], + filters={"company": company, "root_type": root_type}, + ) + ) return accounts @@ -770,15 +766,17 @@ def add_total_row(out, root_type, balance_must_be, companies, company_currency): def filter_accounts(accounts, depth=10): parent_children_map = {} accounts_by_name = {} - for d in accounts: - if d.account_number: - account_name = d.account_number + " - " + d.account_name - else: - account_name = d.account_name - d["company_wise_opening_bal"] = defaultdict(float) - accounts_by_name[account_name] = d + added_accounts = [] - parent_children_map.setdefault(d.parent_account or None, []).append(d) + for d in accounts: + if d.account_key in added_accounts: + continue + + added_accounts.append(d.account_key) + d["company_wise_opening_bal"] = defaultdict(float) + accounts_by_name[d.account_key] = d + + parent_children_map.setdefault(d.parent_account_name or None, []).append(d) filtered_accounts = [] @@ -790,7 +788,7 @@ def filter_accounts(accounts, depth=10): for child in children: child.indent = level filtered_accounts.append(child) - add_to_list(child.name, level + 1) + add_to_list(child.account_key, level + 1) add_to_list(None, 0) diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js index 3600db852f8..c28815df62e 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js @@ -9,6 +9,7 @@ frappe.query_reports["Customer Ledger Summary"] = { fieldtype: "Link", options: "Company", default: frappe.defaults.get_user_default("Company"), + reqd: 1, }, { fieldname: "from_date", diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 784575c080e..ad05d770314 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -4,7 +4,19 @@ import frappe from frappe import _, qb, scrub +from frappe.query_builder import Criterion, Tuple +from frappe.query_builder.functions import IfNull from frappe.utils import getdate, nowdate +from frappe.utils.nestedset import get_descendants_of + +from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, + get_dimension_with_children, +) + +TREE_DOCTYPES = frozenset( + ["Customer Group", "Terrirtory", "Supplier Group", "Sales Partner", "Sales Person", "Cost Center"] +) class PartyLedgerSummaryReport: @@ -13,59 +25,110 @@ class PartyLedgerSummaryReport: self.filters.from_date = getdate(self.filters.from_date or nowdate()) self.filters.to_date = getdate(self.filters.to_date or nowdate()) - if not self.filters.get("company"): - self.filters["company"] = frappe.db.get_single_value("Global Defaults", "default_company") - def run(self, args): - if self.filters.from_date > self.filters.to_date: - frappe.throw(_("From Date must be before To Date")) - self.filters.party_type = args.get("party_type") - self.party_naming_by = frappe.db.get_value(args.get("naming_by")[0], None, args.get("naming_by")[1]) + + self.validate_filters() + self.get_party_details() + + if not self.parties: + return [], [] self.get_gl_entries() - self.get_additional_columns() self.get_return_invoices() self.get_party_adjustment_amounts() + self.party_naming_by = frappe.db.get_single_value(args.get("naming_by")[0], args.get("naming_by")[1]) columns = self.get_columns() data = self.get_data() + return columns, data - def get_additional_columns(self): + def validate_filters(self): + if not self.filters.get("company"): + frappe.throw(_("{0} is mandatory").format(_("Company"))) + + if self.filters.from_date > self.filters.to_date: + frappe.throw(_("From Date must be before To Date")) + + self.update_hierarchical_filters() + + def update_hierarchical_filters(self): + for doctype in TREE_DOCTYPES: + key = scrub(doctype) + if self.filters.get(key): + self.filters[key] = get_children(doctype, self.filters[key]) + + def get_party_details(self): """ Additional Columns for 'User Permission' based access control """ + self.parties = [] + self.party_details = frappe._dict() + party_type = self.filters.party_type - if self.filters.party_type == "Customer": - self.territories = frappe._dict({}) - self.customer_group = frappe._dict({}) + doctype = qb.DocType(party_type) + conditions = self.get_party_conditions(doctype) + query = ( + qb.from_(doctype) + .select(doctype.name.as_("party"), f"{scrub(party_type)}_name") + .where(Criterion.all(conditions)) + ) - customer = qb.DocType("Customer") - result = ( - frappe.qb.from_(customer) - .select( - customer.name, customer.territory, customer.customer_group, customer.default_sales_partner - ) - .where(customer.disabled == 0) - .run(as_dict=True) + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions(party_type) + + if match_conditions: + query += "and" + match_conditions + + party_details = frappe.db.sql(query, params, as_dict=True) + + for row in party_details: + self.parties.append(row.party) + self.party_details[row.party] = row + + def get_party_conditions(self, doctype): + conditions = [] + group_field = "customer_group" if self.filters.party_type == "Customer" else "supplier_group" + + if self.filters.party: + conditions.append(doctype.name == self.filters.party) + + if self.filters.territory: + conditions.append(doctype.territory.isin(self.filters.territory)) + + if self.filters.get(group_field): + conditions.append(doctype.get(group_field).isin(self.filters.get(group_field))) + + if self.filters.payment_terms_template: + conditions.append(doctype.payment_terms == self.filters.payment_terms_template) + + if self.filters.sales_partner: + conditions.append(doctype.default_sales_partner.isin(self.filters.sales_partner)) + + if self.filters.sales_person: + sales_team = qb.DocType("Sales Team") + sales_invoice = qb.DocType("Sales Invoice") + + customers = ( + qb.from_(sales_team) + .select(sales_team.parent) + .where(sales_team.sales_person.isin(self.filters.sales_person)) + .where(sales_team.parenttype == "Customer") + ) + ( + qb.from_(sales_team) + .join(sales_invoice) + .on(sales_team.parent == sales_invoice.name) + .select(sales_invoice.customer) + .where(sales_team.sales_person.isin(self.filters.sales_person)) + .where(sales_team.parenttype == "Sales Invoice") ) - for x in result: - self.territories[x.name] = x.territory - self.customer_group[x.name] = x.customer_group - else: - self.supplier_group = frappe._dict({}) - supplier = qb.DocType("Supplier") - result = ( - frappe.qb.from_(supplier) - .select(supplier.name, supplier.supplier_group) - .where(supplier.disabled == 0) - .run(as_dict=True) - ) + conditions.append(doctype.name.isin(customers)) - for x in result: - self.supplier_group[x.name] = x.supplier_group + return conditions def get_columns(self): columns = [ @@ -188,12 +251,13 @@ class PartyLedgerSummaryReport: self.party_data = frappe._dict({}) for gle in self.gl_entries: + party_details = self.party_details.get(gle.party) self.party_data.setdefault( gle.party, frappe._dict( { - "party": gle.party, - "party_name": gle.party_name, + **party_details, + "party_name": gle.party, "opening_balance": 0, "invoiced_amount": 0, "paid_amount": 0, @@ -204,12 +268,6 @@ class PartyLedgerSummaryReport: ), ) - if self.filters.party_type == "Customer": - self.party_data[gle.party].update({"territory": self.territories.get(gle.party)}) - self.party_data[gle.party].update({"customer_group": self.customer_group.get(gle.party)}) - else: - self.party_data[gle.party].update({"supplier_group": self.supplier_group.get(gle.party)}) - amount = gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) self.party_data[gle.party].closing_balance += amount @@ -246,164 +304,120 @@ class PartyLedgerSummaryReport: return out def get_gl_entries(self): - conditions = self.prepare_conditions() - join = join_field = "" - if self.filters.party_type == "Customer": - join_field = ", p.customer_name as party_name" - join = "left join `tabCustomer` p on gle.party = p.name" - elif self.filters.party_type == "Supplier": - join_field = ", p.supplier_name as party_name" - join = "left join `tabSupplier` p on gle.party = p.name" - - self.gl_entries = frappe.db.sql( - f""" - select - gle.posting_date, gle.party, gle.voucher_type, gle.voucher_no, gle.against_voucher_type, - gle.against_voucher, gle.debit, gle.credit, gle.is_opening {join_field} - from `tabGL Entry` gle - {join} - where - gle.docstatus < 2 and gle.is_cancelled = 0 and gle.party_type=%(party_type)s and ifnull(gle.party, '') != '' - and gle.posting_date <= %(to_date)s {conditions} - order by gle.posting_date - """, - self.filters, - as_dict=True, + gle = qb.DocType("GL Entry") + query = ( + qb.from_(gle) + .select( + gle.posting_date, + gle.party, + gle.voucher_type, + gle.voucher_no, + gle.debit, + gle.credit, + gle.is_opening, + ) + .where( + (gle.docstatus < 2) + & (gle.is_cancelled == 0) + & (gle.party_type == self.filters.party_type) + & (IfNull(gle.party, "") != "") + & (gle.posting_date <= self.filters.to_date) + & (gle.party.isin(self.parties)) + ) ) - def prepare_conditions(self): - conditions = [""] + query = self.prepare_conditions(query) + self.gl_entries = query.run(as_dict=True) + + def prepare_conditions(self, query): + gle = qb.DocType("GL Entry") if self.filters.company: - conditions.append("gle.company=%(company)s") + query = query.where(gle.company == self.filters.company) if self.filters.finance_book: - conditions.append("ifnull(finance_book,'') in (%(finance_book)s, '')") + query = query.where(IfNull(gle.finance_book, "") == self.filters.finance_book) - if self.filters.get("party"): - conditions.append("party=%(party)s") + if self.filters.cost_center: + query = query.where((gle.cost_center).isin(self.filters.cost_center)) - if self.filters.party_type == "Customer": - if self.filters.get("customer_group"): - lft, rgt = frappe.get_cached_value( - "Customer Group", self.filters["customer_group"], ["lft", "rgt"] - ) + if self.filters.project: + query = query.where((gle.project).isin(self.filters.project)) - conditions.append( - f"""party in (select name from tabCustomer - where exists(select name from `tabCustomer Group` where lft >= {lft} and rgt <= {rgt} - and name=tabCustomer.customer_group))""" - ) + accounting_dimensions = get_accounting_dimensions(as_list=False) - if self.filters.get("territory"): - lft, rgt = frappe.db.get_value("Territory", self.filters.get("territory"), ["lft", "rgt"]) + if accounting_dimensions: + for dimension in accounting_dimensions: + if self.filters.get(dimension.fieldname): + if frappe.get_cached_value("DocType", dimension.document_type, "is_tree"): + self.filters[dimension.fieldname] = get_dimension_with_children( + dimension.document_type, self.filters.get(dimension.fieldname) + ) + query = query.where( + (gle[dimension.fieldname]).isin(self.filters.get(dimension.fieldname)) + ) + else: + query = query.where( + (gle[dimension.fieldname]).isin(self.filters.get(dimension.fieldname)) + ) - conditions.append( - f"""party in (select name from tabCustomer - where exists(select name from `tabTerritory` where lft >= {lft} and rgt <= {rgt} - and name=tabCustomer.territory))""" - ) - - if self.filters.get("payment_terms_template"): - conditions.append( - "party in (select name from tabCustomer where payment_terms=%(payment_terms_template)s)" - ) - - if self.filters.get("sales_partner"): - conditions.append( - "party in (select name from tabCustomer where default_sales_partner=%(sales_partner)s)" - ) - - if self.filters.get("sales_person"): - lft, rgt = frappe.db.get_value( - "Sales Person", self.filters.get("sales_person"), ["lft", "rgt"] - ) - - conditions.append( - """exists(select name from `tabSales Team` steam where - steam.sales_person in (select name from `tabSales Person` where lft >= {} and rgt <= {}) - and ((steam.parent = voucher_no and steam.parenttype = voucher_type) - or (steam.parent = against_voucher and steam.parenttype = against_voucher_type) - or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt) - ) - - if self.filters.party_type == "Supplier": - if self.filters.get("supplier_group"): - conditions.append( - """party in (select name from tabSupplier - where supplier_group=%(supplier_group)s)""" - ) - - return " and ".join(conditions) + return query def get_return_invoices(self): doctype = "Sales Invoice" if self.filters.party_type == "Customer" else "Purchase Invoice" - self.return_invoices = [ - d.name - for d in frappe.get_all( - doctype, - filters={ - "is_return": 1, - "docstatus": 1, - "posting_date": ["between", [self.filters.from_date, self.filters.to_date]], - }, - ) - ] + filters = ( + { + "is_return": 1, + "docstatus": 1, + "posting_date": ["between", [self.filters.from_date, self.filters.to_date]], + f"{scrub(self.filters.party_type)}": ["in", self.parties], + }, + ) + + self.return_invoices = frappe.get_all(doctype, filters=filters, pluck="name") def get_party_adjustment_amounts(self): - conditions = self.prepare_conditions() account_type = "Expense Account" if self.filters.party_type == "Customer" else "Income Account" - income_or_expense_accounts = frappe.db.get_all( - "Account", filters={"account_type": account_type, "company": self.filters.company}, pluck="name" - ) + invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit" reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit" round_off_account = frappe.get_cached_value("Company", self.filters.company, "round_off_account") - gl = qb.DocType("GL Entry") - if not income_or_expense_accounts: - # prevent empty 'in' condition - income_or_expense_accounts.append("") - else: - # escape '%' in account name - # ignoring frappe.db.escape as it replaces single quotes with double quotes - income_or_expense_accounts = [x.replace("%", "%%") for x in income_or_expense_accounts] - - accounts_query = ( - qb.from_(gl) - .select(gl.voucher_type, gl.voucher_no) - .where( - (gl.account.isin(income_or_expense_accounts)) - & (gl.posting_date.gte(self.filters.from_date)) - & (gl.posting_date.lte(self.filters.to_date)) - ) - ) - - gl_entries = frappe.db.sql( - f""" - select - posting_date, account, party, voucher_type, voucher_no, debit, credit - from - `tabGL Entry` - where - docstatus < 2 and is_cancelled = 0 - and (voucher_type, voucher_no) in ( - {accounts_query} - ) and (voucher_type, voucher_no) in ( - select voucher_type, voucher_no from `tabGL Entry` gle - where gle.party_type=%(party_type)s and ifnull(party, '') != '' - and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 {conditions} - ) - """, - self.filters, - as_dict=True, - ) + current_period_vouchers = set() + adjustment_voucher_entries = {} self.party_adjustment_details = {} self.party_adjustment_accounts = set() - adjustment_voucher_entries = {} + + for gle in self.gl_entries: + if ( + gle.is_opening != "Yes" + and gle.posting_date >= self.filters.from_date + and gle.posting_date <= self.filters.to_date + ): + current_period_vouchers.add((gle.voucher_type, gle.voucher_no)) + adjustment_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []).append(gle) + + if not current_period_vouchers: + return + + gl = qb.DocType("GL Entry") + query = ( + qb.from_(gl) + .select(gl.voucher_type, gl.voucher_no) + .where( + (gl.docstatus < 2) + & (gl.is_cancelled == 0) + & (gl.posting_date.gte(self.filters.from_date)) + & (gl.posting_date.lte(self.filters.to_date)) + & (Tuple((gl.voucher_type, gl.voucher_no)).isin(current_period_vouchers)) + & (IfNull(gl.party, "") == "") + ) + ) + query = self.prepare_conditions(query) + gl_entries = query.run(as_dict=True) + for gle in gl_entries: - adjustment_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []) adjustment_voucher_entries[(gle.voucher_type, gle.voucher_no)].append(gle) for voucher_gl_entries in adjustment_voucher_entries.values(): @@ -440,9 +454,16 @@ class PartyLedgerSummaryReport: self.party_adjustment_details[party][account] += amount +def get_children(doctype, value): + children = get_descendants_of(doctype, value) + + return [value, *children] + + def execute(filters=None): args = { "party_type": "Customer", "naming_by": ["Selling Settings", "cust_master_name"], } + return PartyLedgerSummaryReport(filters).run(args) diff --git a/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py new file mode 100644 index 00000000000..ce47793bbd5 --- /dev/null +++ b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py @@ -0,0 +1,152 @@ +import frappe +from frappe import qb +from frappe.tests.utils import FrappeTestCase +from frappe.utils import add_days, flt, getdate, today + +from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry +from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice +from erpnext.accounts.report.customer_ledger_summary.customer_ledger_summary import execute +from erpnext.accounts.test.accounts_mixin import AccountsTestMixin + + +class TestCustomerLedgerSummary(FrappeTestCase, AccountsTestMixin): + def setUp(self): + self.create_company() + self.create_customer() + self.create_item() + self.clear_old_entries() + + def tearDown(self): + frappe.db.rollback() + + def create_sales_invoice(self, do_not_submit=False, **args): + si = create_sales_invoice( + item=self.item, + company=self.company, + customer=self.customer, + debit_to=self.debit_to, + posting_date=today(), + parent_cost_center=self.cost_center, + cost_center=self.cost_center, + rate=100, + qty=10, + price_list_rate=100, + do_not_save=1, + **args, + ) + si = si.save() + if not do_not_submit: + si = si.submit() + return si + + def create_payment_entry(self, docname, do_not_submit=False): + pe = get_payment_entry("Sales Invoice", docname, bank_account=self.cash, party_amount=40) + pe.paid_from = self.debit_to + pe.insert() + if not do_not_submit: + pe.submit() + return pe + + def create_credit_note(self, docname, do_not_submit=False): + credit_note = create_sales_invoice( + company=self.company, + customer=self.customer, + item=self.item, + qty=-1, + debit_to=self.debit_to, + cost_center=self.cost_center, + is_return=1, + return_against=docname, + do_not_submit=do_not_submit, + ) + + return credit_note + + def test_ledger_summary_basic_output(self): + filters = {"company": self.company, "from_date": today(), "to_date": today()} + + si = self.create_sales_invoice(do_not_submit=True) + si.save().submit() + + expected = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 0, + "return_amount": 0, + "closing_balance": 1000.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected: + with self.subTest(field=field): + self.assertEqual(report[0].get(field), expected.get(field)) + + def test_summary_with_return_and_payment(self): + filters = {"company": self.company, "from_date": today(), "to_date": today()} + + si = self.create_sales_invoice(do_not_submit=True) + si.save().submit() + + expected = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 0, + "return_amount": 0, + "closing_balance": 1000.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected: + with self.subTest(field=field): + self.assertEqual(report[0].get(field), expected.get(field)) + + cr_note = self.create_credit_note(si.name, True) + cr_note.items[0].qty = -2 + cr_note.save().submit() + + expected_after_cr_note = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 0, + "return_amount": 200.0, + "closing_balance": 800.0, + "currency": "INR", + } + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_cr_note: + with self.subTest(field=field): + self.assertEqual(report[0].get(field), expected_after_cr_note.get(field)) + + pe = self.create_payment_entry(si.name, True) + pe.paid_amount = 500 + pe.save().submit() + + expected_after_cr_and_payment = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 500.0, + "return_amount": 200.0, + "closing_balance": 300.0, + "currency": "INR", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_cr_and_payment: + with self.subTest(field=field): + self.assertEqual(report[0].get(field), expected_after_cr_and_payment.get(field)) diff --git a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py index c6d9eac5966..1c85061a551 100644 --- a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py +++ b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py @@ -122,21 +122,24 @@ class Deferred_Item: """ simulate future posting by creating dummy gl entries. starts from the last posting date. """ - if self.service_start_date != self.service_end_date: - if add_days(self.last_entry_date, 1) < self.period_list[-1].to_date: - self.estimate_for_period_list = get_period_list( - self.filters.from_fiscal_year, - self.filters.to_fiscal_year, - add_days(self.last_entry_date, 1), - self.period_list[-1].to_date, - "Date Range", - "Monthly", - company=self.filters.company, - ) - for period in self.estimate_for_period_list: - amount = self.calculate_amount(period.from_date, period.to_date) - gle = self.make_dummy_gle(period.key, period.to_date, amount) - self.gle_entries.append(gle) + if ( + self.service_start_date != self.service_end_date + and add_days(self.last_entry_date, 1) < self.service_end_date + ): + self.estimate_for_period_list = get_period_list( + self.filters.from_fiscal_year, + self.filters.to_fiscal_year, + add_days(self.last_entry_date, 1), + self.service_end_date, + "Date Range", + "Monthly", + company=self.filters.company, + ) + + for period in self.estimate_for_period_list: + amount = self.calculate_amount(period.from_date, period.to_date) + gle = self.make_dummy_gle(period.key, period.to_date, amount) + self.gle_entries.append(gle) def calculate_item_revenue_expense_for_period(self): """ @@ -304,6 +307,7 @@ class Deferred_Revenue_and_Expense_Report: .where( (inv.docstatus == 1) & (deferred_flag_field == 1) + & (inv.company == self.filters.company) & ( ( (self.period_list[0].from_date >= inv_item.service_start_date) diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js index f6051d7e04f..1be58ad9d55 100644 --- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js +++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js @@ -2,5 +2,27 @@ // For license information, please see license.txt frappe.query_reports["Delivered Items To Be Billed"] = { - filters: [], + filters: [ + { + label: __("Company"), + fieldname: "company", + fieldtype: "Link", + options: "Company", + reqd: 1, + default: frappe.defaults.get_default("Company"), + }, + { + label: __("As on Date"), + fieldname: "posting_date", + fieldtype: "Date", + reqd: 1, + default: frappe.datetime.get_today(), + }, + { + label: __("Delivery Note"), + fieldname: "delivery_note", + fieldtype: "Link", + options: "Delivery Note", + }, + ], }; diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py index 59914dc29ac..d2e5ff28247 100644 --- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py @@ -3,6 +3,7 @@ from frappe import _ +from pypika import Order from erpnext.accounts.report.non_billed_report import get_ordered_to_be_billed_data @@ -10,7 +11,7 @@ from erpnext.accounts.report.non_billed_report import get_ordered_to_be_billed_d def execute(filters=None): columns = get_column() args = get_args() - data = get_ordered_to_be_billed_data(args) + data = get_ordered_to_be_billed_data(args, filters) return columns, data @@ -76,13 +77,6 @@ def get_column(): "options": "Project", "width": 120, }, - { - "label": _("Company"), - "fieldname": "company", - "fieldtype": "Link", - "options": "Company", - "width": 120, - }, ] @@ -92,5 +86,6 @@ def get_args(): "party": "customer", "date": "posting_date", "order": "name", - "order_by": "desc", + "order_by": Order.desc, + "reference_field": "delivery_note", } diff --git a/erpnext/accounts/report/financial_statements.html b/erpnext/accounts/report/financial_statements.html index 2bb09cf0dc5..dc1d0093bce 100644 --- a/erpnext/accounts/report/financial_statements.html +++ b/erpnext/accounts/report/financial_statements.html @@ -67,5 +67,5 @@- Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %} + {%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 6d7635979bb..0d1e185382d 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -2,13 +2,16 @@ # License: GNU General Public License v3. See license.txt +import copy import functools import math import re import frappe from frappe import _ +from frappe.query_builder.functions import Sum from frappe.utils import add_days, add_months, cint, cstr, flt, formatdate, get_first_day, getdate +from pypika.terms import ExistsCriterion from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( get_accounting_dimensions, @@ -181,12 +184,12 @@ def get_data( company, period_list[0]["year_start_date"] if only_current_fiscal_year else None, period_list[-1]["to_date"], - root.lft, - root.rgt, filters, gl_entries_by_account, - ignore_closing_entries=ignore_closing_entries, + root.lft, + root.rgt, root_type=root_type, + ignore_closing_entries=ignore_closing_entries, ) calculate_values( @@ -333,8 +336,8 @@ def filter_out_zero_value_rows(data, parent_children_map, show_zero_values=False def add_total_row(out, root_type, balance_must_be, period_list, company_currency): total_row = { - "account_name": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)), - "account": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)), + "account_name": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'", + "account": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'", "currency": company_currency, "opening_balance": 0.0, } @@ -419,127 +422,150 @@ def set_gl_entries_by_account( company, from_date, to_date, - root_lft, - root_rgt, filters, gl_entries_by_account, + root_lft=None, + root_rgt=None, + root_type=None, ignore_closing_entries=False, ignore_opening_entries=False, - root_type=None, + group_by_account=False, ): """Returns a dict like { "account": [gl entries], ... }""" gl_entries = [] - account_filters = { - "company": company, - "is_group": 0, - "lft": (">=", root_lft), - "rgt": ("<=", root_rgt), - } - - if root_type: - account_filters.update( - { - "root_type": root_type, - } + # For balance sheet + ignore_closing_balances = frappe.db.get_single_value( + "Accounts Settings", "ignore_account_closing_balance" + ) + if not from_date and not ignore_closing_balances: + last_period_closing_voucher = frappe.db.get_all( + "Period Closing Voucher", + filters={ + "docstatus": 1, + "company": filters.company, + "period_end_date": ("<", filters["period_start_date"]), + }, + fields=["period_end_date", "name"], + order_by="period_end_date desc", + limit=1, ) + if last_period_closing_voucher: + gl_entries += get_accounting_entries( + "Account Closing Balance", + from_date, + to_date, + filters, + root_lft, + root_rgt, + root_type, + ignore_closing_entries, + last_period_closing_voucher[0].name, + group_by_account=group_by_account, + ) + from_date = add_days(last_period_closing_voucher[0].period_end_date, 1) + ignore_opening_entries = True - accounts_list = frappe.db.get_all( - "Account", - filters=account_filters, - pluck="name", + gl_entries += get_accounting_entries( + "GL Entry", + from_date, + to_date, + filters, + root_lft, + root_rgt, + root_type, + ignore_closing_entries, + ignore_opening_entries=ignore_opening_entries, + group_by_account=group_by_account, ) - if accounts_list: - # For balance sheet - ignore_closing_balances = frappe.db.get_single_value( - "Accounts Settings", "ignore_account_closing_balance" - ) - if not from_date and not ignore_closing_balances: - last_period_closing_voucher = frappe.db.get_all( - "Period Closing Voucher", - filters={ - "docstatus": 1, - "company": filters.company, - "posting_date": ("<", filters["period_start_date"]), - }, - fields=["posting_date", "name"], - order_by="posting_date desc", - limit=1, - ) - if last_period_closing_voucher: - gl_entries += get_accounting_entries( - "Account Closing Balance", - from_date, - to_date, - accounts_list, - filters, - ignore_closing_entries, - last_period_closing_voucher[0].name, - ) - from_date = add_days(last_period_closing_voucher[0].posting_date, 1) - ignore_opening_entries = True + if filters and filters.get("presentation_currency"): + convert_to_presentation_currency(gl_entries, get_currency(filters)) - gl_entries += get_accounting_entries( - "GL Entry", - from_date, - to_date, - accounts_list, - filters, - ignore_closing_entries, - ignore_opening_entries=ignore_opening_entries, - ) + for entry in gl_entries: + gl_entries_by_account.setdefault(entry.account, []).append(entry) - if filters and filters.get("presentation_currency"): - convert_to_presentation_currency(gl_entries, get_currency(filters)) - - for entry in gl_entries: - gl_entries_by_account.setdefault(entry.account, []).append(entry) - - return gl_entries_by_account + return gl_entries_by_account def get_accounting_entries( doctype, from_date, to_date, - accounts, filters, - ignore_closing_entries, + root_lft=None, + root_rgt=None, + root_type=None, + ignore_closing_entries=None, period_closing_voucher=None, ignore_opening_entries=False, + group_by_account=False, ): gl_entry = frappe.qb.DocType(doctype) query = ( frappe.qb.from_(gl_entry) .select( gl_entry.account, - gl_entry.debit, - gl_entry.credit, - gl_entry.debit_in_account_currency, - gl_entry.credit_in_account_currency, + gl_entry.debit if not group_by_account else Sum(gl_entry.debit).as_("debit"), + gl_entry.credit if not group_by_account else Sum(gl_entry.credit).as_("credit"), + gl_entry.debit_in_account_currency + if not group_by_account + else Sum(gl_entry.debit_in_account_currency).as_("debit_in_account_currency"), + gl_entry.credit_in_account_currency + if not group_by_account + else Sum(gl_entry.credit_in_account_currency).as_("credit_in_account_currency"), gl_entry.account_currency, ) .where(gl_entry.company == filters.company) ) + ignore_is_opening = frappe.db.get_single_value( + "Accounts Settings", "ignore_is_opening_check_for_reporting" + ) + if doctype == "GL Entry": query = query.select(gl_entry.posting_date, gl_entry.is_opening, gl_entry.fiscal_year) query = query.where(gl_entry.is_cancelled == 0) query = query.where(gl_entry.posting_date <= to_date) - if ignore_opening_entries: + if ignore_opening_entries and not ignore_is_opening: query = query.where(gl_entry.is_opening == "No") else: query = query.select(gl_entry.closing_date.as_("posting_date")) query = query.where(gl_entry.period_closing_voucher == period_closing_voucher) query = apply_additional_conditions(doctype, query, from_date, ignore_closing_entries, filters) - query = query.where(gl_entry.account.isin(accounts)) - entries = query.run(as_dict=True) + if (root_lft and root_rgt) or root_type: + account_filter_query = get_account_filter_query(root_lft, root_rgt, root_type, gl_entry) + query = query.where(ExistsCriterion(account_filter_query)) - return entries + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions(doctype) + + if match_conditions: + query += "and" + match_conditions + + if group_by_account: + query += " GROUP BY `account`" + + return frappe.db.sql(query, params, as_dict=True) + + +def get_account_filter_query(root_lft, root_rgt, root_type, gl_entry): + acc = frappe.qb.DocType("Account") + exists_query = ( + frappe.qb.from_(acc).select(acc.name).where(acc.name == gl_entry.account).where(acc.is_group == 0) + ) + if root_lft and root_rgt: + exists_query = exists_query.where(acc.lft >= root_lft).where(acc.rgt <= root_rgt) + + if root_type: + exists_query = exists_query.where(acc.root_type == root_type) + + return exists_query def apply_additional_conditions(doctype, query, from_date, ignore_closing_entries, filters): @@ -613,11 +639,11 @@ def get_cost_centers_with_children(cost_centers): return list(set(all_cost_centers)) -def get_columns(periodicity, period_list, accumulated_values=1, company=None): +def get_columns(periodicity, period_list, accumulated_values=1, company=None, cash_flow=False): columns = [ { - "fieldname": "account", - "label": _("Account"), + "fieldname": "account" if not cash_flow else "section", + "label": _("Account") if not cash_flow else _("Section"), "fieldtype": "Link", "options": "Account", "width": 300, @@ -665,3 +691,67 @@ def get_filtered_list_for_consolidated_report(filters, period_list): filtered_summary_list.append(period) return filtered_summary_list + + +def compute_growth_view_data(data, columns): + data_copy = copy.deepcopy(data) + + for row_idx in range(len(data_copy)): + for column_idx in range(1, len(columns)): + previous_period_key = columns[column_idx - 1].get("key") + current_period_key = columns[column_idx].get("key") + current_period_value = data_copy[row_idx].get(current_period_key) + previous_period_value = data_copy[row_idx].get(previous_period_key) + annual_growth = 0 + + if current_period_value is None: + data[row_idx][current_period_key] = None + continue + + if previous_period_value == 0 and current_period_value > 0: + annual_growth = 1 + + elif previous_period_value > 0: + annual_growth = (current_period_value - previous_period_value) / previous_period_value + + growth_percent = round(annual_growth * 100, 2) + + data[row_idx][current_period_key] = growth_percent + + +def compute_margin_view_data(data, columns, accumulated_values): + if not columns: + return + + if not accumulated_values: + columns.append({"key": "total"}) + + data_copy = copy.deepcopy(data) + + base_row = None + for row in data_copy: + if row.get("account_name") == _("Income"): + base_row = row + break + + if not base_row: + return + + for row_idx in range(len(data_copy)): + # Taking the total income from each column (for all the financial years) as the base (100%) + row = data_copy[row_idx] + if not row: + continue + + for column in columns: + curr_period = column.get("key") + base_value = base_row[curr_period] + curr_value = row[curr_period] + + if curr_value is None or base_value <= 0: + data[row_idx][curr_period] = None + continue + + margin_percent = round((curr_value / base_value) * 100, 2) + + data[row_idx][curr_period] = margin_percent diff --git a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py index 89cf7e504f0..9d079eb9ebd 100644 --- a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py +++ b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py @@ -199,8 +199,7 @@ class General_Payment_Ledger_Comparison: dict( label=_("Voucher Type"), fieldname="voucher_type", - fieldtype="Link", - options="DocType", + fieldtype="Data", width="100", ) ) @@ -219,8 +218,7 @@ class General_Payment_Ledger_Comparison: dict( label=_("Party Type"), fieldname="party_type", - fieldtype="Link", - options="DocType", + fieldtype="Data", width="100", ) ) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index 3c4e1a05c97..c40c607fbed 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -48,8 +48,9 @@Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js index e202d5dfffd..6fa846910a6 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.js +++ b/erpnext/accounts/report/general_ledger/general_ledger.js @@ -66,13 +66,14 @@ frappe.query_reports["General Ledger"] = { fieldtype: "Autocomplete", options: Object.keys(frappe.boot.party_account_types), on_change: function () { - frappe.query_report.set_filter_value("party", ""); + frappe.query_report.set_filter_value("party", []); }, }, { fieldname: "party", label: __("Party"), fieldtype: "MultiSelectList", + options: "party_type", get_data: function (txt) { if (!frappe.query_report.filters) return; @@ -151,6 +152,7 @@ frappe.query_reports["General Ledger"] = { fieldname: "cost_center", label: __("Cost Center"), fieldtype: "MultiSelectList", + options: "Cost Center", get_data: function (txt) { return frappe.db.get_link_options("Cost Center", txt, { company: frappe.query_report.get_filter_value("company"), @@ -161,6 +163,7 @@ frappe.query_reports["General Ledger"] = { fieldname: "project", label: __("Project"), fieldtype: "MultiSelectList", + options: "Project", get_data: function (txt) { return frappe.db.get_link_options("Project", txt, { company: frappe.query_report.get_filter_value("company"), diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 2564eb0800f..a62ba2e3732 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -208,6 +208,10 @@ def get_gl_entries(filters, accounting_dimensions): def get_conditions(filters): conditions = [] + ignore_is_opening = frappe.db.get_single_value( + "Accounts Settings", "ignore_is_opening_check_for_reporting" + ) + if filters.get("account"): filters.account = get_accounts_with_children(filters.account) if filters.account: @@ -270,9 +274,15 @@ def get_conditions(filters): or filters.get("party") or filters.get("group_by") in ["Group by Account", "Group by Party"] ): - conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')") + if not ignore_is_opening: + conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')") + else: + conditions.append("posting_date >=%(from_date)s") - conditions.append("(posting_date <=%(to_date)s or is_opening = 'Yes')") + if not ignore_is_opening: + conditions.append("(posting_date <=%(to_date)s or is_opening = 'Yes')") + else: + conditions.append("posting_date <=%(to_date)s") if filters.get("project"): conditions.append("project in %(project)s") @@ -345,10 +355,18 @@ def get_accounts_with_children(accounts): return frappe.qb.from_(doctype).select(doctype.name).where(Criterion.any(conditions)).run(pluck=True) +def set_bill_no(gl_entries): + inv_details = get_supplier_invoice_details() + for gl in gl_entries: + gl["bill_no"] = inv_details.get(gl.get("against_voucher"), "") + + def get_data_with_opening_closing(filters, account_details, accounting_dimensions, gl_entries): data = [] totals_dict = get_totals_dict() + set_bill_no(gl_entries) + gle_map = initialize_gle_map(gl_entries, filters, totals_dict) totals, entries = get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, totals_dict) @@ -362,16 +380,21 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension if acc_dict.entries: # opening data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) - if filters.get("group_by") != "Group by Voucher": + if (not filters.get("group_by") and not filters.get("voucher_no")) or ( + filters.get("group_by") and filters.get("group_by") != "Group by Voucher" + ): data.append(acc_dict.totals.opening) data += acc_dict.entries # totals - data.append(acc_dict.totals.total) + if filters.get("group_by") or not filters.voucher_no: + data.append(acc_dict.totals.total) # closing - if filters.get("group_by") != "Group by Voucher": + if (not filters.get("group_by") and not filters.get("voucher_no")) or ( + filters.get("group_by") and filters.get("group_by") != "Group by Voucher" + ): data.append(acc_dict.totals.closing) data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) @@ -511,6 +534,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot for dim in accounting_dimensions: keylist.append(gle.get(dim)) keylist.append(gle.get("cost_center")) + keylist.append(gle.get("project")) key = tuple(keylist) if key not in consolidated_gle: @@ -536,7 +560,6 @@ def get_account_type_map(company): def get_result_as_list(data, filters): balance, _balance_in_account_currency = 0, 0 - inv_details = get_supplier_invoice_details() for d in data: if not d.get("posting_date"): @@ -546,7 +569,6 @@ def get_result_as_list(data, filters): d["balance"] = balance d["account_currency"] = filters.account_currency - d["bill_no"] = inv_details.get(d.get("against_voucher"), "") return data @@ -658,10 +680,11 @@ def get_columns(filters): {"label": _("Against Account"), "fieldname": "against", "width": 120}, {"label": _("Party Type"), "fieldname": "party_type", "width": 100}, {"label": _("Party"), "fieldname": "party", "width": 100}, - {"label": _("Project"), "options": "Project", "fieldname": "project", "width": 100}, ] if filters.get("include_dimensions"): + columns.append({"label": _("Project"), "options": "Project", "fieldname": "project", "width": 100}) + for dim in get_accounting_dimensions(as_list=False): columns.append( {"label": _(dim.label), "options": dim.label, "fieldname": dim.fieldname, "width": 100} diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js index ad194ee90a2..0ddb95fff2f 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.js +++ b/erpnext/accounts/report/gross_profit/gross_profit.js @@ -67,6 +67,7 @@ frappe.query_reports["Gross Profit"] = { fieldname: "cost_center", label: __("Cost Center"), fieldtype: "MultiSelectList", + options: "Cost Center", get_data: function (txt) { return frappe.db.get_link_options("Cost Center", txt, { company: frappe.query_report.get_filter_value("company"), @@ -77,6 +78,7 @@ frappe.query_reports["Gross Profit"] = { fieldname: "project", label: __("Project"), fieldtype: "MultiSelectList", + options: "Project", get_data: function (txt) { return frappe.db.get_link_options("Project", txt, { company: frappe.query_report.get_filter_value("company"), diff --git a/erpnext/accounts/report/gross_profit/gross_profit.json b/erpnext/accounts/report/gross_profit/gross_profit.json index 0730ffd77e5..dfb7a991e3e 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.json +++ b/erpnext/accounts/report/gross_profit/gross_profit.json @@ -1,5 +1,5 @@ { - "add_total_row": 1, + "add_total_row": 0, "columns": [], "creation": "2013-02-25 17:03:34", "disable_prepared_report": 0, @@ -9,7 +9,7 @@ "filters": [], "idx": 3, "is_standard": "Yes", - "modified": "2022-02-11 10:18:36.956558", + "modified": "2025-01-27 18:40:24.493829", "modified_by": "Administrator", "module": "Accounts", "name": "Gross Profit", diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index a9039a9cada..fe17924d527 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -178,7 +178,14 @@ def get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_ # removing Item Code and Item Name columns del columns[4:6] + total_base_amount = 0 + total_buying_amount = 0 + for src in gross_profit_data.si_list: + if src.indent == 1: + total_base_amount += src.base_amount or 0.0 + total_buying_amount += src.buying_amount or 0.0 + row = frappe._dict() row.indent = src.indent row.parent_invoice = src.parent_invoice @@ -189,17 +196,57 @@ def get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_ data.append(row) + total_gross_profit = total_base_amount - total_buying_amount + data.append( + frappe._dict( + { + "sales_invoice": "Total", + "qty": None, + "avg._selling_rate": None, + "valuation_rate": None, + "selling_amount": total_base_amount, + "buying_amount": total_buying_amount, + "gross_profit": total_gross_profit, + "gross_profit_%": flt( + (total_gross_profit / total_base_amount) * 100.0, + cint(frappe.db.get_default("currency_precision")) or 3, + ) + if total_base_amount + else 0, + } + ) + ) + def get_data_when_not_grouped_by_invoice(gross_profit_data, filters, group_wise_columns, data): - for src in gross_profit_data.grouped_data: - row = [] - for col in group_wise_columns.get(scrub(filters.group_by)): - row.append(src.get(col)) + total_base_amount = 0 + total_buying_amount = 0 - row.append(filters.currency) + group_columns = group_wise_columns.get(scrub(filters.group_by)) + + for src in gross_profit_data.grouped_data: + total_base_amount += src.base_amount or 0.00 + total_buying_amount += src.buying_amount or 0.00 + + row = [src.get(col) for col in group_columns] + [filters.currency] data.append(row) + total_gross_profit = total_base_amount - total_buying_amount + currency_precision = cint(frappe.db.get_default("currency_precision")) or 3 + gross_profit_percent = (total_gross_profit / total_base_amount * 100.0) if total_base_amount else 0 + + total_row = { + group_columns[0]: "Total", + "base_amount": total_base_amount, + "buying_amount": total_buying_amount, + "gross_profit": total_gross_profit, + "gross_profit_percent": flt(gross_profit_percent, currency_precision), + } + + total_row = [total_row.get(col, None) for col in [*group_columns, "currency"]] + data.append(total_row) + def get_columns(group_wise_columns, filters): columns = [] @@ -421,10 +468,10 @@ class GrossProfitGenerator: self.load_invoice_items() self.get_delivery_notes() + self.load_product_bundle() if filters.group_by == "Invoice": self.group_items_by_invoice() - self.load_product_bundle() self.load_non_stock_items() self.get_returned_invoice_items() self.process() @@ -440,6 +487,7 @@ class GrossProfitGenerator: if grouped_by_invoice: buying_amount = 0 + base_amount = 0 for row in reversed(self.si_list): if self.filters.get("group_by") == "Monthly": @@ -480,12 +528,11 @@ class GrossProfitGenerator: else: row.buying_amount = flt(self.get_buying_amount(row, row.item_code), self.currency_precision) - if grouped_by_invoice: - if row.indent == 1.0: - buying_amount += row.buying_amount - elif row.indent == 0.0: - row.buying_amount = buying_amount - buying_amount = 0 + if grouped_by_invoice and row.indent == 0.0: + row.buying_amount = buying_amount + row.base_amount = base_amount + buying_amount = 0 + base_amount = 0 # get buying rate if flt(row.qty): @@ -495,11 +542,19 @@ class GrossProfitGenerator: if self.is_not_invoice_row(row): row.buying_rate, row.base_rate = 0.0, 0.0 + if self.is_not_invoice_row(row): + self.update_return_invoices(row) + + if grouped_by_invoice and row.indent == 1.0: + buying_amount += row.buying_amount + base_amount += row.base_amount + # calculate gross profit row.gross_profit = flt(row.base_amount - row.buying_amount, self.currency_precision) if row.base_amount: row.gross_profit_percent = flt( - (row.gross_profit / row.base_amount) * 100.0, self.currency_precision + (row.gross_profit / row.base_amount) * 100.0, + self.currency_precision, ) else: row.gross_profit_percent = 0.0 @@ -510,33 +565,29 @@ class GrossProfitGenerator: if self.grouped: self.get_average_rate_based_on_group_by() + def update_return_invoices(self, row): + if row.parent in self.returned_invoices and row.item_code in self.returned_invoices[row.parent]: + returned_item_rows = self.returned_invoices[row.parent][row.item_code] + for returned_item_row in returned_item_rows: + # returned_items 'qty' should be stateful + if returned_item_row.qty != 0: + if row.qty >= abs(returned_item_row.qty): + row.qty += returned_item_row.qty + row.base_amount += flt(returned_item_row.base_amount, self.currency_precision) + returned_item_row.qty = 0 + returned_item_row.base_amount = 0 + + else: + row.qty = 0 + row.base_amount = 0 + returned_item_row.qty += row.qty + returned_item_row.base_amount += row.base_amount + + row.buying_amount = flt(flt(row.qty) * flt(row.buying_rate), self.currency_precision) + def get_average_rate_based_on_group_by(self): for key in list(self.grouped): - if self.filters.get("group_by") == "Invoice": - for row in self.grouped[key]: - if row.indent == 1.0: - if ( - row.parent in self.returned_invoices - and row.item_code in self.returned_invoices[row.parent] - ): - returned_item_rows = self.returned_invoices[row.parent][row.item_code] - for returned_item_row in returned_item_rows: - # returned_items 'qty' should be stateful - if returned_item_row.qty != 0: - if row.qty >= abs(returned_item_row.qty): - row.qty += returned_item_row.qty - returned_item_row.qty = 0 - else: - row.qty = 0 - returned_item_row.qty += row.qty - row.base_amount += flt(returned_item_row.base_amount, self.currency_precision) - row.buying_amount = flt( - flt(row.qty) * flt(row.buying_rate), self.currency_precision - ) - if flt(row.qty) or row.base_amount: - row = self.set_average_rate(row) - self.grouped_data.append(row) - elif self.filters.get("group_by") == "Payment Term": + if self.filters.get("group_by") == "Payment Term": for i, row in enumerate(self.grouped[key]): invoice_portion = 0 @@ -556,7 +607,7 @@ class GrossProfitGenerator: new_row = self.set_average_rate(new_row) self.grouped_data.append(new_row) - else: + elif self.filters.get("group_by") != "Invoice": for i, row in enumerate(self.grouped[key]): if i == 0: new_row = row @@ -632,6 +683,8 @@ class GrossProfitGenerator: if packed_item.get("parent_detail_docname") == row.item_row: packed_item_row = row.copy() packed_item_row.warehouse = packed_item.warehouse + packed_item_row.qty = packed_item.total_qty * -1 + packed_item_row.serial_and_batch_bundle = packed_item.serial_and_batch_bundle buying_amount += self.get_buying_amount(packed_item_row, packed_item.item_code) return flt(buying_amount, self.currency_precision) @@ -664,7 +717,9 @@ class GrossProfitGenerator: else: my_sle = self.get_stock_ledger_entries(item_code, row.warehouse) if (row.update_stock or row.dn_detail) and my_sle: - parenttype, parent = row.parenttype, row.parent + parenttype = row.parenttype + parent = row.invoice or row.parent + if row.dn_detail: parenttype, parent = "Delivery Note", row.delivery_note @@ -721,6 +776,7 @@ class GrossProfitGenerator: "voucher_no": row.parent, "allow_zero_valuation": True, "company": self.filters.company, + "item_code": item_code, } ) @@ -741,12 +797,13 @@ class GrossProfitGenerator: .inner_join(purchase_invoice) .on(purchase_invoice.name == purchase_invoice_item.parent) .select( - purchase_invoice.name, purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor, ) .where(purchase_invoice.docstatus == 1) .where(purchase_invoice.posting_date <= self.filters.to_date) .where(purchase_invoice_item.item_code == item_code) + .where(purchase_invoice.is_return == 0) + .where(purchase_invoice_item.parenttype == "Purchase Invoice") ) if row.project: @@ -783,7 +840,10 @@ class GrossProfitGenerator: """ if self.filters.group_by == "Sales Person": - sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives" + sales_person_cols = """, sales.sales_person, + sales.allocated_percentage * `tabSales Invoice Item`.base_net_amount / 100 as allocated_amount, + sales.incentives + """ sales_team_table = "left join `tabSales Team` sales on sales.parent = `tabSales Invoice`.name" else: sales_person_cols = "" @@ -847,6 +907,7 @@ class GrossProfitGenerator: `tabSales Invoice`.project, `tabSales Invoice`.update_stock, `tabSales Invoice`.customer, `tabSales Invoice`.customer_group, `tabSales Invoice`.territory, `tabSales Invoice Item`.item_code, + `tabSales Invoice`.base_net_total as "invoice_base_net_total", `tabSales Invoice Item`.item_name, `tabSales Invoice Item`.description, `tabSales Invoice Item`.warehouse, `tabSales Invoice Item`.item_group, `tabSales Invoice Item`.brand, `tabSales Invoice Item`.so_detail, @@ -907,6 +968,7 @@ class GrossProfitGenerator: """ grouped = OrderedDict() + product_bundles = self.product_bundles.get("Sales Invoice", {}) for row in self.si_list: # initialize list with a header row for each new parent @@ -917,8 +979,7 @@ class GrossProfitGenerator: ) # if item is a bundle, add it's components as seperate rows - if frappe.db.exists("Product Bundle", row.item_code): - bundled_items = self.get_bundle_items(row) + if bundled_items := product_bundles.get(row.parent, {}).get(row.item_code): for x in bundled_items: bundle_item = self.get_bundle_item_row(row, x) grouped.get(row.parent).append(bundle_item) @@ -954,47 +1015,41 @@ class GrossProfitGenerator: "item_row": None, "is_return": row.is_return, "cost_center": row.cost_center, - "base_net_amount": frappe.db.get_value("Sales Invoice", row.parent, "base_net_total"), + "base_net_amount": row.invoice_base_net_total, } ) - def get_bundle_items(self, product_bundle): - return frappe.get_all( - "Product Bundle Item", filters={"parent": product_bundle.item_code}, fields=["item_code", "qty"] - ) - - def get_bundle_item_row(self, product_bundle, item): - item_name, description, item_group, brand = self.get_bundle_item_details(item.item_code) - + def get_bundle_item_row(self, row, item): return frappe._dict( { - "parent_invoice": product_bundle.item_code, - "indent": product_bundle.indent + 1, + "parent_invoice": row.item_code, + "parenttype": row.parenttype, + "indent": row.indent + 1, "parent": None, "invoice_or_item": item.item_code, - "posting_date": product_bundle.posting_date, - "posting_time": product_bundle.posting_time, - "project": product_bundle.project, - "customer": product_bundle.customer, - "customer_group": product_bundle.customer_group, + "posting_date": row.posting_date, + "posting_time": row.posting_time, + "project": row.project, + "customer": row.customer, + "customer_group": row.customer_group, "item_code": item.item_code, - "item_name": item_name, - "description": description, - "warehouse": product_bundle.warehouse, - "item_group": item_group, - "brand": brand, - "dn_detail": product_bundle.dn_detail, - "delivery_note": product_bundle.delivery_note, - "qty": (flt(product_bundle.qty) * flt(item.qty)), - "item_row": None, - "is_return": product_bundle.is_return, - "cost_center": product_bundle.cost_center, + "item_name": item.item_name, + "description": item.description, + "warehouse": item.warehouse or row.warehouse, + "update_stock": row.update_stock, + "item_group": "", + "brand": "", + "dn_detail": row.dn_detail, + "delivery_note": row.delivery_note, + "qty": item.total_qty * -1, + "item_row": row.item_row, + "is_return": row.is_return, + "cost_center": row.cost_center, + "invoice": row.parent, + "serial_and_batch_bundle": row.serial_and_batch_bundle, } ) - def get_bundle_item_details(self, item_code): - return frappe.db.get_value("Item", item_code, ["item_name", "description", "item_group", "brand"]) - def get_stock_ledger_entries(self, item_code, warehouse): if item_code and warehouse: if (item_code, warehouse) not in self.sle: @@ -1043,6 +1098,7 @@ class GrossProfitGenerator: pki.rate, (pki.rate * pki.qty).as_("base_amount"), pki.parent_detail_docname, + pki.serial_and_batch_bundle, ) .where(pki.docstatus == 1) ) diff --git a/erpnext/accounts/report/gross_profit/test_gross_profit.py b/erpnext/accounts/report/gross_profit/test_gross_profit.py index 83de93891fe..c6c8a0266ef 100644 --- a/erpnext/accounts/report/gross_profit/test_gross_profit.py +++ b/erpnext/accounts/report/gross_profit/test_gross_profit.py @@ -418,12 +418,12 @@ class TestGrossProfit(FrappeTestCase): "item_name": self.item, "warehouse": "Stores - _GP", "qty": 0.0, - "avg._selling_rate": 0.0, + "avg._selling_rate": 100, "valuation_rate": 0.0, - "selling_amount": -100.0, + "selling_amount": 0.0, "buying_amount": 0.0, - "gross_profit": -100.0, - "gross_profit_%": 100.0, + "gross_profit": 0.0, + "gross_profit_%": 0.0, } gp_entry = [x for x in data if x.parent_invoice == sinv.name] # Both items of Invoice should have '0' qty @@ -605,3 +605,33 @@ class TestGrossProfit(FrappeTestCase): item_from_sinv2 = [x for x in data if x.parent_invoice == sinv2.name] self.assertEqual(len(item_from_sinv2), 1) self.assertEqual(1800, item_from_sinv2[0].valuation_rate) + + def test_gross_profit_groupby_invoices(self): + create_sales_invoice( + qty=1, + rate=100, + company=self.company, + customer=self.customer, + item_code=self.item, + item_name=self.item, + cost_center=self.cost_center, + warehouse=self.warehouse, + debit_to=self.debit_to, + parent_cost_center=self.cost_center, + update_stock=0, + currency="INR", + income_account=self.income_account, + expense_account=self.expense_account, + ) + + filters = frappe._dict( + company=self.company, from_date=nowdate(), to_date=nowdate(), group_by="Invoice" + ) + + _, data = execute(filters=filters) + total = data[-1] + + self.assertEqual(total.selling_amount, 100.0) + self.assertEqual(total.buying_amount, 0.0) + self.assertEqual(total.gross_profit, 100.0) + self.assertEqual(total.get("gross_profit_%"), 100.0) diff --git a/erpnext/accounts/report/invalid_ledger_entries/__init__.py b/erpnext/accounts/report/invalid_ledger_entries/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js new file mode 100644 index 00000000000..47d478f2865 --- /dev/null +++ b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js @@ -0,0 +1,51 @@ +// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +function get_filters() { + let filters = [ + { + fieldname: "company", + label: __("Company"), + fieldtype: "Link", + options: "Company", + default: frappe.defaults.get_user_default("Company"), + reqd: 1, + }, + { + fieldname: "from_date", + label: __("Start Date"), + fieldtype: "Date", + reqd: 1, + default: frappe.datetime.add_months(frappe.datetime.get_today(), -1), + }, + { + fieldname: "to_date", + label: __("End Date"), + fieldtype: "Date", + reqd: 1, + default: frappe.datetime.get_today(), + }, + { + fieldname: "account", + label: __("Account"), + fieldtype: "MultiSelectList", + options: "Account", + get_data: function (txt) { + return frappe.db.get_link_options("Account", txt, { + company: frappe.query_report.get_filter_value("company"), + }); + }, + }, + { + fieldname: "voucher_no", + label: __("Voucher No"), + fieldtype: "Data", + width: 100, + }, + ]; + return filters; +} + +frappe.query_reports["Invalid Ledger Entries"] = { + filters: get_filters(), +}; diff --git a/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.json b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.json new file mode 100644 index 00000000000..00dbbfc5056 --- /dev/null +++ b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.json @@ -0,0 +1,23 @@ +{ + "add_total_row": 0, + "columns": [], + "creation": "2024-09-09 12:31:25.295976", + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "filters": [], + "idx": 0, + "is_standard": "Yes", + "letterhead": null, + "modified": "2024-09-09 12:31:25.295976", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Invalid Ledger Entries", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "GL Entry", + "report_name": "Invalid Ledger Entries", + "report_type": "Script Report", + "roles": [], + "timeout": 0 +} \ No newline at end of file diff --git a/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py new file mode 100644 index 00000000000..33fda705cf2 --- /dev/null +++ b/erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py @@ -0,0 +1,137 @@ +# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +import frappe +from frappe import _, qb +from frappe.query_builder import Criterion +from frappe.query_builder.custom import ConstantColumn + + +def execute(filters: dict | None = None): + """Return columns and data for the report. + + This is the main entry point for the report. It accepts the filters as a + dictionary and should return columns and data. It is called by the framework + every time the report is refreshed or a filter is updated. + """ + validate_filters(filters) + + columns = get_columns() + data = get_data(filters) + + return columns, data + + +def get_columns() -> list[dict]: + """Return columns for the report. + + One field definition per column, just like a DocType field definition. + """ + return [ + {"label": _("Voucher Type"), "fieldname": "voucher_type", "fieldtype": "Link", "options": "DocType"}, + { + "label": _("Voucher No"), + "fieldname": "voucher_no", + "fieldtype": "Dynamic Link", + "options": "voucher_type", + }, + ] + + +def get_data(filters) -> list[list]: + """Return data for the report. + + The report data is a list of rows, with each row being a list of cell values. + """ + active_vouchers = get_active_vouchers_for_period(filters) + invalid_vouchers = identify_cancelled_vouchers(active_vouchers) + + return invalid_vouchers + + +def identify_cancelled_vouchers(active_vouchers: list[dict] | list | None = None) -> list[dict]: + cancelled_vouchers = [] + if active_vouchers: + # Group by voucher types and use single query to identify cancelled vouchers + vtypes = set([x.voucher_type for x in active_vouchers]) + + for _t in vtypes: + _names = [x.voucher_no for x in active_vouchers if x.voucher_type == _t] + dt = qb.DocType(_t) + non_active_vouchers = ( + qb.from_(dt) + .select(ConstantColumn(_t).as_("voucher_type"), dt.name.as_("voucher_no")) + .where(dt.docstatus.ne(1) & dt.name.isin(_names)) + .run(as_dict=True) + ) + if non_active_vouchers: + cancelled_vouchers.extend(non_active_vouchers) + return cancelled_vouchers + + +def validate_filters(filters: dict | None = None): + if not filters: + frappe.throw(_("Filters missing")) + + if not filters.company: + frappe.throw(_("Company is mandatory")) + + if filters.from_date > filters.to_date: + frappe.throw(_("Start Date should be lower than End Date")) + + +def build_query_filters(filters: dict | None = None) -> list: + qb_filters = [] + if filters: + if filters.account: + qb_filters.append(qb.Field("account").isin(filters.account)) + + if filters.voucher_no: + qb_filters.append(qb.Field("voucher_no").eq(filters.voucher_no)) + + return qb_filters + + +def get_active_vouchers_for_period(filters: dict | None = None) -> list[dict]: + uniq_vouchers = [] + + if filters: + gle = qb.DocType("GL Entry") + ple = qb.DocType("Payment Ledger Entry") + + qb_filters = build_query_filters(filters) + + gl_vouchers = ( + qb.from_(gle) + .select(gle.voucher_type) + .distinct() + .select(gle.voucher_no) + .distinct() + .where( + gle.is_cancelled.eq(0) + & gle.company.eq(filters.company) + & gle.posting_date[filters.from_date : filters.to_date] + ) + .where(Criterion.all(qb_filters)) + .run(as_dict=True) + ) + + pl_vouchers = ( + qb.from_(ple) + .select(ple.voucher_type) + .distinct() + .select(ple.voucher_no) + .distinct() + .where( + ple.delinked.eq(0) + & ple.company.eq(filters.company) + & ple.posting_date[filters.from_date : filters.to_date] + ) + .where(Criterion.all(qb_filters)) + .run(as_dict=True) + ) + + uniq_vouchers.extend(gl_vouchers) + uniq_vouchers.extend(pl_vouchers) + + return uniq_vouchers diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 83f664c984a..ae822c5b413 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -11,7 +11,7 @@ import erpnext from erpnext.accounts.report.item_wise_sales_register.item_wise_sales_register import ( add_sub_total_row, add_total_row, - apply_group_by_conditions, + apply_order_by_conditions, get_grand_total, get_group_by_and_display_fields, get_tax_accounts, @@ -305,12 +305,6 @@ def apply_conditions(query, pi, pii, filters): if filters.get("item_group"): query = query.where(pii.item_group == filters.get("item_group")) - if not filters.get("group_by"): - query = query.orderby(pi.posting_date, order=Order.desc) - query = query.orderby(pii.item_group, order=Order.desc) - else: - query = apply_group_by_conditions(query, pi, pii, filters) - return query @@ -372,7 +366,17 @@ def get_items(filters, additional_table_columns): query = apply_conditions(query, pi, pii, filters) - return query.run(as_dict=True) + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions(doctype) + + if match_conditions: + query += " and " + match_conditions + + query = apply_order_by_conditions(query, pi, pii, filters) + + return frappe.db.sql(query, params, as_dict=True) def get_aii_accounts(): diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 604c0a6569d..af2c4e7e38b 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -384,27 +384,24 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None): | (si.unrealized_profit_loss_account == filters.get("income_account")) ) - if not filters.get("group_by"): - query = query.orderby(si.posting_date, order=Order.desc) - query = query.orderby(sii.item_group, order=Order.desc) - else: - query = apply_group_by_conditions(query, si, sii, filters) - for key, value in (additional_conditions or {}).items(): query = query.where(si[key] == value) return query -def apply_group_by_conditions(query, si, ii, filters): - if filters.get("group_by") == "Invoice": - query = query.orderby(ii.parent, order=Order.desc) +def apply_order_by_conditions(query, si, ii, filters): + if not filters.get("group_by"): + query += f" order by {si.posting_date} desc, {ii.item_group} desc" + elif filters.get("group_by") == "Invoice": + query += f" order by {ii.parent} desc" elif filters.get("group_by") == "Item": - query = query.orderby(ii.item_code) + query += f" order by {ii.item_code}" elif filters.get("group_by") == "Item Group": - query = query.orderby(ii.item_group) + query += f" order by {ii.item_group}" elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"): - query = query.orderby(si[frappe.scrub(filters.get("group_by"))]) + filter_field = frappe.scrub(filters.get("group_by")) + query += f" order by {filter_field} desc" return query @@ -479,7 +476,17 @@ def get_items(filters, additional_query_columns, additional_conditions=None): query = apply_conditions(query, si, sii, filters, additional_conditions) - return query.run(as_dict=True) + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions("Sales Invoice") + + if match_conditions: + query += " and " + match_conditions + + query = apply_order_by_conditions(query, si, sii, filters) + + return frappe.db.sql(query, params, as_dict=True) def get_delivery_notes_against_sales_order(item_list): diff --git a/erpnext/accounts/report/non_billed_report.py b/erpnext/accounts/report/non_billed_report.py index 39c5311cd99..c0ca604cc6d 100644 --- a/erpnext/accounts/report/non_billed_report.py +++ b/erpnext/accounts/report/non_billed_report.py @@ -4,11 +4,12 @@ import frappe from frappe.model.meta import get_field_precision +from frappe.query_builder.functions import IfNull, Round from erpnext import get_default_currency -def get_ordered_to_be_billed_data(args): +def get_ordered_to_be_billed_data(args, filters=None): doctype, party = args.get("doctype"), args.get("party") child_tab = doctype + " Item" precision = ( @@ -18,47 +19,57 @@ def get_ordered_to_be_billed_data(args): or 2 ) - project_field = get_project_field(doctype, party) + doctype = frappe.qb.DocType(doctype) + child_doctype = frappe.qb.DocType(child_tab) - return frappe.db.sql( - """ - Select - `{parent_tab}`.name, `{parent_tab}`.{date_field}, - `{parent_tab}`.{party}, `{parent_tab}`.{party}_name, - `{child_tab}`.item_code, - `{child_tab}`.base_amount, - (`{child_tab}`.billed_amt * ifnull(`{parent_tab}`.conversion_rate, 1)), - (`{child_tab}`.base_rate * ifnull(`{child_tab}`.returned_qty, 0)), - (`{child_tab}`.base_amount - - (`{child_tab}`.billed_amt * ifnull(`{parent_tab}`.conversion_rate, 1)) - - (`{child_tab}`.base_rate * ifnull(`{child_tab}`.returned_qty, 0))), - `{child_tab}`.item_name, `{child_tab}`.description, - {project_field}, `{parent_tab}`.company - from - `{parent_tab}`, `{child_tab}` - where - `{parent_tab}`.name = `{child_tab}`.parent and `{parent_tab}`.docstatus = 1 - and `{parent_tab}`.status not in ('Closed', 'Completed') - and `{child_tab}`.amount > 0 - and (`{child_tab}`.base_amount - - round(`{child_tab}`.billed_amt * ifnull(`{parent_tab}`.conversion_rate, 1), {precision}) - - (`{child_tab}`.base_rate * ifnull(`{child_tab}`.returned_qty, 0))) > 0 - order by - `{parent_tab}`.{order} {order_by} - """.format( - parent_tab="tab" + doctype, - child_tab="tab" + child_tab, - precision=precision, - party=party, - date_field=args.get("date"), - project_field=project_field, - order=args.get("order"), - order_by=args.get("order_by"), + docname = filters.get(args.get("reference_field"), None) + project_field = get_project_field(doctype, child_doctype, party) + + query = ( + frappe.qb.from_(doctype) + .inner_join(child_doctype) + .on(doctype.name == child_doctype.parent) + .select( + doctype.name, + doctype[args.get("date")].as_("date"), + doctype[party], + doctype[party + "_name"], + child_doctype.item_code, + child_doctype.base_amount.as_("amount"), + (child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1)).as_("billed_amount"), + (child_doctype.base_rate * IfNull(child_doctype.returned_qty, 0)).as_("returned_amount"), + ( + child_doctype.base_amount + - (child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1)) + - (child_doctype.base_rate * IfNull(child_doctype.returned_qty, 0)) + ).as_("pending_amount"), + child_doctype.item_name, + child_doctype.description, + project_field, ) + .where( + (doctype.docstatus == 1) + & (doctype.status.notin(["Closed", "Completed"])) + & (doctype.company == filters.get("company")) + & (doctype.posting_date <= filters.get("posting_date")) + & (child_doctype.amount > 0) + & ( + child_doctype.base_amount + - Round(child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1), precision) + - (child_doctype.base_rate * IfNull(child_doctype.returned_qty, 0)) + ) + > 0 + ) + .orderby(doctype[args.get("order")], order=args.get("order_by")) ) + if docname: + query = query.where(doctype.name == docname) -def get_project_field(doctype, party): + return query.run(as_dict=True) + + +def get_project_field(doctype, child_doctype, party): if party == "supplier": - doctype = doctype + " Item" - return "`tab%s`.project" % (doctype) + return child_doctype.project + return doctype.project diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.js b/erpnext/accounts/report/payment_ledger/payment_ledger.js index 8d1f227fe6d..7ffd26c9700 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.js +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.js @@ -50,6 +50,7 @@ function get_filters() { fieldname: "party", label: __("Party"), fieldtype: "MultiSelectList", + options: "party_type", get_data: function (txt) { if (!frappe.query_report.filters) return; diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index 9852c6e7ab9..9dd5ae5c400 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -130,6 +130,7 @@ class PaymentLedger: ) def get_columns(self): + company_currency = frappe.get_cached_value("Company", self.filters.get("company"), "default_currency") options = None self.columns.append( dict( @@ -194,7 +195,7 @@ class PaymentLedger: label=_("Amount"), fieldname="amount", fieldtype="Currency", - options="Company:company:default_currency", + options=company_currency, width="100", ) ) @@ -210,7 +211,7 @@ class PaymentLedger: ) ) self.columns.append( - dict(label=_("Currency"), fieldname="currency", fieldtype="Currency", hidden=True) + dict(label=_("Currency"), fieldname="currency", fieldtype="Link", options="Currency", hidden=True) ) def run(self): diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py index 58610b22a93..2b6280c74b5 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py @@ -7,6 +7,8 @@ from frappe import _ from frappe.utils import flt from erpnext.accounts.report.financial_statements import ( + compute_growth_view_data, + compute_margin_view_data, get_columns, get_data, get_filtered_list_for_consolidated_report, @@ -59,15 +61,21 @@ def execute(filters=None): columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company) - chart = get_chart_data(filters, columns, income, expense, net_profit_loss) - currency = filters.presentation_currency or frappe.get_cached_value( "Company", filters.company, "default_currency" ) + chart = get_chart_data(filters, columns, income, expense, net_profit_loss, currency) + report_summary, primitive_summary = get_report_summary( period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters ) + if filters.get("selected_view") == "Growth": + compute_growth_view_data(data, period_list) + + if filters.get("selected_view") == "Margin": + compute_margin_view_data(data, period_list, filters.accumulated_values) + return columns, data, None, chart, report_summary, primitive_summary @@ -152,7 +160,7 @@ def get_net_profit_loss(income, expense, period_list, company, currency=None, co return net_profit_loss -def get_chart_data(filters, columns, income, expense, net_profit_loss): +def get_chart_data(filters, columns, income, expense, net_profit_loss, currency): labels = [d.get("label") for d in columns[2:]] income_data, expense_data, net_profit = [], [], [] @@ -181,5 +189,7 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss): chart["type"] = "line" chart["fieldtype"] = "Currency" + chart["options"] = "currency" + chart["currency"] = currency return chart diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py index 504c74babcb..026aecce036 100644 --- a/erpnext/accounts/report/purchase_register/purchase_register.py +++ b/erpnext/accounts/report/purchase_register/purchase_register.py @@ -311,6 +311,7 @@ def get_account_columns(invoice_list, include_payments): """select distinct expense_account from `tabPurchase Invoice Item` where docstatus = 1 and (expense_account is not null and expense_account != '') + and parenttype='Purchase Invoice' and parent in (%s) order by expense_account""" % ", ".join(["%s"] * len(invoice_list)), tuple([inv.name for inv in invoice_list]), @@ -396,7 +397,6 @@ def get_invoices(filters, additional_query_columns): pi.mode_of_payment, ) .where(pi.docstatus == 1) - .orderby(pi.posting_date, pi.name, order=Order.desc) ) if additional_query_columns: @@ -420,8 +420,17 @@ def get_invoices(filters, additional_query_columns): ) query = query.where(pi.credit_to.isin(party_account)) - invoices = query.run(as_dict=True) - return invoices + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions("Purchase Invoice") + + if match_conditions: + query += " and " + match_conditions + + query += " order by posting_date desc, name desc" + + return frappe.db.sql(query, params, as_dict=True) def get_conditions(filters, query, doctype): @@ -451,7 +460,7 @@ def get_invoice_expense_map(invoice_list): """ select parent, expense_account, sum(base_net_amount) as amount from `tabPurchase Invoice Item` - where parent in (%s) + where parent in (%s) and parenttype='Purchase Invoice' group by parent, expense_account """ % ", ".join(["%s"] * len(invoice_list)), @@ -522,7 +531,7 @@ def get_invoice_po_pr_map(invoice_list): """ select parent, purchase_order, purchase_receipt, po_detail, project from `tabPurchase Invoice Item` - where parent in (%s) + where parent in (%s) and parenttype='Purchase Invoice' """ % ", ".join(["%s"] * len(invoice_list)), tuple(inv.name for inv in invoice_list), diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js index ad97f270dd3..2577a82ef65 100644 --- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js +++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js @@ -2,5 +2,27 @@ // For license information, please see license.txt frappe.query_reports["Received Items To Be Billed"] = { - filters: [], + filters: [ + { + label: __("Company"), + fieldname: "company", + fieldtype: "Link", + options: "Company", + reqd: 1, + default: frappe.defaults.get_default("Company"), + }, + { + label: __("As on Date"), + fieldname: "posting_date", + fieldtype: "Date", + reqd: 1, + default: frappe.datetime.get_today(), + }, + { + label: __("Purchase Receipt"), + fieldname: "purchase_receipt", + fieldtype: "Link", + options: "Purchase Receipt", + }, + ], }; diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py index 1dcacb97420..87b7b109b99 100644 --- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py +++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py @@ -3,6 +3,7 @@ from frappe import _ +from pypika import Order from erpnext.accounts.report.non_billed_report import get_ordered_to_be_billed_data @@ -10,7 +11,7 @@ from erpnext.accounts.report.non_billed_report import get_ordered_to_be_billed_d def execute(filters=None): columns = get_column() args = get_args() - data = get_ordered_to_be_billed_data(args) + data = get_ordered_to_be_billed_data(args, filters) return columns, data @@ -76,13 +77,6 @@ def get_column(): "options": "Project", "width": 120, }, - { - "label": _("Company"), - "fieldname": "company", - "fieldtype": "Link", - "options": "Company", - "width": 120, - }, ] @@ -92,5 +86,6 @@ def get_args(): "party": "supplier", "date": "posting_date", "order": "name", - "order_by": "desc", + "order_by": Order.desc, + "reference_field": "purchase_receipt", } diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py index 6c0bf91e3f8..e55f217682d 100644 --- a/erpnext/accounts/report/sales_register/sales_register.py +++ b/erpnext/accounts/report/sales_register/sales_register.py @@ -439,7 +439,6 @@ def get_invoices(filters, additional_query_columns): si.company, ) .where(si.docstatus == 1) - .orderby(si.posting_date, si.name, order=Order.desc) ) if additional_query_columns: @@ -457,8 +456,17 @@ def get_invoices(filters, additional_query_columns): filters, query, doctype="Sales Invoice", child_doctype="Sales Invoice Item" ) - invoices = query.run(as_dict=True) - return invoices + from frappe.desk.reportview import build_match_conditions + + query, params = query.walk() + match_conditions = build_match_conditions("Sales Invoice") + + if match_conditions: + query += " and " + match_conditions + + query += " order by posting_date desc, name desc" + + return frappe.db.sql(query, params, as_dict=True) def get_conditions(filters, query, doctype): @@ -526,7 +534,8 @@ def get_invoice_tax_map(invoice_list, invoice_income_map, income_accounts, inclu tax_details = frappe.db.sql( """select parent, account_head, sum(base_tax_amount_after_discount_amount) as tax_amount - from `tabSales Taxes and Charges` where parent in (%s) group by parent, account_head""" + from `tabSales Taxes and Charges` where parent in (%s) and parenttype = 'Sales Invoice' + group by parent, account_head""" % ", ".join(["%s"] * len(invoice_list)), tuple(inv.name for inv in invoice_list), as_dict=1, diff --git a/erpnext/accounts/report/sales_register/test_sales_register.py b/erpnext/accounts/report/sales_register/test_sales_register.py new file mode 100644 index 00000000000..95aa5add24c --- /dev/null +++ b/erpnext/accounts/report/sales_register/test_sales_register.py @@ -0,0 +1,179 @@ +import frappe +from frappe.tests.utils import FrappeTestCase +from frappe.utils import getdate, today + +from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice +from erpnext.accounts.report.sales_register.sales_register import execute +from erpnext.accounts.test.accounts_mixin import AccountsTestMixin + + +class TestItemWiseSalesRegister(AccountsTestMixin, FrappeTestCase): + def setUp(self): + self.create_company() + self.create_customer() + self.create_item() + self.create_child_cost_center() + + def tearDown(self): + frappe.db.rollback() + + def create_child_cost_center(self): + cc_name = "South Wing" + if frappe.db.exists("Cost Center", cc_name): + cc = frappe.get_doc("Cost Center", cc_name) + else: + parent = frappe.db.get_value("Cost Center", self.cost_center, "parent_cost_center") + cc = frappe.get_doc( + { + "doctype": "Cost Center", + "company": self.company, + "is_group": False, + "parent_cost_center": parent, + "cost_center_name": cc_name, + } + ) + cc = cc.save() + self.south_cc = cc.name + + def create_sales_invoice(self, rate=100, do_not_submit=False): + si = create_sales_invoice( + item=self.item, + company=self.company, + customer=self.customer, + debit_to=self.debit_to, + posting_date=today(), + parent_cost_center=self.cost_center, + cost_center=self.cost_center, + rate=rate, + price_list_rate=rate, + do_not_save=1, + ) + si = si.save() + if not do_not_submit: + si = si.submit() + return si + + def test_basic_report_output(self): + si = self.create_sales_invoice(rate=98) + + filters = frappe._dict({"from_date": today(), "to_date": today(), "company": self.company}) + report = execute(filters) + + res = [x for x in report[1] if x.get("voucher_no") == si.name] + + expected_result = { + "voucher_type": si.doctype, + "voucher_no": si.name, + "posting_date": getdate(), + "customer": self.customer, + "receivable_account": self.debit_to, + "net_total": 98.0, + "grand_total": 98.0, + "debit": 98.0, + } + + report_output = {k: v for k, v in res[0].items() if k in expected_result} + self.assertDictEqual(report_output, expected_result) + + def test_journal_with_cost_center_filter(self): + je1 = frappe.get_doc( + { + "doctype": "Journal Entry", + "voucher_type": "Journal Entry", + "company": self.company, + "posting_date": getdate(), + "accounts": [ + { + "account": self.debit_to, + "party_type": "Customer", + "party": self.customer, + "credit_in_account_currency": 77, + "credit": 77, + "is_advance": "Yes", + "cost_center": self.cost_center, + }, + { + "account": self.cash, + "debit_in_account_currency": 77, + "debit": 77, + }, + ], + } + ) + je1.submit() + + je2 = frappe.get_doc( + { + "doctype": "Journal Entry", + "voucher_type": "Journal Entry", + "company": self.company, + "posting_date": getdate(), + "accounts": [ + { + "account": self.debit_to, + "party_type": "Customer", + "party": self.customer, + "credit_in_account_currency": 98, + "credit": 98, + "is_advance": "Yes", + "cost_center": self.south_cc, + }, + { + "account": self.cash, + "debit_in_account_currency": 98, + "debit": 98, + }, + ], + } + ) + je2.submit() + + filters = frappe._dict( + { + "from_date": today(), + "to_date": today(), + "company": self.company, + "include_payments": True, + "customer": self.customer, + "cost_center": self.cost_center, + } + ) + report_output = execute(filters)[1] + filtered_output = [x for x in report_output if x.get("voucher_no") == je1.name] + self.assertEqual(len(filtered_output), 1) + expected_result = { + "voucher_type": je1.doctype, + "voucher_no": je1.name, + "posting_date": je1.posting_date, + "customer": self.customer, + "receivable_account": self.debit_to, + "net_total": 77.0, + "credit": 77.0, + } + result_fields = {k: v for k, v in filtered_output[0].items() if k in expected_result} + self.assertDictEqual(result_fields, expected_result) + + filters = frappe._dict( + { + "from_date": today(), + "to_date": today(), + "company": self.company, + "include_payments": True, + "customer": self.customer, + "cost_center": self.south_cc, + } + ) + report_output = execute(filters)[1] + filtered_output = [x for x in report_output if x.get("voucher_no") == je2.name] + self.assertEqual(len(filtered_output), 1) + expected_result = { + "voucher_type": je2.doctype, + "voucher_no": je2.name, + "posting_date": je2.posting_date, + "customer": self.customer, + "receivable_account": self.debit_to, + "net_total": 98.0, + "credit": 98.0, + } + result_output = {k: v for k, v in filtered_output[0].items() if k in expected_result} + self.assertDictEqual(result_output, expected_result) diff --git a/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py b/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py new file mode 100644 index 00000000000..ea95772af4d --- /dev/null +++ b/erpnext/accounts/report/supplier_ledger_summary/test_supplier_ledger_summary.py @@ -0,0 +1,61 @@ +import frappe +from frappe.tests.utils import FrappeTestCase +from frappe.utils import today + +from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice +from erpnext.accounts.report.supplier_ledger_summary.supplier_ledger_summary import execute +from erpnext.accounts.test.accounts_mixin import AccountsTestMixin + + +class TestSupplierLedgerSummary(FrappeTestCase, AccountsTestMixin): + def setUp(self): + self.create_company() + self.create_supplier() + self.create_item() + self.clear_old_entries() + + def tearDown(self): + frappe.db.rollback() + + def create_purchase_invoice(self, do_not_submit=False): + frappe.set_user("Administrator") + pi = make_purchase_invoice( + item=self.item, + company=self.company, + supplier=self.supplier, + is_return=False, + update_stock=False, + posting_date=frappe.utils.datetime.date(2021, 5, 1), + do_not_save=1, + rate=300, + price_list_rate=300, + qty=1, + ) + + pi = pi.save() + if not do_not_submit: + pi = pi.submit() + return pi + + def test_basic_supplier_ledger_summary(self): + self.create_purchase_invoice() + + filters = {"company": self.company, "from_date": today(), "to_date": today()} + + expected = { + "party": "_Test Supplier", + "party_name": "_Test Supplier", + "opening_balance": 0, + "invoiced_amount": 300.0, + "paid_amount": 0, + "return_amount": 0, + "closing_balance": 300.0, + "currency": "INR", + "supplier_name": "_Test Supplier", + } + + report_output = execute(filters)[1] + self.assertEqual(len(report_output), 1) + for field in expected: + with self.subTest(field=field): + self.assertEqual(report_output[0].get(field), expected.get(field)) diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py index 0c18dac7768..42c6c82b19f 100644 --- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py +++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py @@ -70,10 +70,10 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_ rate = tax_rate_map.get(tax_withholding_category) if net_total_map.get((voucher_type, name)): - if voucher_type == "Journal Entry": + if voucher_type == "Journal Entry" and tax_amount and rate: # back calcalute total amount from rate and tax_amount - if rate: - total_amount = grand_total = base_total = tax_amount / (rate / 100) + base_total = min(tax_amount / (rate / 100), net_total_map.get((voucher_type, name))[0]) + total_amount = grand_total = base_total elif voucher_type == "Purchase Invoice": total_amount, grand_total, base_total, bill_no, bill_date = net_total_map.get( (voucher_type, name) @@ -405,7 +405,7 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None): "paid_amount_after_tax", "base_paid_amount", ], - "Journal Entry": ["total_amount"], + "Journal Entry": ["tax_withholding_category", "total_debit"], } entries = frappe.get_all( @@ -427,7 +427,7 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None): elif doctype == "Payment Entry": value = [entry.paid_amount, entry.paid_amount_after_tax, entry.base_paid_amount] else: - value = [entry.total_amount] * 3 + value = [entry.total_debit] * 3 net_total_map[(doctype, entry.name)] = value diff --git a/erpnext/accounts/report/trial_balance/trial_balance.json b/erpnext/accounts/report/trial_balance/trial_balance.json index 8ed96a7161a..af586f7f17d 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.json +++ b/erpnext/accounts/report/trial_balance/trial_balance.json @@ -14,14 +14,14 @@ "owner": "Administrator", "ref_doctype": "GL Entry", "report_name": "Trial Balance", - "report_type": "Script Report", + "report_type": "Script Report", "roles": [ { "role": "Accounts User" - }, + }, { "role": "Accounts Manager" - }, + }, { "role": "Auditor" } diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index f216ecea15a..5575426dfff 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -89,20 +89,18 @@ def get_data(filters): ) company_currency = filters.presentation_currency or erpnext.get_company_currency(filters.company) + ignore_is_opening = frappe.db.get_single_value( + "Accounts Settings", "ignore_is_opening_check_for_reporting" + ) + if not accounts: return None accounts, accounts_by_name, parent_children_map = filter_accounts(accounts) - min_lft, max_rgt = frappe.db.sql( - """select min(lft), max(rgt) from `tabAccount` - where company=%s""", - (filters.company,), - )[0] - gl_entries_by_account = {} - opening_balances = get_opening_balances(filters) + opening_balances = get_opening_balances(filters, ignore_is_opening) # add filter inside list so that the query in financial_statements.py doesn't break if filters.project: @@ -112,15 +110,22 @@ def get_data(filters): filters.company, filters.from_date, filters.to_date, - min_lft, - max_rgt, filters, gl_entries_by_account, + root_lft=None, + root_rgt=None, ignore_closing_entries=not flt(filters.with_period_closing_entry_for_current_period), ignore_opening_entries=True, + group_by_account=True, ) - calculate_values(accounts, gl_entries_by_account, opening_balances, filters.get("show_net_values")) + calculate_values( + accounts, + gl_entries_by_account, + opening_balances, + filters.get("show_net_values"), + ignore_is_opening=ignore_is_opening, + ) accumulate_values_into_parents(accounts, accounts_by_name) data = prepare_data(accounts, filters, parent_children_map, company_currency) @@ -131,15 +136,15 @@ def get_data(filters): return data -def get_opening_balances(filters): - balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet") - pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss") +def get_opening_balances(filters, ignore_is_opening): + balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet", ignore_is_opening) + pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss", ignore_is_opening) balance_sheet_opening.update(pl_opening) return balance_sheet_opening -def get_rootwise_opening_balances(filters, report_type): +def get_rootwise_opening_balances(filters, report_type, ignore_is_opening): gle = [] last_period_closing_voucher = "" @@ -150,9 +155,9 @@ def get_rootwise_opening_balances(filters, report_type): if not ignore_closing_balances: last_period_closing_voucher = frappe.db.get_all( "Period Closing Voucher", - filters={"docstatus": 1, "company": filters.company, "posting_date": ("<", filters.from_date)}, - fields=["posting_date", "name"], - order_by="posting_date desc", + filters={"docstatus": 1, "company": filters.company, "period_end_date": ("<", filters.from_date)}, + fields=["period_end_date", "name"], + order_by="period_end_date desc", limit=1, ) @@ -165,16 +170,24 @@ def get_rootwise_opening_balances(filters, report_type): report_type, accounting_dimensions, period_closing_voucher=last_period_closing_voucher[0].name, + ignore_is_opening=ignore_is_opening, ) # Report getting generate from the mid of a fiscal year - if getdate(last_period_closing_voucher[0].posting_date) < getdate(add_days(filters.from_date, -1)): - start_date = add_days(last_period_closing_voucher[0].posting_date, 1) + if getdate(last_period_closing_voucher[0].period_end_date) < getdate(add_days(filters.from_date, -1)): + start_date = add_days(last_period_closing_voucher[0].period_end_date, 1) gle += get_opening_balance( - "GL Entry", filters, report_type, accounting_dimensions, start_date=start_date + "GL Entry", + filters, + report_type, + accounting_dimensions, + start_date=start_date, + ignore_is_opening=ignore_is_opening, ) else: - gle = get_opening_balance("GL Entry", filters, report_type, accounting_dimensions) + gle = get_opening_balance( + "GL Entry", filters, report_type, accounting_dimensions, ignore_is_opening=ignore_is_opening + ) opening = frappe._dict() for d in gle: @@ -193,7 +206,13 @@ def get_rootwise_opening_balances(filters, report_type): def get_opening_balance( - doctype, filters, report_type, accounting_dimensions, period_closing_voucher=None, start_date=None + doctype, + filters, + report_type, + accounting_dimensions, + period_closing_voucher=None, + start_date=None, + ignore_is_opening=0, ): closing_balance = frappe.qb.DocType(doctype) account = frappe.qb.DocType("Account") @@ -229,11 +248,16 @@ def get_opening_balance( (closing_balance.posting_date >= start_date) & (closing_balance.posting_date < filters.from_date) ) - opening_balance = opening_balance.where(closing_balance.is_opening == "No") + + if not ignore_is_opening: + opening_balance = opening_balance.where(closing_balance.is_opening == "No") else: - opening_balance = opening_balance.where( - (closing_balance.posting_date < filters.from_date) | (closing_balance.is_opening == "Yes") - ) + if not ignore_is_opening: + opening_balance = opening_balance.where( + (closing_balance.posting_date < filters.from_date) | (closing_balance.is_opening == "Yes") + ) + else: + opening_balance = opening_balance.where(closing_balance.posting_date < filters.from_date) if doctype == "GL Entry": opening_balance = opening_balance.where(closing_balance.is_cancelled == 0) @@ -304,7 +328,7 @@ def get_opening_balance( return gle -def calculate_values(accounts, gl_entries_by_account, opening_balances, show_net_values): +def calculate_values(accounts, gl_entries_by_account, opening_balances, show_net_values, ignore_is_opening=0): init = { "opening_debit": 0.0, "opening_credit": 0.0, @@ -322,7 +346,7 @@ def calculate_values(accounts, gl_entries_by_account, opening_balances, show_net d["opening_credit"] = opening_balances.get(d.name, {}).get("opening_credit", 0) for entry in gl_entries_by_account.get(d.name, []): - if cstr(entry.is_opening) != "Yes": + if cstr(entry.is_opening) != "Yes" or ignore_is_opening: d["debit"] += flt(entry.debit) d["credit"] += flt(entry.credit) diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js index 50578d314e3..62482ac162c 100644 --- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js +++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js @@ -68,16 +68,12 @@ frappe.query_reports["Trial Balance for Party"] = { { fieldname: "account", label: __("Account"), - fieldtype: "Link", + fieldtype: "MultiSelectList", options: "Account", - get_query: function () { - var company = frappe.query_report.get_filter_value("company"); - return { - doctype: "Account", - filters: { - company: company, - }, - }; + get_data: function (txt) { + return frappe.db.get_link_options("Account", txt, { + company: frappe.query_report.get_filter_value("company"), + }); }, }, { diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py index dd1a12514e2..f6c79eb6c45 100644 --- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py @@ -4,8 +4,10 @@ import frappe from frappe import _ +from frappe.query_builder.functions import Sum from frappe.utils import cint, flt +from erpnext.accounts.report.general_ledger.general_ledger import get_accounts_with_children from erpnext.accounts.report.trial_balance.trial_balance import validate_filters @@ -35,9 +37,14 @@ def get_data(filters, show_party_name): filters=party_filters, order_by="name", ) + + account_filter = [] + if filters.get("account"): + account_filter = get_accounts_with_children(filters.get("account")) + company_currency = frappe.get_cached_value("Company", filters.company, "default_currency") - opening_balances = get_opening_balances(filters) - balances_within_period = get_balances_within_period(filters) + opening_balances = get_opening_balances(filters, account_filter) + balances_within_period = get_balances_within_period(filters, account_filter) data = [] # total_debit, total_credit = 0, 0 @@ -89,30 +96,34 @@ def get_data(filters, show_party_name): return data -def get_opening_balances(filters): - account_filter = "" - if filters.get("account"): - account_filter = "and account = %s" % (frappe.db.escape(filters.get("account"))) +def get_opening_balances(filters, account_filter=None): + GL_Entry = frappe.qb.DocType("GL Entry") - gle = frappe.db.sql( - f""" - select party, sum(debit) as opening_debit, sum(credit) as opening_credit - from `tabGL Entry` - where company=%(company)s - and is_cancelled=0 - and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != '' - and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s)) - {account_filter} - group by party""", - { - "company": filters.company, - "from_date": filters.from_date, - "to_date": filters.to_date, - "party_type": filters.party_type, - }, - as_dict=True, + query = ( + frappe.qb.from_(GL_Entry) + .select( + GL_Entry.party, + Sum(GL_Entry.debit).as_("opening_debit"), + Sum(GL_Entry.credit).as_("opening_credit"), + ) + .where( + (GL_Entry.company == filters.company) + & (GL_Entry.is_cancelled == 0) + & (GL_Entry.party_type == filters.party_type) + & (GL_Entry.party != "") + & ( + (GL_Entry.posting_date < filters.from_date) + | ((GL_Entry.is_opening == "Yes") & (GL_Entry.posting_date <= filters.to_date)) + ) + ) + .groupby(GL_Entry.party) ) + if account_filter: + query = query.where(GL_Entry.account.isin(account_filter)) + + gle = query.run(as_dict=True) + opening = frappe._dict() for d in gle: opening_debit, opening_credit = toggle_debit_credit(d.opening_debit, d.opening_credit) @@ -121,31 +132,33 @@ def get_opening_balances(filters): return opening -def get_balances_within_period(filters): - account_filter = "" - if filters.get("account"): - account_filter = "and account = %s" % (frappe.db.escape(filters.get("account"))) +def get_balances_within_period(filters, account_filter=None): + GL_Entry = frappe.qb.DocType("GL Entry") - gle = frappe.db.sql( - f""" - select party, sum(debit) as debit, sum(credit) as credit - from `tabGL Entry` - where company=%(company)s - and is_cancelled = 0 - and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != '' - and posting_date >= %(from_date)s and posting_date <= %(to_date)s - and ifnull(is_opening, 'No') = 'No' - {account_filter} - group by party""", - { - "company": filters.company, - "from_date": filters.from_date, - "to_date": filters.to_date, - "party_type": filters.party_type, - }, - as_dict=True, + query = ( + frappe.qb.from_(GL_Entry) + .select( + GL_Entry.party, + Sum(GL_Entry.debit).as_("debit"), + Sum(GL_Entry.credit).as_("credit"), + ) + .where( + (GL_Entry.company == filters.company) + & (GL_Entry.is_cancelled == 0) + & (GL_Entry.party_type == filters.party_type) + & (GL_Entry.party != "") + & (GL_Entry.posting_date >= filters.from_date) + & (GL_Entry.posting_date <= filters.to_date) + & (GL_Entry.is_opening == "No") + ) + .groupby(GL_Entry.party) ) + if account_filter: + query = query.where(GL_Entry.account.isin(account_filter)) + + gle = query.run(as_dict=True) + balances_within_period = frappe._dict() for d in gle: balances_within_period.setdefault(d.party, [d.debit, d.credit]) diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index bd1b35559ea..2a72b10e4eb 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -255,7 +255,9 @@ def get_journal_entries(filters, args): ) .orderby(je.posting_date, je.name, order=Order.desc) ) - query = apply_common_conditions(filters, query, doctype="Journal Entry", payments=True) + query = apply_common_conditions( + filters, query, doctype="Journal Entry", child_doctype="Journal Entry Account", payments=True + ) journal_entries = query.run(as_dict=True) return journal_entries @@ -306,7 +308,9 @@ def apply_common_conditions(filters, query, doctype, child_doctype=None, payment query = query.where(parent_doc.posting_date <= filters.to_date) if payments: - if filters.get("cost_center"): + if doctype == "Journal Entry" and filters.get("cost_center"): + query = query.where(child_doc.cost_center == filters.cost_center) + elif filters.get("cost_center"): query = query.where(parent_doc.cost_center == filters.cost_center) else: if filters.get("cost_center"): @@ -326,6 +330,7 @@ def apply_common_conditions(filters, query, doctype, child_doctype=None, payment if join_required: query = query.inner_join(child_doc).on(parent_doc.name == child_doc.parent) + query = query.where(child_doc.parenttype == doctype) query = query.distinct() if parent_doc.get_table_name() != "tabJournal Entry": diff --git a/erpnext/accounts/test/accounts_mixin.py b/erpnext/accounts/test/accounts_mixin.py index d503f7bc4af..fbd0c76a229 100644 --- a/erpnext/accounts/test/accounts_mixin.py +++ b/erpnext/accounts/test/accounts_mixin.py @@ -85,6 +85,23 @@ class AccountsTestMixin: "attribute_name": "bank", "account_name": "HDFC", "parent_account": "Bank Accounts - " + abbr, + "account_type": "Bank", + } + ), + frappe._dict( + { + "attribute_name": "advance_received", + "account_name": "Advance Received", + "parent_account": "Current Liabilities - " + abbr, + "account_type": "Receivable", + } + ), + frappe._dict( + { + "attribute_name": "advance_paid", + "account_name": "Advance Paid", + "parent_account": "Current Assets - " + abbr, + "account_type": "Payable", } ), ] @@ -101,9 +118,31 @@ class AccountsTestMixin: "company": self.company, } ) + new_acc.account_type = acc.get("account_type", None) new_acc.save() setattr(self, acc.attribute_name, new_acc.name) + self.identify_default_warehouses() + + def enable_advance_as_liability(self): + company = frappe.get_doc("Company", self.company) + company.book_advance_payments_in_separate_party_account = True + company.default_advance_received_account = self.advance_received + company.default_advance_paid_account = self.advance_paid + company.save() + + def disable_advance_as_liability(self): + company = frappe.get_doc("Company", self.company) + company.book_advance_payments_in_separate_party_account = False + company.default_advance_paid_account = company.default_advance_received_account = None + company.save() + + def identify_default_warehouses(self): + for w in frappe.db.get_all( + "Warehouse", filters={"company": self.company}, fields=["name", "warehouse_name"] + ): + setattr(self, "warehouse_" + w.warehouse_name.lower().strip().replace(" ", "_"), w.name) + def create_usd_receivable_account(self): account_name = "Debtors USD" if not frappe.db.get_value( diff --git a/erpnext/accounts/test/test_reports.py b/erpnext/accounts/test/test_reports.py index c2e10f8fd47..56b7832a32e 100644 --- a/erpnext/accounts/test/test_reports.py +++ b/erpnext/accounts/test/test_reports.py @@ -14,8 +14,8 @@ DEFAULT_FILTERS = { REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [ ("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}), ("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}), - ("Accounts Payable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}), - ("Accounts Receivable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}), + ("Accounts Payable", {"range": "30, 60, 90, 120"}), + ("Accounts Receivable", {"range": "30, 60, 90, 120"}), ("Consolidated Financial Statement", {"report": "Balance Sheet"}), ("Consolidated Financial Statement", {"report": "Profit and Loss Statement"}), ("Consolidated Financial Statement", {"report": "Cash Flow"}), diff --git a/erpnext/accounts/test/test_utils.py b/erpnext/accounts/test/test_utils.py index 59cbc11794f..5e108dee9b5 100644 --- a/erpnext/accounts/test/test_utils.py +++ b/erpnext/accounts/test/test_utils.py @@ -92,14 +92,14 @@ class TestUtils(unittest.TestCase): payment_entry.deductions = [] payment_entry.save() - # below is the difference between base_received_amount and base_paid_amount - self.assertEqual(payment_entry.difference_amount, -4855.0) + # below is the difference between base_paid_amount and base_received_amount (exchange gain) + self.assertEqual(payment_entry.deductions[0].amount, -4855.0) payment_entry.target_exchange_rate = 62.9 payment_entry.save() - # below is due to change in exchange rate - self.assertEqual(payment_entry.references[0].exchange_gain_loss, -4855.0) + # after changing the exchange rate, there is no exchange gain / loss + self.assertEqual(payment_entry.deductions, []) payment_entry.references = [] self.assertEqual(payment_entry.difference_amount, 0.0) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 0450221222d..b46e427382f 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -9,8 +9,8 @@ import frappe import frappe.defaults from frappe import _, qb, throw from frappe.model.meta import get_field_precision -from frappe.query_builder import AliasedQuery, Criterion, Table -from frappe.query_builder.functions import Count, Sum +from frappe.query_builder import AliasedQuery, Case, Criterion, Table +from frappe.query_builder.functions import Count, Max, Sum from frappe.query_builder.utils import DocType from frappe.utils import ( add_days, @@ -130,7 +130,9 @@ def get_fiscal_years( else: return ((fy.name, fy.year_start_date, fy.year_end_date),) - error_msg = _("""{0} {1} is not in any active Fiscal Year""").format(label, formatdate(transaction_date)) + error_msg = _("""{0} {1} is not in any active Fiscal Year""").format( + _(label), formatdate(transaction_date) + ) if company: error_msg = _("""{0} for {1}""").format(error_msg, frappe.bold(company)) @@ -474,10 +476,14 @@ def reconcile_against_document( doc = frappe.get_doc(voucher_type, voucher_no) frappe.flags.ignore_party_validation = True - # For payments with `Advance` in separate account feature enabled, only new ledger entries are posted for each reference. - # No need to cancel/delete payment ledger entries + # When Advance is allocated from an Order to an Invoice + # whole ledger must be reposted + repost_whole_ledger = any([x.voucher_detail_no for x in entries]) if voucher_type == "Payment Entry" and doc.book_advance_payments_in_separate_party_account: - doc.make_advance_gl_entries(cancel=1) + if repost_whole_ledger: + doc.make_gl_entries(cancel=1) + else: + doc.make_advance_gl_entries(cancel=1) else: _delete_pl_entries(voucher_type, voucher_no) @@ -511,9 +517,14 @@ def reconcile_against_document( doc = frappe.get_doc(entry.voucher_type, entry.voucher_no) if voucher_type == "Payment Entry" and doc.book_advance_payments_in_separate_party_account: - # both ledgers must be posted to for `Advance` in separate account feature - # TODO: find a more efficient way post only for the new linked vouchers - doc.make_advance_gl_entries() + # When Advance is allocated from an Order to an Invoice + # whole ledger must be reposted + if repost_whole_ledger: + doc.make_gl_entries() + else: + # both ledgers must be posted to for `Advance` in separate account feature + # TODO: find a more efficient way post only for the new linked vouchers + doc.make_advance_gl_entries() else: gl_map = doc.build_gl_map() # Make sure there is no overallocation @@ -621,6 +632,16 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): if jv_detail.get("reference_type") in ["Sales Order", "Purchase Order"]: update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name)) + rev_dr_or_cr = ( + "debit_in_account_currency" + if d["dr_or_cr"] == "credit_in_account_currency" + else "credit_in_account_currency" + ) + if jv_detail.get(rev_dr_or_cr): + d["dr_or_cr"] = rev_dr_or_cr + d["allocated_amount"] = d["allocated_amount"] * -1 + d["unadjusted_amount"] = d["unadjusted_amount"] * -1 + if flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) != 0: # adjust the unreconciled balance amount_in_account_currency = flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) @@ -665,6 +686,8 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): # will work as update after submit journal_entry.flags.ignore_validate_update_after_submit = True + # Ledgers will be reposted by Reconciliation tool + journal_entry.flags.ignore_reposting_on_reconciliation = True if not do_not_save: journal_entry.save(ignore_permissions=True) @@ -689,6 +712,23 @@ def update_reference_in_payment_entry( } update_advance_paid = [] + # Update Reconciliation effect date in reference + if payment_entry.book_advance_payments_in_separate_party_account: + if payment_entry.advance_reconciliation_takes_effect_on == "Advance Payment Date": + reconcile_on = payment_entry.posting_date + elif payment_entry.advance_reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance": + date_field = "posting_date" + if d.against_voucher_type in ["Sales Order", "Purchase Order"]: + date_field = "transaction_date" + reconcile_on = frappe.db.get_value(d.against_voucher_type, d.against_voucher, date_field) + + if getdate(reconcile_on) < getdate(payment_entry.posting_date): + reconcile_on = payment_entry.posting_date + elif payment_entry.advance_reconciliation_takes_effect_on == "Reconciliation Date": + reconcile_on = nowdate() + + reference_details.update({"reconcile_effect_on": reconcile_on}) + if d.voucher_detail_no: existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0] @@ -733,6 +773,8 @@ def update_reference_in_payment_entry( frappe._dict({"difference_posting_date": d.difference_posting_date}), dimensions_dict ) + # Ledgers will be reposted by Reconciliation tool + payment_entry.flags.ignore_reposting_on_reconciliation = True if not do_not_save: payment_entry.save(ignore_permissions=True) return row, update_advance_paid @@ -745,40 +787,114 @@ def cancel_exchange_gain_loss_journal( Cancel Exchange Gain/Loss for Sales/Purchase Invoice, if they have any. """ if parent_doc.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"]: - journals = frappe.db.get_all( - "Journal Entry Account", - filters={ - "reference_type": parent_doc.doctype, - "reference_name": parent_doc.name, - "docstatus": 1, - }, - fields=["parent"], - as_list=1, + gain_loss_journals = get_linked_exchange_gain_loss_journal( + referenced_dt=parent_doc.doctype, referenced_dn=parent_doc.name, je_docstatus=1 ) - - if journals: - gain_loss_journals = frappe.db.get_all( - "Journal Entry", - filters={ - "name": ["in", [x[0] for x in journals]], - "voucher_type": "Exchange Gain Or Loss", - "docstatus": 1, - }, - as_list=1, - ) - for doc in gain_loss_journals: - gain_loss_je = frappe.get_doc("Journal Entry", doc[0]) - if referenced_dt and referenced_dn: - references = [(x.reference_type, x.reference_name) for x in gain_loss_je.accounts] - if ( - len(references) == 2 - and (referenced_dt, referenced_dn) in references - and (parent_doc.doctype, parent_doc.name) in references - ): - # only cancel JE generated against parent_doc and referenced_dn - gain_loss_je.cancel() - else: + for doc in gain_loss_journals: + gain_loss_je = frappe.get_doc("Journal Entry", doc) + if referenced_dt and referenced_dn: + references = [(x.reference_type, x.reference_name) for x in gain_loss_je.accounts] + if ( + len(references) == 2 + and (referenced_dt, referenced_dn) in references + and (parent_doc.doctype, parent_doc.name) in references + ): + # only cancel JE generated against parent_doc and referenced_dn gain_loss_je.cancel() + else: + gain_loss_je.cancel() + + +def delete_exchange_gain_loss_journal( + parent_doc: dict | object, referenced_dt: str | None = None, referenced_dn: str | None = None +) -> None: + """ + Delete Exchange Gain/Loss for Sales/Purchase Invoice, if they have any. + """ + if parent_doc.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"]: + gain_loss_journals = get_linked_exchange_gain_loss_journal( + referenced_dt=parent_doc.doctype, referenced_dn=parent_doc.name, je_docstatus=2 + ) + for doc in gain_loss_journals: + gain_loss_je = frappe.get_doc("Journal Entry", doc) + if referenced_dt and referenced_dn: + references = [(x.reference_type, x.reference_name) for x in gain_loss_je.accounts] + if ( + len(references) == 2 + and (referenced_dt, referenced_dn) in references + and (parent_doc.doctype, parent_doc.name) in references + ): + # only delete JE generated against parent_doc and referenced_dn + gain_loss_je.delete() + else: + gain_loss_je.delete() + + +def get_linked_exchange_gain_loss_journal(referenced_dt: str, referenced_dn: str, je_docstatus: int) -> list: + """ + Get all the linked exchange gain/loss journal entries for a given document. + """ + gain_loss_journals = [] + if journals := frappe.db.get_all( + "Journal Entry Account", + { + "reference_type": referenced_dt, + "reference_name": referenced_dn, + "docstatus": je_docstatus, + }, + pluck="parent", + ): + gain_loss_journals = frappe.db.get_all( + "Journal Entry", + { + "name": ["in", journals], + "voucher_type": "Exchange Gain Or Loss", + "is_system_generated": 1, + "docstatus": je_docstatus, + }, + pluck="name", + ) + return gain_loss_journals + + +def cancel_common_party_journal(self): + if self.doctype not in ["Sales Invoice", "Purchase Invoice"]: + return + + if not frappe.db.get_single_value("Accounts Settings", "enable_common_party_accounting"): + return + + party_link = self.get_common_party_link() + if not party_link: + return + + journal_entry = frappe.db.get_value( + "Journal Entry Account", + filters={ + "reference_type": self.doctype, + "reference_name": self.name, + "docstatus": 1, + }, + fieldname="parent", + ) + + if not journal_entry: + return + + common_party_journal = frappe.db.get_value( + "Journal Entry", + filters={ + "name": journal_entry, + "is_system_generated": True, + "docstatus": 1, + }, + ) + + if not common_party_journal: + return + + common_party_je = frappe.get_doc("Journal Entry", common_party_journal) + common_party_je.cancel() def update_accounting_ledgers_after_reference_removal( @@ -1301,7 +1417,7 @@ def repost_gle_for_stock_vouchers( if not warehouse_account: warehouse_account = get_warehouse_account_map(company) - stock_vouchers = sort_stock_vouchers_by_posting_date(stock_vouchers) + stock_vouchers = sort_stock_vouchers_by_posting_date(stock_vouchers, company=company) if repost_doc and repost_doc.gl_reposting_index: # Restore progress stock_vouchers = stock_vouchers[cint(repost_doc.gl_reposting_index) :] @@ -1354,7 +1470,9 @@ def _delete_accounting_ledger_entries(voucher_type, voucher_no): _delete_pl_entries(voucher_type, voucher_no) -def sort_stock_vouchers_by_posting_date(stock_vouchers: list[tuple[str, str]]) -> list[tuple[str, str]]: +def sort_stock_vouchers_by_posting_date( + stock_vouchers: list[tuple[str, str]], company=None +) -> list[tuple[str, str]]: sle = frappe.qb.DocType("Stock Ledger Entry") voucher_nos = [v[1] for v in stock_vouchers] @@ -1365,7 +1483,12 @@ def sort_stock_vouchers_by_posting_date(stock_vouchers: list[tuple[str, str]]) - .groupby(sle.voucher_type, sle.voucher_no) .orderby(sle.posting_datetime) .orderby(sle.creation) - ).run(as_dict=True) + ) + + if company: + sles = sles.where(sle.company == company) + + sles = sles.run(as_dict=True) sorted_vouchers = [(sle.voucher_type, sle.voucher_no) for sle in sles] unknown_vouchers = set(stock_vouchers) - set(sorted_vouchers) @@ -1462,12 +1585,16 @@ def compare_existing_and_expected_gle(existing_gle, expected_gle, precision): return matched -def get_stock_accounts(company, voucher_type=None, voucher_no=None): +def get_stock_accounts(company, voucher_type=None, voucher_no=None, accounts=None): stock_accounts = [ d.name for d in frappe.db.get_all("Account", {"account_type": "Stock", "company": company, "is_group": 0}) ] - if voucher_type and voucher_no: + + if accounts: + stock_accounts = [row.account for row in accounts if row.account in stock_accounts] + + elif voucher_type and voucher_no: if voucher_type == "Journal Entry": stock_accounts = [ d.account @@ -1526,7 +1653,7 @@ def get_stock_and_account_balance(account=None, posting_date=None, company=None) if wh_details.account == account and not wh_details.is_group ] - total_stock_value = get_stock_value_on(related_warehouses, posting_date) + total_stock_value = get_stock_value_on(related_warehouses, posting_date, company=company) precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency") return flt(account_balance, precision), flt(total_stock_value, precision), related_warehouses @@ -1727,14 +1854,17 @@ def update_voucher_outstanding(voucher_type, voucher_no, account, party_type, pa ): outstanding = voucher_outstanding[0] ref_doc = frappe.get_doc(voucher_type, voucher_no) + outstanding_amount = flt( + outstanding["outstanding_in_account_currency"], ref_doc.precision("outstanding_amount") + ) # Didn't use db_set for optimisation purpose - ref_doc.outstanding_amount = outstanding["outstanding_in_account_currency"] or 0.0 + ref_doc.outstanding_amount = outstanding_amount frappe.db.set_value( voucher_type, voucher_no, "outstanding_amount", - outstanding["outstanding_in_account_currency"] or 0.0, + outstanding_amount, ) ref_doc.set_status(update=True) @@ -1847,6 +1977,15 @@ class QueryPaymentLedger: .select( ple.against_voucher_no.as_("voucher_no"), Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"), + Max( + Case().when( + ( + (ple.voucher_no == ple.against_voucher_no) + & (ple.voucher_type == ple.against_voucher_type) + ), + (ple.posting_date), + ) + ).as_("invoice_date"), ) .where(ple.delinked == 0) .where(Criterion.all(filter_on_against_voucher_no)) @@ -1854,7 +1993,7 @@ class QueryPaymentLedger: .where(Criterion.all(self.dimensions_filter)) .where(Criterion.all(self.voucher_posting_date)) .groupby(ple.against_voucher_type, ple.against_voucher_no, ple.party_type, ple.party) - .orderby(ple.posting_date, ple.voucher_no) + .orderby(ple.invoice_date, ple.voucher_no) .having(qb.Field("amount_in_account_currency") > 0) .limit(self.limit) .run() @@ -1880,6 +2019,7 @@ class QueryPaymentLedger: ple.cost_center.as_("cost_center"), Sum(ple.amount).as_("amount"), Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"), + ple.remarks, ) .where(ple.delinked == 0) .where(Criterion.all(filter_on_voucher_no)) @@ -1942,6 +2082,7 @@ class QueryPaymentLedger: Table("vouchers").due_date, Table("vouchers").currency, Table("vouchers").cost_center.as_("cost_center"), + Table("vouchers").remarks, ) .where(Criterion.all(filter_on_outstanding_amount)) ) @@ -2130,3 +2271,38 @@ def run_ledger_health_checks(): doc.general_and_payment_ledger_mismatch = True doc.checked_on = run_date doc.save() + + +def sync_auto_reconcile_config(auto_reconciliation_job_trigger: int = 15): + auto_reconciliation_job_trigger = auto_reconciliation_job_trigger or frappe.db.get_single_value( + "Accounts Settings", "auto_reconciliation_job_trigger" + ) + method = "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_reconciliation_for_queued_docs" + + sch_event = frappe.get_doc( + "Scheduler Event", {"scheduled_against": "Process Payment Reconciliation", "method": method} + ) + if frappe.db.get_value("Scheduled Job Type", {"method": method}): + frappe.get_doc( + "Scheduled Job Type", + { + "method": method, + }, + ).update( + { + "cron_format": f"0/{auto_reconciliation_job_trigger} * * * *", + "scheduler_event": sch_event.name, + } + ).save() + else: + frappe.get_doc( + { + "doctype": "Scheduled Job Type", + "method": method, + "scheduler_event": sch_event.name, + "cron_format": f"0/{auto_reconciliation_job_trigger} * * * *", + "create_log": True, + "stopped": False, + "frequency": "Cron", + } + ).save() diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json index 45ab92e2c56..c6a7fc6d84c 100644 --- a/erpnext/accounts/workspace/accounting/accounting.json +++ b/erpnext/accounts/workspace/accounting/accounting.json @@ -621,7 +621,7 @@ "doc_view": "List", "label": "Learn Accounting", "type": "URL", - "url": "https://frappe.school/courses/erpnext-accounting?utm_source=in_app" + "url": "https://school.frappe.io/lms/courses/erpnext-accounting?utm_source=in_app" }, { "label": "Chart of Accounts", @@ -670,4 +670,4 @@ } ], "title": "Accounting" -} \ No newline at end of file +} diff --git a/erpnext/accounts/workspace/payables/payables.json b/erpnext/accounts/workspace/payables/payables.json index f8c85648756..96c626c7291 100644 --- a/erpnext/accounts/workspace/payables/payables.json +++ b/erpnext/accounts/workspace/payables/payables.json @@ -93,7 +93,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Accounts Payable", "link_count": 0, "link_to": "Accounts Payable", @@ -103,7 +103,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Accounts Payable Summary", "link_count": 0, "link_to": "Accounts Payable Summary", @@ -113,7 +113,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Purchase Register", "link_count": 0, "link_to": "Purchase Register", @@ -123,7 +123,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Item-wise Purchase Register", "link_count": 0, "link_to": "Item-wise Purchase Register", @@ -133,7 +133,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Purchase Order Analysis", "link_count": 0, "link_to": "Purchase Order Analysis", @@ -143,7 +143,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Received Items To Be Billed", "link_count": 0, "link_to": "Received Items To Be Billed", @@ -153,7 +153,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Supplier Ledger Summary", "link_count": 0, "link_to": "Supplier Ledger Summary", diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 2477e443c4a..b9ea888faf7 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -213,7 +213,7 @@ frappe.ui.form.on("Asset", {This is a preview of the email to be sent. A PDF of the document will - automatically be attached with the email.
`); + const msg = __( + "This is a preview of the email to be sent. A PDF of the document will automatically be attached with the email." + ); + dialog.fields_dict.note.$wrapper.append(`${msg}
`); dialog.show(); }, diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index c8ef833e0e9..bef41394742 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -390,10 +390,15 @@ def make_supplier_quotation_from_rfq(source_name, target_doc=None, for_supplier= "Request for Quotation": { "doctype": "Supplier Quotation", "validation": {"docstatus": ["=", 1]}, + "field_map": {"opportunity": "opportunity"}, }, "Request for Quotation Item": { "doctype": "Supplier Quotation Item", - "field_map": {"name": "request_for_quotation_item", "parent": "request_for_quotation"}, + "field_map": { + "name": "request_for_quotation_item", + "parent": "request_for_quotation", + "project_name": "project", + }, }, }, target_doc, @@ -455,6 +460,7 @@ def create_rfq_items(sq_doc, supplier, data): "material_request", "material_request_item", "stock_qty", + "uom", ]: args[field] = data.get(field) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js index 99fe24d8770..1a2a514a680 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js @@ -11,12 +11,20 @@ frappe.listview_settings["Supplier Quotation"] = { }, onload: function (listview) { - listview.page.add_action_item(__("Purchase Order"), () => { - erpnext.bulk_transaction_processing.create(listview, "Supplier Quotation", "Purchase Order"); - }); + if (frappe.model.can_create("Purchase Order")) { + listview.page.add_action_item(__("Purchase Order"), () => { + erpnext.bulk_transaction_processing.create(listview, "Supplier Quotation", "Purchase Order"); + }); + } - listview.page.add_action_item(__("Purchase Invoice"), () => { - erpnext.bulk_transaction_processing.create(listview, "Supplier Quotation", "Purchase Invoice"); - }); + if (frappe.model.can_create("Purchase Invoice")) { + listview.page.add_action_item(__("Purchase Invoice"), () => { + erpnext.bulk_transaction_processing.create( + listview, + "Supplier Quotation", + "Purchase Invoice" + ); + }); + } }, }; diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index 71e8da47340..91019104949 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -578,11 +578,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-17 12:25:26.235367", -======= - "modified": "2024-06-02 06:22:17.864822", ->>>>>>> 0bab6f34c1 (fix: distributed discounts on si) + "modified": "2024-06-02 06:22:18.864822", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.py b/erpnext/buying/report/procurement_tracker/procurement_tracker.py index a7e03c08fac..bd0798236b3 100644 --- a/erpnext/buying/report/procurement_tracker/procurement_tracker.py +++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.py @@ -175,7 +175,7 @@ def get_data(filters): "purchase_order": po.parent, "supplier": po.supplier, "estimated_cost": flt(mr_record.get("amount")), - "actual_cost": flt(pi_records.get(po.name)), + "actual_cost": flt(pi_records.get(po.name)) or flt(po.amount), "purchase_order_amt": flt(po.amount), "purchase_order_amt_in_company_currency": flt(po.base_amount), "expected_delivery_date": po.schedule_date, diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js index d8c91babdfd..99b4c26ac8e 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js @@ -19,6 +19,10 @@ frappe.query_reports["Purchase Order Analysis"] = { width: "80", reqd: 1, default: frappe.datetime.add_months(frappe.datetime.get_today(), -1), + on_change: (report) => { + report.set_filter_value("name", []); + report.refresh(); + }, }, { fieldname: "to_date", @@ -27,6 +31,10 @@ frappe.query_reports["Purchase Order Analysis"] = { width: "80", reqd: 1, default: frappe.datetime.get_today(), + on_change: (report) => { + report.set_filter_value("name", []); + report.refresh(); + }, }, { fieldname: "project", @@ -38,13 +46,17 @@ frappe.query_reports["Purchase Order Analysis"] = { { fieldname: "name", label: __("Purchase Order"), - fieldtype: "Link", + fieldtype: "MultiSelectList", width: "80", options: "Purchase Order", - get_query: () => { - return { - filters: { docstatus: 1 }, - }; + get_data: function (txt) { + let filters = { docstatus: 1 }; + + const from_date = frappe.query_report.get_filter_value("from_date"); + const to_date = frappe.query_report.get_filter_value("to_date"); + if (from_date && to_date) filters["transaction_date"] = ["between", [from_date, to_date]]; + + return frappe.db.get_link_options("Purchase Order", txt, filters); }, }, { @@ -52,8 +64,16 @@ frappe.query_reports["Purchase Order Analysis"] = { label: __("Status"), fieldtype: "MultiSelectList", width: "80", + options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"], get_data: function (txt) { - let status = ["To Bill", "To Receive", "To Receive and Bill", "Completed"]; + let status = [ + "To Pay", + "To Bill", + "To Receive", + "To Receive and Bill", + "Completed", + "Closed", + ]; let options = []; for (let option of status) { options.push({ diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py index 084c3b5fc2b..b6bf1d9f8da 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py @@ -22,6 +22,8 @@ def execute(filters=None): if not data: return [], [], None, [] + update_received_amount(data) + data, chart_data = prepare_data(data, filters) return columns, data, None, chart_data @@ -40,7 +42,6 @@ def get_data(filters): po = frappe.qb.DocType("Purchase Order") po_item = frappe.qb.DocType("Purchase Order Item") pi_item = frappe.qb.DocType("Purchase Invoice Item") - pr_item = frappe.qb.DocType("Purchase Receipt Item") query = ( frappe.qb.from_(po) @@ -48,8 +49,6 @@ def get_data(filters): .on(po_item.parent == po.name) .left_join(pi_item) .on((pi_item.po_detail == po_item.name) & (pi_item.docstatus == 1)) - .left_join(pr_item) - .on((pr_item.purchase_order_item == po_item.name) & (pr_item.docstatus == 1)) .select( po.transaction_date.as_("date"), po_item.schedule_date.as_("required_date"), @@ -63,7 +62,6 @@ def get_data(filters): (po_item.qty - po_item.received_qty).as_("pending_qty"), Sum(IfNull(pi_item.qty, 0)).as_("billed_qty"), po_item.base_amount.as_("amount"), - (pr_item.base_amount).as_("received_qty_amount"), (po_item.billed_amt * IfNull(po.conversion_rate, 1)).as_("billed_amount"), (po_item.base_amount - (po_item.billed_amt * IfNull(po.conversion_rate, 1))).as_( "pending_amount" @@ -72,14 +70,16 @@ def get_data(filters): po.company, po_item.name, ) - .where((po_item.parent == po.name) & (po.status.notin(("Stopped", "Closed"))) & (po.docstatus == 1)) + .where((po_item.parent == po.name) & (po.status.notin(("Stopped", "On Hold"))) & (po.docstatus == 1)) .groupby(po_item.name) .orderby(po.transaction_date) ) - for field in ("company", "name"): - if filters.get(field): - query = query.where(po[field] == filters.get(field)) + if filters.get("company"): + query = query.where(po.company == filters.get("company")) + + if filters.get("name"): + query = query.where(po.name.isin(filters.get("name"))) if filters.get("from_date") and filters.get("to_date"): query = query.where(po.transaction_date.between(filters.get("from_date"), filters.get("to_date"))) @@ -95,6 +95,42 @@ def get_data(filters): return data +def update_received_amount(data): + pr_data = get_received_amount_data(data) + + for row in data: + row.received_qty_amount = flt(pr_data.get(row.name)) + + +def get_received_amount_data(data): + pr = frappe.qb.DocType("Purchase Receipt") + pr_item = frappe.qb.DocType("Purchase Receipt Item") + + po_items = [row.name for row in data] + + if not po_items: + return frappe._dict() + + query = ( + frappe.qb.from_(pr) + .inner_join(pr_item) + .on(pr_item.parent == pr.name) + .select( + pr_item.purchase_order_item, + Sum(pr_item.base_amount).as_("received_qty_amount"), + ) + .where((pr.docstatus == 1) & (pr_item.purchase_order_item.isin(po_items))) + .groupby(pr_item.purchase_order_item) + ) + + data = query.run() + + if not data: + return frappe._dict() + + return frappe._dict(data) + + def prepare_data(data, filters): completed, pending = 0, 0 pending_field = "pending_amount" @@ -150,7 +186,7 @@ def prepare_data(data, filters): def prepare_chart_data(pending, completed): - labels = ["Amount to Bill", "Billed Amount"] + labels = [_("Amount to Bill"), _("Billed Amount")] return { "data": {"labels": labels, "datasets": [{"values": [pending, completed]}]}, diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js index 56684a8659b..9b193a34d83 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js @@ -2,3 +2,10 @@ // License: GNU General Public License v3. See license.txt frappe.query_reports["Purchase Order Trends"] = $.extend({}, erpnext.purchase_trends_filters); + +frappe.query_reports["Purchase Order Trends"]["filters"].push({ + fieldname: "include_closed_orders", + label: __("Include Closed Orders"), + fieldtype: "Check", + default: 0, +}); diff --git a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html index 015b31c2064..2fb0986c7bb 100644 --- a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html +++ b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html @@ -94,9 +94,6 @@ -Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
diff --git a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js index 9701e147f05..2c0be8f70d7 100644 --- a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js +++ b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js @@ -50,6 +50,7 @@ frappe.query_reports["Supplier Quotation Comparison"] = { fieldname: "supplier", label: __("Supplier"), fieldtype: "MultiSelectList", + options: "Supplier", get_data: function (txt) { return frappe.db.get_link_options("Supplier", txt); }, @@ -58,6 +59,7 @@ frappe.query_reports["Supplier Quotation Comparison"] = { fieldtype: "MultiSelectList", label: __("Supplier Quotation"), fieldname: "supplier_quotation", + options: "Supplier Quotation", default: "", get_data: function (txt) { return frappe.db.get_link_options("Supplier Quotation", txt, { docstatus: ["<", 2] }); diff --git a/erpnext/buying/workspace/buying/buying.json b/erpnext/buying/workspace/buying/buying.json index 1394fc48d5b..db5c7d046db 100644 --- a/erpnext/buying/workspace/buying/buying.json +++ b/erpnext/buying/workspace/buying/buying.json @@ -537,7 +537,7 @@ "doc_view": "List", "label": "Learn Procurement", "type": "URL", - "url": "https://frappe.school/courses/procurement?utm_source=in_app" + "url": "https://school.frappe.io/lms/courses/procurement?utm_source=in_app" }, { "color": "Yellow", @@ -572,4 +572,4 @@ } ], "title": "Buying" -} \ No newline at end of file +} diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 32f11804206..eab0064a85e 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -8,7 +8,7 @@ from collections import defaultdict import frappe from frappe import _, bold, qb, throw from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied -from frappe.query_builder import Criterion +from frappe.query_builder import Criterion, DocType from frappe.query_builder.custom import ConstantColumn from frappe.query_builder.functions import Abs, Sum from frappe.utils import ( @@ -165,12 +165,54 @@ class AccountsController(TransactionBase): raise_exception=1, ) + def validate_against_voucher_outstanding(self): + from frappe.model.meta import get_meta + + if not get_meta(self.doctype).has_field("outstanding_amount"): + return + + if self.get("is_return") and self.return_against and not self.get("is_pos"): + against_voucher_outstanding = frappe.get_value( + self.doctype, self.return_against, "outstanding_amount" + ) + document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note" + + msg = "" + if self.get("update_outstanding_for_self"): + msg = ( + "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, " + "uncheck '{2}' checkbox.This action will also delete all associated Common Code documents.
", + [frm.docname.bold()] + ), + function () { + return frappe.call({ + method: "frappe.client.delete", + args: { + doctype: frm.doctype, + name: frm.docname, + }, + freeze: true, + freeze_message: __("Deleting {0} and all associated Common Code documents...", [ + frm.docname, + ]), + callback: function (r) { + if (!r.exc) { + frappe.utils.play_sound("delete"); + frappe.model.clear_doc(frm.doctype, frm.docname); + window.history.back(); + } + }, + }); + } + ); + }; + + frm.set_query("default_common_code", function (doc) { + return { + filters: { + code_list: doc.name, + }, + }; + }); + }, +}); diff --git a/erpnext/edi/doctype/code_list/code_list.json b/erpnext/edi/doctype/code_list/code_list.json new file mode 100644 index 00000000000..ffcc2f2b605 --- /dev/null +++ b/erpnext/edi/doctype/code_list/code_list.json @@ -0,0 +1,112 @@ +{ + "actions": [], + "allow_copy": 1, + "allow_rename": 1, + "autoname": "prompt", + "creation": "2024-09-29 06:55:03.920375", + "doctype": "DocType", + "engine": "InnoDB", + "field_order": [ + "title", + "canonical_uri", + "url", + "default_common_code", + "column_break_nkls", + "version", + "publisher", + "publisher_id", + "section_break_npxp", + "description" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "publisher", + "fieldtype": "Data", + "in_standard_filter": 1, + "label": "Publisher" + }, + { + "columns": 1, + "fieldname": "version", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Version" + }, + { + "fieldname": "description", + "fieldtype": "Small Text", + "label": "Description" + }, + { + "fieldname": "canonical_uri", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Canonical URI" + }, + { + "fieldname": "column_break_nkls", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_npxp", + "fieldtype": "Section Break" + }, + { + "fieldname": "publisher_id", + "fieldtype": "Data", + "in_standard_filter": 1, + "label": "Publisher ID" + }, + { + "fieldname": "url", + "fieldtype": "Data", + "label": "URL", + "options": "URL" + }, + { + "description": "This value shall be used when no matching Common Code for a record is found.", + "fieldname": "default_common_code", + "fieldtype": "Link", + "label": "Default Common Code", + "options": "Common Code" + } + ], + "index_web_pages_for_search": 1, + "links": [ + { + "link_doctype": "Common Code", + "link_fieldname": "code_list" + } + ], + "modified": "2024-11-16 17:01:40.260293", + "modified_by": "Administrator", + "module": "EDI", + "name": "Code List", + "naming_rule": "Set by user", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "search_fields": "description", + "show_title_field_in_link": 1, + "sort_field": "creation", + "sort_order": "DESC", + "states": [], + "title_field": "title" +} \ No newline at end of file diff --git a/erpnext/edi/doctype/code_list/code_list.py b/erpnext/edi/doctype/code_list/code_list.py new file mode 100644 index 00000000000..8957c6565b9 --- /dev/null +++ b/erpnext/edi/doctype/code_list/code_list.py @@ -0,0 +1,125 @@ +# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from typing import TYPE_CHECKING + +import frappe +from frappe.model.document import Document + +if TYPE_CHECKING: + from lxml.etree import Element + + +class CodeList(Document): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + canonical_uri: DF.Data | None + default_common_code: DF.Link | None + description: DF.SmallText | None + publisher: DF.Data | None + publisher_id: DF.Data | None + title: DF.Data | None + url: DF.Data | None + version: DF.Data | None + # end: auto-generated types + + def on_trash(self): + if not frappe.flags.in_bulk_delete: + self.__delete_linked_docs() + + def __delete_linked_docs(self): + self.db_set("default_common_code", None) + + linked_docs = frappe.get_all( + "Common Code", + filters={"code_list": self.name}, + fields=["name"], + ) + + for doc in linked_docs: + frappe.delete_doc("Common Code", doc.name) + + def get_codes_for(self, doctype: str, name: str) -> tuple[str]: + """Get the applicable codes for a doctype and name""" + return get_codes_for(self.name, doctype, name) + + def get_docnames_for(self, doctype: str, code: str) -> tuple[str]: + """Get the mapped docnames for a doctype and code""" + return get_docnames_for(self.name, doctype, code) + + def get_default_code(self) -> str | None: + """Get the default common code for this code list""" + return ( + frappe.db.get_value("Common Code", self.default_common_code, "common_code") + if self.default_common_code + else None + ) + + def from_genericode(self, root: "Element"): + """Extract Code List details from genericode XML""" + self.title = root.find(".//Identification/ShortName").text + self.version = root.find(".//Identification/Version").text + self.canonical_uri = root.find(".//CanonicalUri").text + # optionals + self.description = getattr(root.find(".//Identification/LongName"), "text", None) + self.publisher = getattr(root.find(".//Identification/Agency/ShortName"), "text", None) + if not self.publisher: + self.publisher = getattr(root.find(".//Identification/Agency/LongName"), "text", None) + self.publisher_id = getattr(root.find(".//Identification/Agency/Identifier"), "text", None) + self.url = getattr(root.find(".//Identification/LocationUri"), "text", None) + + +def get_codes_for(code_list: str, doctype: str, name: str) -> tuple[str]: + """Return the common code for a given record""" + CommonCode = frappe.qb.DocType("Common Code") + DynamicLink = frappe.qb.DocType("Dynamic Link") + + codes = ( + frappe.qb.from_(CommonCode) + .join(DynamicLink) + .on((CommonCode.name == DynamicLink.parent) & (DynamicLink.parenttype == "Common Code")) + .select(CommonCode.common_code) + .where( + (DynamicLink.link_doctype == doctype) + & (DynamicLink.link_name == name) + & (CommonCode.code_list == code_list) + ) + .distinct() + .orderby(CommonCode.common_code) + ).run() + + return tuple(c[0] for c in codes) if codes else () + + +def get_docnames_for(code_list: str, doctype: str, code: str) -> tuple[str]: + """Return the record name for a given common code""" + CommonCode = frappe.qb.DocType("Common Code") + DynamicLink = frappe.qb.DocType("Dynamic Link") + + docnames = ( + frappe.qb.from_(CommonCode) + .join(DynamicLink) + .on((CommonCode.name == DynamicLink.parent) & (DynamicLink.parenttype == "Common Code")) + .select(DynamicLink.link_name) + .where( + (DynamicLink.link_doctype == doctype) + & (CommonCode.common_code == code) + & (CommonCode.code_list == code_list) + ) + .distinct() + .orderby(DynamicLink.idx) + ).run() + + return tuple(d[0] for d in docnames) if docnames else () + + +def get_default_code(code_list: str) -> str | None: + """Return the default common code for a given code list""" + code_id = frappe.db.get_value("Code List", code_list, "default_common_code") + return frappe.db.get_value("Common Code", code_id, "common_code") if code_id else None diff --git a/erpnext/edi/doctype/code_list/code_list_import.js b/erpnext/edi/doctype/code_list/code_list_import.js new file mode 100644 index 00000000000..4a33f3e2fe6 --- /dev/null +++ b/erpnext/edi/doctype/code_list/code_list_import.js @@ -0,0 +1,218 @@ +frappe.provide("erpnext.edi"); + +erpnext.edi.import_genericode = function (listview_or_form) { + let doctype = "Code List"; + let docname = undefined; + if (listview_or_form.doc !== undefined) { + docname = listview_or_form.doc.name; + } + new frappe.ui.FileUploader({ + method: "erpnext.edi.doctype.code_list.code_list_import.import_genericode", + doctype: doctype, + docname: docname, + allow_toggle_private: false, + allow_take_photo: false, + on_success: function (_file_doc, r) { + listview_or_form.refresh(); + show_column_selection_dialog(r.message); + }, + }); +}; + +function show_column_selection_dialog(context) { + let title_description = __("If there is no title column, use the code column for the title."); + let default_title = get_default(context.columns, ["name", "Name", "code-name", "scheme-name"]); + let fields = [ + { + fieldtype: "HTML", + fieldname: "code_list_info", + options: `| ${__("Title")} | `; + if (code_column) html += `${__("Code")} | `; + if (description_column) html += `${__("Description")} | `; + + // Add headers for filterable columns + for (let column in context.filterable_columns) { + if (dialog.get_value(`filter_${column}`)) { + html += `${__(column)} | `; + } + } + + html += "
|---|---|---|---|
| ${truncate(title)} | `; + } + if (code_column) { + let code = context.example_values[code_column][i] || ""; + html += `${truncate(code)} | `; + } + if (description_column) { + let description = context.example_values[description_column][i] || ""; + html += `${truncate(description)} | `; + } + + // Add values for filterable columns + for (let column in context.filterable_columns) { + if (dialog.get_value(`filter_${column}`)) { + let value = context.example_values[column][i] || ""; + html += `${truncate(value)} | `; + } + } + + html += "
{e!s}", title=_("Fetching Error"))
+
+ if file_url := frappe.local.uploaded_file_url:
+ file_path = frappe.utils.file_manager.get_file_path(file_url)
+ with open(file_path.encode(), mode="rb") as f:
+ content = f.read()
+
+ # Parse the xml content
+ parser = etree.XMLParser(remove_blank_text=True)
+ try:
+ root = etree.fromstring(content, parser=parser)
+ except Exception as e:
+ frappe.throw(f"{e!s}", title=_("Parsing Error"))
+
+ # Extract the name (CanonicalVersionUri) from the parsed XML
+ name = root.find(".//CanonicalVersionUri").text
+ docname = docname or name
+
+ if frappe.db.exists(doctype, docname):
+ code_list = frappe.get_doc(doctype, docname)
+ if code_list.name != name:
+ frappe.throw(_("The uploaded file does not match the selected Code List."))
+ else:
+ # Create a new Code List document with the extracted name
+ code_list = frappe.new_doc(doctype)
+ code_list.name = name
+
+ code_list.from_genericode(root)
+ code_list.save()
+
+ # Attach the file and provide a recoverable identifier
+ file_doc = frappe.get_doc(
+ {
+ "doctype": "File",
+ "attached_to_doctype": "Code List",
+ "attached_to_name": code_list.name,
+ "folder": "Home/Attachments",
+ "file_name": frappe.local.uploaded_filename,
+ "file_url": frappe.local.uploaded_file_url,
+ "is_private": 1,
+ "content": content,
+ }
+ ).save()
+
+ # Get available columns and example values
+ columns, example_values, filterable_columns = get_genericode_columns_and_examples(root)
+
+ return {
+ "code_list": code_list.name,
+ "code_list_title": code_list.title,
+ "file": file_doc.name,
+ "columns": columns,
+ "example_values": example_values,
+ "filterable_columns": filterable_columns,
+ }
+
+
+@frappe.whitelist()
+def process_genericode_import(
+ code_list_name: str,
+ file_name: str,
+ code_column: str,
+ title_column: str | None = None,
+ description_column: str | None = None,
+ filters: str | None = None,
+):
+ from erpnext.edi.doctype.common_code.common_code import import_genericode
+
+ column_map = {"code": code_column, "title": title_column, "description": description_column}
+
+ return import_genericode(code_list_name, file_name, column_map, json.loads(filters) if filters else None)
+
+
+def get_genericode_columns_and_examples(root):
+ columns = []
+ example_values = {}
+ filterable_columns = {}
+
+ # Get column names
+ for column in root.findall(".//Column"):
+ column_id = column.get("Id")
+ columns.append(column_id)
+ example_values[column_id] = []
+ filterable_columns[column_id] = set()
+
+ # Get all values and count unique occurrences
+ for row in root.findall(".//SimpleCodeList/Row"):
+ for value in row.findall("Value"):
+ column_id = value.get("ColumnRef")
+ if column_id not in columns:
+ # Handle undeclared column
+ columns.append(column_id)
+ example_values[column_id] = []
+ filterable_columns[column_id] = set()
+
+ simple_value = value.find("./SimpleValue")
+ if simple_value is None:
+ continue
+
+ filterable_columns[column_id].add(simple_value.text)
+
+ # Get example values (up to 3) and filter columns with cardinality <= 5
+ for row in root.findall(".//SimpleCodeList/Row")[:3]:
+ for value in row.findall("Value"):
+ column_id = value.get("ColumnRef")
+ simple_value = value.find("./SimpleValue")
+ if simple_value is None:
+ continue
+
+ example_values[column_id].append(simple_value.text)
+
+ filterable_columns = {k: list(v) for k, v in filterable_columns.items() if len(v) <= 5}
+
+ return columns, example_values, filterable_columns
diff --git a/erpnext/edi/doctype/code_list/code_list_list.js b/erpnext/edi/doctype/code_list/code_list_list.js
new file mode 100644
index 00000000000..08125de2903
--- /dev/null
+++ b/erpnext/edi/doctype/code_list/code_list_list.js
@@ -0,0 +1,8 @@
+frappe.listview_settings["Code List"] = {
+ onload: function (listview) {
+ listview.page.add_inner_button(__("Import Genericode File"), function () {
+ erpnext.edi.import_genericode(listview);
+ });
+ },
+ hide_name_column: true,
+};
diff --git a/erpnext/edi/doctype/code_list/test_code_list.py b/erpnext/edi/doctype/code_list/test_code_list.py
new file mode 100644
index 00000000000..d37b1ee8f5a
--- /dev/null
+++ b/erpnext/edi/doctype/code_list/test_code_list.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestCodeList(FrappeTestCase):
+ pass
diff --git a/erpnext/edi/doctype/common_code/__init__.py b/erpnext/edi/doctype/common_code/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/edi/doctype/common_code/common_code.js b/erpnext/edi/doctype/common_code/common_code.js
new file mode 100644
index 00000000000..646d5c85b74
--- /dev/null
+++ b/erpnext/edi/doctype/common_code/common_code.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Common Code", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/edi/doctype/common_code/common_code.json b/erpnext/edi/doctype/common_code/common_code.json
new file mode 100644
index 00000000000..b2cb43fa575
--- /dev/null
+++ b/erpnext/edi/doctype/common_code/common_code.json
@@ -0,0 +1,103 @@
+{
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2024-09-29 07:01:18.133067",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "code_list",
+ "title",
+ "common_code",
+ "description",
+ "column_break_wxsw",
+ "additional_data",
+ "section_break_rhgh",
+ "applies_to"
+ ],
+ "fields": [
+ {
+ "fieldname": "code_list",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Code List",
+ "options": "Code List",
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Title",
+ "length": 300,
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_wxsw",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_rhgh",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "applies_to",
+ "fieldtype": "Table",
+ "label": "Applies To",
+ "options": "Dynamic Link"
+ },
+ {
+ "fieldname": "common_code",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Common Code",
+ "length": 300,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "additional_data",
+ "fieldtype": "Code",
+ "label": "Additional Data",
+ "max_height": "190px",
+ "read_only": 1
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Description",
+ "max_height": "60px"
+ }
+ ],
+ "links": [],
+ "modified": "2024-11-06 07:46:17.175687",
+ "modified_by": "Administrator",
+ "module": "EDI",
+ "name": "Common Code",
+ "naming_rule": "Random",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "search_fields": "common_code,description",
+ "show_title_field_in_link": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "title"
+}
\ No newline at end of file
diff --git a/erpnext/edi/doctype/common_code/common_code.py b/erpnext/edi/doctype/common_code/common_code.py
new file mode 100644
index 00000000000..d558b2d282f
--- /dev/null
+++ b/erpnext/edi/doctype/common_code/common_code.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import hashlib
+
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils.data import get_link_to_form
+from lxml import etree
+
+
+class CommonCode(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.core.doctype.dynamic_link.dynamic_link import DynamicLink
+ from frappe.types import DF
+
+ additional_data: DF.Code | None
+ applies_to: DF.Table[DynamicLink]
+ code_list: DF.Link
+ common_code: DF.Data
+ description: DF.SmallText | None
+ title: DF.Data
+ # end: auto-generated types
+
+ def validate(self):
+ self.validate_distinct_references()
+
+ def validate_distinct_references(self):
+ """Ensure no two Common Codes of the same Code List are linked to the same document."""
+ for link in self.applies_to:
+ existing_links = frappe.get_all(
+ "Common Code",
+ filters=[
+ ["name", "!=", self.name],
+ ["code_list", "=", self.code_list],
+ ["Dynamic Link", "link_doctype", "=", link.link_doctype],
+ ["Dynamic Link", "link_name", "=", link.link_name],
+ ],
+ fields=["name", "common_code"],
+ )
+
+ if existing_links:
+ existing_link = existing_links[0]
+ frappe.throw(
+ _("{0} {1} is already linked to Common Code {2}.").format(
+ link.link_doctype,
+ link.link_name,
+ get_link_to_form("Common Code", existing_link["name"], existing_link["common_code"]),
+ )
+ )
+
+ def from_genericode(self, column_map: dict, xml_element: "etree.Element"):
+ """Populate the Common Code document from a genericode XML element
+
+ Args:
+ column_map (dict): A mapping of column names to XML column references. Keys: code, title, description
+ code (etree.Element): The XML element representing a code in the genericode file
+ """
+ title_column = column_map.get("title")
+ code_column = column_map["code"]
+ description_column = column_map.get("description")
+
+ self.common_code = xml_element.find(f"./Value[@ColumnRef='{code_column}']/SimpleValue").text
+
+ if title_column:
+ simple_value_title = xml_element.find(f"./Value[@ColumnRef='{title_column}']/SimpleValue")
+ self.title = simple_value_title.text if simple_value_title is not None else self.common_code
+
+ if description_column:
+ simple_value_descr = xml_element.find(f"./Value[@ColumnRef='{description_column}']/SimpleValue")
+ self.description = simple_value_descr.text if simple_value_descr is not None else None
+
+ self.additional_data = etree.tostring(xml_element, encoding="unicode", pretty_print=True)
+
+
+def simple_hash(input_string, length=6):
+ return hashlib.blake2b(input_string.encode(), digest_size=length // 2).hexdigest()
+
+
+def import_genericode(code_list: str, file_name: str, column_map: dict, filters: dict | None = None):
+ """Import genericode file and create Common Code entries"""
+ file_path = frappe.utils.file_manager.get_file_path(file_name)
+ parser = etree.XMLParser(remove_blank_text=True)
+ tree = etree.parse(file_path, parser=parser)
+ root = tree.getroot()
+
+ # Construct the XPath expression
+ xpath_expr = ".//SimpleCodeList/Row"
+ filter_conditions = [
+ f"Value[@ColumnRef='{column_ref}']/SimpleValue='{value}'" for column_ref, value in filters.items()
+ ]
+ if filter_conditions:
+ xpath_expr += "[" + " and ".join(filter_conditions) + "]"
+
+ elements = root.xpath(xpath_expr)
+ total_elements = len(elements)
+ for i, xml_element in enumerate(elements, start=1):
+ common_code: "CommonCode" = frappe.new_doc("Common Code")
+ common_code.code_list = code_list
+ common_code.from_genericode(column_map, xml_element)
+ common_code.save()
+ frappe.publish_progress(i / total_elements * 100, title=_("Importing Common Codes"))
+
+ return total_elements
+
+
+def on_doctype_update():
+ frappe.db.add_index("Common Code", ["code_list", "common_code"])
diff --git a/erpnext/edi/doctype/common_code/common_code_list.js b/erpnext/edi/doctype/common_code/common_code_list.js
new file mode 100644
index 00000000000..de1b665b161
--- /dev/null
+++ b/erpnext/edi/doctype/common_code/common_code_list.js
@@ -0,0 +1,8 @@
+frappe.listview_settings["Common Code"] = {
+ onload: function (listview) {
+ listview.page.add_inner_button(__("Import Genericode File"), function () {
+ erpnext.edi.import_genericode(listview);
+ });
+ },
+ hide_name_column: true,
+};
diff --git a/erpnext/edi/doctype/common_code/test_common_code.py b/erpnext/edi/doctype/common_code/test_common_code.py
new file mode 100644
index 00000000000..e9c67b2cc82
--- /dev/null
+++ b/erpnext/edi/doctype/common_code/test_common_code.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestCommonCode(FrappeTestCase):
+ pass
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
index f44fad333cf..cb9f49e8c28 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
@@ -69,23 +69,7 @@ class PlaidConnector:
else:
return response["link_token"]
- def auth(self):
- try:
- self.client.Auth.get(self.access_token)
- except ItemError as e:
- if e.code == "ITEM_LOGIN_REQUIRED":
- pass
- except APIError as e:
- if e.code == "PLANNED_MAINTENANCE":
- pass
- except requests.Timeout:
- pass
- except Exception as e:
- frappe.log_error("Plaid: Authentication error")
- frappe.throw(_(str(e)), title=_("Authentication Failed"))
-
def get_transactions(self, start_date, end_date, account_id=None):
- self.auth()
kwargs = dict(access_token=self.access_token, start_date=start_date, end_date=end_date)
if account_id:
kwargs.update(dict(account_ids=[account_id]))
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
index fc3bf804245..04215e92234 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
@@ -25,7 +25,12 @@ frappe.ui.form.on("Plaid Settings", {
method: "erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.enqueue_synchronization",
freeze: true,
callback: () => {
- let bank_transaction_link = 'Bank Transaction';
+ let bank_transaction_link = frappe.utils.get_form_link(
+ "Bank Transaction",
+ "",
+ true,
+ __("Bank Transaction")
+ );
frappe.msgprint({
title: __("Sync Started"),
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js
deleted file mode 100644
index f9364edf5aa..00000000000
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on("QuickBooks Migrator", {
- connect: function (frm) {
- // OAuth requires user intervention to provide application access permissionsto requested scope
- // Here we open a new window and redirect user to the authorization url.
- // After user grants us permission to access. We will set authorization details on this doc which will force refresh.
- window.open(frm.doc.authorization_url);
- },
- fetch_data: function (frm) {
- frm.call("migrate");
- },
- onload: function (frm) {
- frm.trigger("set_indicator");
- var domain = frappe.urllib.get_base_url();
- var redirect_url = `${domain}/api/method/erpnext.erpnext_integrations.doctype.quickbooks_migrator.quickbooks_migrator.callback`;
- if (frm.doc.redirect_url != redirect_url) {
- frm.set_value("redirect_url", redirect_url);
- }
- // Instead of changing percentage width and message of single progress bar
- // Show a different porgress bar for every action after some time remove the finished progress bar
- // Former approach causes the progress bar to dance back and forth.
- frm.trigger("set_indicator");
- frappe.realtime.on("quickbooks_progress_update", function (data) {
- frm.dashboard.show_progress(data.message, (data.count / data.total) * 100, data.message);
- if (data.count == data.total) {
- window.setTimeout(
- function (message) {
- frm.dashboard.hide_progress(message);
- },
- 1500,
- data.messsage
- );
- }
- });
- },
- refresh: function (frm) {
- frm.trigger("set_indicator");
- if (!frm.doc.access_token) {
- // Unset access_token signifies that we don't have enough information to connect to quickbooks api and fetch data
- if (frm.doc.authorization_url) {
- frm.add_custom_button(__("Connect to Quickbooks"), function () {
- frm.trigger("connect");
- });
- }
- }
- if (frm.doc.access_token) {
- // If we have access_token that means we also have refresh_token we don't need user intervention anymore
- // All we need now is a Company from erpnext
- frm.remove_custom_button(__("Connect to Quickbooks"));
-
- frm.toggle_display("company_settings", 1);
- frm.set_df_property("company", "reqd", 1);
- if (frm.doc.company) {
- frm.add_custom_button(__("Fetch Data"), function () {
- frm.trigger("fetch_data");
- });
- }
- }
- },
- set_indicator: function (frm) {
- var indicator_map = {
- "Connecting to QuickBooks": [__("Connecting to QuickBooks"), "orange"],
- "Connected to QuickBooks": [__("Connected to QuickBooks"), "green"],
- "In Progress": [__("In Progress"), "orange"],
- Complete: [__("Complete"), "green"],
- Failed: [__("Failed"), "red"],
- };
- if (frm.doc.status) {
- var indicator = indicator_map[frm.doc.status];
- var label = indicator[0];
- var color = indicator[1];
- frm.page.set_indicator(label, color);
- }
- },
-});
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json
deleted file mode 100644
index 5428177914b..00000000000
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
- "beta": 1,
- "creation": "2018-07-10 14:48:16.757030",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "status",
- "application_settings",
- "client_id",
- "redirect_url",
- "token_endpoint",
- "application_column_break",
- "client_secret",
- "scope",
- "api_endpoint",
- "authorization_settings",
- "authorization_endpoint",
- "refresh_token",
- "code",
- "authorization_column_break",
- "authorization_url",
- "access_token",
- "quickbooks_company_id",
- "company_settings",
- "company",
- "default_shipping_account",
- "default_warehouse",
- "company_column_break",
- "default_cost_center",
- "undeposited_funds_account"
- ],
- "fields": [
- {
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Status",
- "options": "Connecting to QuickBooks\nConnected to QuickBooks\nIn Progress\nComplete\nFailed"
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.client_id && doc.client_secret && doc.redirect_url",
- "fieldname": "application_settings",
- "fieldtype": "Section Break",
- "label": "Application Settings"
- },
- {
- "fieldname": "client_id",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Client ID",
- "reqd": 1
- },
- {
- "fieldname": "redirect_url",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Redirect URL",
- "reqd": 1
- },
- {
- "default": "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer",
- "fieldname": "token_endpoint",
- "fieldtype": "Data",
- "label": "Token Endpoint",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "application_column_break",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "client_secret",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Client Secret",
- "reqd": 1
- },
- {
- "default": "com.intuit.quickbooks.accounting",
- "fieldname": "scope",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Scope",
- "read_only": 1,
- "reqd": 1
- },
- {
- "default": "https://quickbooks.api.intuit.com/v3",
- "fieldname": "api_endpoint",
- "fieldtype": "Data",
- "label": "API Endpoint",
- "read_only": 1,
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "authorization_settings",
- "fieldtype": "Section Break",
- "label": "Authorization Settings"
- },
- {
- "default": "https://appcenter.intuit.com/connect/oauth2",
- "fieldname": "authorization_endpoint",
- "fieldtype": "Data",
- "label": "Authorization Endpoint",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "refresh_token",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Refresh Token"
- },
- {
- "fieldname": "code",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Code"
- },
- {
- "fieldname": "authorization_column_break",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "authorization_url",
- "fieldtype": "Data",
- "label": "Authorization URL",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "access_token",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Access Token"
- },
- {
- "fieldname": "quickbooks_company_id",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Quickbooks Company ID"
- },
- {
- "fieldname": "company_settings",
- "fieldtype": "Section Break",
- "hidden": 1,
- "label": "Company Settings"
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company"
- },
- {
- "fieldname": "default_shipping_account",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Default Shipping Account",
- "options": "Account"
- },
- {
- "fieldname": "default_warehouse",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Default Warehouse",
- "options": "Warehouse"
- },
- {
- "fieldname": "company_column_break",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "default_cost_center",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Default Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "undeposited_funds_account",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Undeposited Funds Account",
- "options": "Account"
- }
- ],
- "issingle": 1,
- "modified": "2019-08-07 15:26:00.653433",
- "modified_by": "Administrator",
- "module": "ERPNext Integrations",
- "name": "QuickBooks Migrator",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
deleted file mode 100644
index 5175cbdf6a9..00000000000
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
+++ /dev/null
@@ -1,1421 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import json
-import traceback
-
-import frappe
-import requests
-from frappe import _
-from frappe.model.document import Document
-from requests_oauthlib import OAuth2Session
-
-from erpnext import encode_company_abbr
-
-
-# QuickBooks requires a redirect URL, User will be redirect to this URL
-# This will be a GET request
-# Request parameters will have two parameters `code` and `realmId`
-# `code` is required to acquire refresh_token and access_token
-# `realmId` is the QuickBooks Company ID. It is Needed to actually fetch data.
-@frappe.whitelist()
-def callback(*args, **kwargs):
- migrator = frappe.get_doc("QuickBooks Migrator")
- migrator.set_indicator("Connecting to QuickBooks")
- migrator.code = kwargs.get("code")
- migrator.quickbooks_company_id = kwargs.get("realmId")
- migrator.save()
- migrator.get_tokens()
- frappe.db.commit()
- migrator.set_indicator("Connected to QuickBooks")
- # We need this page to automatically close afterwards
- frappe.respond_as_web_page("Quickbooks Authentication", html="")
-
-
-class QuickBooksMigrator(Document):
- # begin: auto-generated types
- # This code is auto-generated. Do not modify anything in this block.
-
- from typing import TYPE_CHECKING
-
- if TYPE_CHECKING:
- from frappe.types import DF
-
- access_token: DF.SmallText | None
- api_endpoint: DF.Data
- authorization_endpoint: DF.Data
- authorization_url: DF.Data
- client_id: DF.Data
- client_secret: DF.Data
- code: DF.Data | None
- company: DF.Link | None
- default_cost_center: DF.Link | None
- default_shipping_account: DF.Link | None
- default_warehouse: DF.Link | None
- quickbooks_company_id: DF.Data | None
- redirect_url: DF.Data
- refresh_token: DF.SmallText | None
- scope: DF.Data
- status: DF.Literal[
- "Connecting to QuickBooks", "Connected to QuickBooks", "In Progress", "Complete", "Failed"
- ]
- token_endpoint: DF.Data
- undeposited_funds_account: DF.Link | None
- # end: auto-generated types
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.oauth = OAuth2Session(client_id=self.client_id, redirect_uri=self.redirect_url, scope=self.scope)
- if not self.authorization_url and self.authorization_endpoint:
- self.authorization_url = self.oauth.authorization_url(self.authorization_endpoint)[0]
-
- def on_update(self):
- if self.company:
- # We need a Cost Center corresponding to the selected erpnext Company
- self.default_cost_center = frappe.db.get_value("Company", self.company, "cost_center")
- company_warehouses = frappe.get_all("Warehouse", filters={"company": self.company, "is_group": 0})
- if company_warehouses:
- self.default_warehouse = company_warehouses[0].name
- if self.authorization_endpoint:
- self.authorization_url = self.oauth.authorization_url(self.authorization_endpoint)[0]
-
- @frappe.whitelist()
- def migrate(self):
- frappe.enqueue_doc("QuickBooks Migrator", "QuickBooks Migrator", "_migrate", queue="long")
-
- def _migrate(self):
- try:
- self.set_indicator("In Progress")
- # Add quickbooks_id field to every document so that we can lookup by Id reference
- # provided by documents in API responses.
- # Also add a company field to Customer Supplier and Item
- self._make_custom_fields()
-
- self._migrate_accounts()
-
- # Some Quickbooks Entities like Advance Payment, Payment aren't available firectly from API
- # Sales Invoice also sometimes needs to be saved as a Journal Entry
- # (When Item table is not present, This appens when Invoice is attached with a "StatementCharge" "ReimburseCharge
- # Details of both of these cannot be fetched from API)
- # Their GL entries need to be generated from GeneralLedger Report.
- self._fetch_general_ledger()
-
- # QuickBooks data can have transactions that do not fall in existing fiscal years in ERPNext
- self._create_fiscal_years()
-
- self._allow_fraction_in_unit()
-
- # Following entities are directly available from API
- # Invoice can be an exception sometimes though (as explained above).
- entities_for_normal_transform = [
- "Customer",
- "Item",
- "Vendor",
- "Preferences",
- "JournalEntry",
- "Purchase",
- "Deposit",
- "Invoice",
- "CreditMemo",
- "SalesReceipt",
- "RefundReceipt",
- "Bill",
- "VendorCredit",
- "Payment",
- "BillPayment",
- ]
- for entity in entities_for_normal_transform:
- self._migrate_entries(entity)
-
- # Following entries are not available directly from API, Need to be regenrated from GeneralLedger Report
- entities_for_gl_transform = [
- "Advance Payment",
- "Tax Payment",
- "Sales Tax Payment",
- "Purchase Tax Payment",
- "Inventory Qty Adjust",
- ]
- for entity in entities_for_gl_transform:
- self._migrate_entries_from_gl(entity)
- self.set_indicator("Complete")
- except Exception as e:
- self.set_indicator("Failed")
- self._log_error(e)
-
- frappe.db.commit()
-
- def get_tokens(self):
- token = self.oauth.fetch_token(
- token_url=self.token_endpoint, client_secret=self.client_secret, code=self.code
- )
- self.access_token = token["access_token"]
- self.refresh_token = token["refresh_token"]
- self.save()
-
- def _refresh_tokens(self):
- token = self.oauth.refresh_token(
- token_url=self.token_endpoint,
- client_id=self.client_id,
- refresh_token=self.refresh_token,
- client_secret=self.client_secret,
- code=self.code,
- )
- self.access_token = token["access_token"]
- self.refresh_token = token["refresh_token"]
- self.save()
-
- def _make_custom_fields(self):
- doctypes_for_quickbooks_id_field = [
- "Account",
- "Customer",
- "Address",
- "Item",
- "Supplier",
- "Sales Invoice",
- "Journal Entry",
- "Purchase Invoice",
- ]
- for doctype in doctypes_for_quickbooks_id_field:
- self._make_custom_quickbooks_id_field(doctype)
-
- doctypes_for_company_field = ["Customer", "Item", "Supplier"]
- for doctype in doctypes_for_company_field:
- self._make_custom_company_field(doctype)
-
- frappe.db.commit()
-
- def _make_custom_quickbooks_id_field(self, doctype):
- if not frappe.get_meta(doctype).has_field("quickbooks_id"):
- frappe.get_doc(
- {
- "doctype": "Custom Field",
- "label": "QuickBooks ID",
- "dt": doctype,
- "fieldname": "quickbooks_id",
- "fieldtype": "Data",
- }
- ).insert()
-
- def _make_custom_company_field(self, doctype):
- if not frappe.get_meta(doctype).has_field("company"):
- frappe.get_doc(
- {
- "doctype": "Custom Field",
- "label": "Company",
- "dt": doctype,
- "fieldname": "company",
- "fieldtype": "Link",
- "options": "Company",
- }
- ).insert()
-
- def _migrate_accounts(self):
- self._make_root_accounts()
- for entity in ["Account", "TaxRate", "TaxCode"]:
- self._migrate_entries(entity)
-
- def _make_root_accounts(self):
- roots = ["Asset", "Equity", "Expense", "Liability", "Income"]
- for root in roots:
- try:
- if not frappe.db.exists(
- {
- "doctype": "Account",
- "name": encode_company_abbr(f"{root} - QB", self.company),
- "company": self.company,
- }
- ):
- frappe.get_doc(
- {
- "doctype": "Account",
- "account_name": f"{root} - QB",
- "root_type": root,
- "is_group": "1",
- "company": self.company,
- }
- ).insert(ignore_mandatory=True)
- except Exception as e:
- self._log_error(e, root)
- frappe.db.commit()
-
- def _migrate_entries(self, entity):
- try:
- query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/query"
- max_result_count = 1000
- # Count number of entries
- response = self._get(query_uri, params={"query": f"""SELECT COUNT(*) FROM {entity}"""})
- entry_count = response.json()["QueryResponse"]["totalCount"]
-
- # fetch pages and accumulate
- entries = []
- for start_position in range(1, entry_count + 1, max_result_count):
- response = self._get(
- query_uri,
- params={
- "query": """SELECT * FROM {} STARTPOSITION {} MAXRESULTS {}""".format(
- entity, start_position, max_result_count
- )
- },
- )
- entries.extend(response.json()["QueryResponse"][entity])
- entries = self._preprocess_entries(entity, entries)
- self._save_entries(entity, entries)
- except Exception as e:
- self._log_error(e, response.text)
-
- def _fetch_general_ledger(self):
- try:
- query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/reports/GeneralLedger"
- response = self._get(
- query_uri,
- params={
- "columns": ",".join(["tx_date", "txn_type", "credit_amt", "debt_amt"]),
- "date_macro": "All",
- "minorversion": 3,
- },
- )
- self.gl_entries = {}
- for section in response.json()["Rows"]["Row"]:
- if section["type"] == "Section":
- self._get_gl_entries_from_section(section)
- self.general_ledger = {}
- for account in self.gl_entries.values():
- for line in account:
- type_dict = self.general_ledger.setdefault(line["type"], {})
- if line["id"] not in type_dict:
- type_dict[line["id"]] = {
- "id": line["id"],
- "date": line["date"],
- "lines": [],
- }
- type_dict[line["id"]]["lines"].append(line)
- except Exception as e:
- self._log_error(e, response.text)
-
- def _create_fiscal_years(self):
- try:
- # Assumes that exactly one fiscal year has been created so far
- # Creates fiscal years till oldest ledger entry date is covered
- from itertools import chain
-
- from frappe.utils.data import add_years, getdate
-
- smallest_ledger_entry_date = getdate(
- min(entry["date"] for entry in chain(*self.gl_entries.values()) if entry["date"])
- )
- oldest_fiscal_year = frappe.get_all(
- "Fiscal Year", fields=["year_start_date", "year_end_date"], order_by="year_start_date"
- )[0]
- # Keep on creating fiscal years
- # until smallest_ledger_entry_date is no longer smaller than the oldest fiscal year's start date
- while smallest_ledger_entry_date < oldest_fiscal_year.year_start_date:
- new_fiscal_year = frappe.get_doc({"doctype": "Fiscal Year"})
- new_fiscal_year.year_start_date = add_years(oldest_fiscal_year.year_start_date, -1)
- new_fiscal_year.year_end_date = add_years(oldest_fiscal_year.year_end_date, -1)
- if new_fiscal_year.year_start_date.year == new_fiscal_year.year_end_date.year:
- new_fiscal_year.year = new_fiscal_year.year_start_date.year
- else:
- new_fiscal_year.year = "{}-{}".format(
- new_fiscal_year.year_start_date.year, new_fiscal_year.year_end_date.year
- )
- new_fiscal_year.save()
- oldest_fiscal_year = new_fiscal_year
-
- frappe.db.commit()
- except Exception as e:
- self._log_error(e)
-
- def _migrate_entries_from_gl(self, entity):
- if entity in self.general_ledger:
- self._save_entries(entity, self.general_ledger[entity].values())
-
- def _save_entries(self, entity, entries):
- entity_method_map = {
- "Account": self._save_account,
- "TaxRate": self._save_tax_rate,
- "TaxCode": self._save_tax_code,
- "Preferences": self._save_preference,
- "Customer": self._save_customer,
- "Item": self._save_item,
- "Vendor": self._save_vendor,
- "Invoice": self._save_invoice,
- "CreditMemo": self._save_credit_memo,
- "SalesReceipt": self._save_sales_receipt,
- "RefundReceipt": self._save_refund_receipt,
- "JournalEntry": self._save_journal_entry,
- "Bill": self._save_bill,
- "VendorCredit": self._save_vendor_credit,
- "Payment": self._save_payment,
- "BillPayment": self._save_bill_payment,
- "Purchase": self._save_purchase,
- "Deposit": self._save_deposit,
- "Advance Payment": self._save_advance_payment,
- "Tax Payment": self._save_tax_payment,
- "Sales Tax Payment": self._save_tax_payment,
- "Purchase Tax Payment": self._save_tax_payment,
- "Inventory Qty Adjust": self._save_inventory_qty_adjust,
- }
- total = len(entries)
- for index, entry in enumerate(entries, start=1):
- self._publish(
- {
- "event": "progress",
- "message": _("Saving {0}").format(entity),
- "count": index,
- "total": total,
- }
- )
- entity_method_map[entity](entry)
- frappe.db.commit()
-
- def _preprocess_entries(self, entity, entries):
- entity_method_map = {
- "Account": self._preprocess_accounts,
- "TaxRate": self._preprocess_tax_rates,
- "TaxCode": self._preprocess_tax_codes,
- }
- preprocessor = entity_method_map.get(entity)
- if preprocessor:
- entries = preprocessor(entries)
- return entries
-
- def _get_gl_entries_from_section(self, section, account=None):
- if "Header" in section:
- if "id" in section["Header"]["ColData"][0]:
- account = self._get_account_name_by_id(section["Header"]["ColData"][0]["id"])
- elif "value" in section["Header"]["ColData"][0] and section["Header"]["ColData"][0]["value"]:
- # For some reason during migrating UK company, account id is not available.
- # preprocess_accounts retains name:account mapping in self.accounts
- # This mapping can then be used to obtain quickbooks_id for correspondong account
- # Rest is trivial
-
- # Some Lines in General Leder Report are shown under Not Specified
- # These should be skipped
- if section["Header"]["ColData"][0]["value"] == "Not Specified":
- return
- account_id = self.accounts[section["Header"]["ColData"][0]["value"]]["Id"]
- account = self._get_account_name_by_id(account_id)
- entries = []
- for row in section["Rows"]["Row"]:
- if row["type"] == "Data":
- data = row["ColData"]
- entries.append(
- {
- "account": account,
- "date": data[0]["value"],
- "type": data[1]["value"],
- "id": data[1].get("id"),
- "credit": frappe.utils.flt(data[2]["value"]),
- "debit": frappe.utils.flt(data[3]["value"]),
- }
- )
- if row["type"] == "Section":
- self._get_gl_entries_from_section(row, account)
- self.gl_entries.setdefault(account, []).extend(entries)
-
- def _preprocess_accounts(self, accounts):
- self.accounts = {account["Name"]: account for account in accounts}
- for account in accounts:
- if any(acc["SubAccount"] and acc["ParentRef"]["value"] == account["Id"] for acc in accounts):
- account["is_group"] = 1
- else:
- account["is_group"] = 0
- return sorted(accounts, key=lambda account: int(account["Id"]))
-
- def _save_account(self, account):
- mapping = {
- "Bank": "Asset",
- "Other Current Asset": "Asset",
- "Fixed Asset": "Asset",
- "Other Asset": "Asset",
- "Accounts Receivable": "Asset",
- "Equity": "Equity",
- "Expense": "Expense",
- "Other Expense": "Expense",
- "Cost of Goods Sold": "Expense",
- "Accounts Payable": "Liability",
- "Credit Card": "Liability",
- "Long Term Liability": "Liability",
- "Other Current Liability": "Liability",
- "Income": "Income",
- "Other Income": "Income",
- }
- # Map Quickbooks Account Types to ERPNext root_accunts and and root_type
- try:
- if not frappe.db.exists(
- {"doctype": "Account", "quickbooks_id": account["Id"], "company": self.company}
- ):
- is_child = account["SubAccount"]
- is_group = account["is_group"]
- # Create Two Accounts for every Group Account
- if is_group:
- account_id = "Group - {}".format(account["Id"])
- else:
- account_id = account["Id"]
-
- if is_child:
- parent_account = self._get_account_name_by_id(
- "Group - {}".format(account["ParentRef"]["value"])
- )
- else:
- parent_account = encode_company_abbr(
- "{} - QB".format(mapping[account["AccountType"]]), self.company
- )
-
- frappe.get_doc(
- {
- "doctype": "Account",
- "quickbooks_id": account_id,
- "account_name": self._get_unique_account_name(account["Name"]),
- "root_type": mapping[account["AccountType"]],
- "account_type": self._get_account_type(account),
- "account_currency": account["CurrencyRef"]["value"],
- "parent_account": parent_account,
- "is_group": is_group,
- "company": self.company,
- }
- ).insert()
-
- if is_group:
- # Create a Leaf account corresponding to the group account
- frappe.get_doc(
- {
- "doctype": "Account",
- "quickbooks_id": account["Id"],
- "account_name": self._get_unique_account_name(account["Name"]),
- "root_type": mapping[account["AccountType"]],
- "account_type": self._get_account_type(account),
- "account_currency": account["CurrencyRef"]["value"],
- "parent_account": self._get_account_name_by_id(account_id),
- "is_group": 0,
- "company": self.company,
- }
- ).insert()
- if account.get("AccountSubType") == "UndepositedFunds":
- self.undeposited_funds_account = self._get_account_name_by_id(account["Id"])
- self.save()
- except Exception as e:
- self._log_error(e, account)
-
- def _get_account_type(self, account):
- account_subtype_mapping = {"UndepositedFunds": "Cash"}
- account_type = account_subtype_mapping.get(account.get("AccountSubType"))
- if account_type is None:
- account_type_mapping = {
- "Accounts Payable": "Payable",
- "Accounts Receivable": "Receivable",
- "Bank": "Bank",
- "Credit Card": "Bank",
- }
- account_type = account_type_mapping.get(account["AccountType"])
- return account_type
-
- def _preprocess_tax_rates(self, tax_rates):
- self.tax_rates = {tax_rate["Id"]: tax_rate for tax_rate in tax_rates}
- return tax_rates
-
- def _save_tax_rate(self, tax_rate):
- try:
- if not frappe.db.exists(
- {
- "doctype": "Account",
- "quickbooks_id": "TaxRate - {}".format(tax_rate["Id"]),
- "company": self.company,
- }
- ):
- frappe.get_doc(
- {
- "doctype": "Account",
- "quickbooks_id": "TaxRate - {}".format(tax_rate["Id"]),
- "account_name": "{} - QB".format(tax_rate["Name"]),
- "root_type": "Liability",
- "parent_account": encode_company_abbr("{} - QB".format("Liability"), self.company),
- "is_group": "0",
- "company": self.company,
- }
- ).insert()
- except Exception as e:
- self._log_error(e, tax_rate)
-
- def _preprocess_tax_codes(self, tax_codes):
- self.tax_codes = {tax_code["Id"]: tax_code for tax_code in tax_codes}
- return tax_codes
-
- def _save_tax_code(self, tax_code):
- pass
-
- def _save_customer(self, customer):
- try:
- if not frappe.db.exists(
- {"doctype": "Customer", "quickbooks_id": customer["Id"], "company": self.company}
- ):
- try:
- receivable_account = frappe.get_all(
- "Account",
- filters={
- "account_type": "Receivable",
- "account_currency": customer["CurrencyRef"]["value"],
- "company": self.company,
- },
- )[0]["name"]
- except Exception:
- receivable_account = None
- erpcustomer = frappe.get_doc(
- {
- "doctype": "Customer",
- "quickbooks_id": customer["Id"],
- "customer_name": encode_company_abbr(customer["DisplayName"], self.company),
- "customer_type": "Individual",
- "customer_group": "Commercial",
- "default_currency": customer["CurrencyRef"]["value"],
- "accounts": [{"company": self.company, "account": receivable_account}],
- "territory": "All Territories",
- "company": self.company,
- }
- ).insert()
- if "BillAddr" in customer:
- self._create_address(erpcustomer, "Customer", customer["BillAddr"], "Billing")
- if "ShipAddr" in customer:
- self._create_address(erpcustomer, "Customer", customer["ShipAddr"], "Shipping")
- except Exception as e:
- self._log_error(e, customer)
-
- def _save_item(self, item):
- try:
- if not frappe.db.exists(
- {"doctype": "Item", "quickbooks_id": item["Id"], "company": self.company}
- ):
- if item["Type"] in ("Service", "Inventory"):
- item_dict = {
- "doctype": "Item",
- "quickbooks_id": item["Id"],
- "item_code": encode_company_abbr(item["Name"], self.company),
- "stock_uom": "Unit",
- "is_stock_item": 0,
- "item_group": "All Item Groups",
- "company": self.company,
- "item_defaults": [
- {"company": self.company, "default_warehouse": self.default_warehouse}
- ],
- }
- if "ExpenseAccountRef" in item:
- expense_account = self._get_account_name_by_id(item["ExpenseAccountRef"]["value"])
- item_dict["item_defaults"][0]["expense_account"] = expense_account
- if "IncomeAccountRef" in item:
- income_account = self._get_account_name_by_id(item["IncomeAccountRef"]["value"])
- item_dict["item_defaults"][0]["income_account"] = income_account
- frappe.get_doc(item_dict).insert()
- except Exception as e:
- self._log_error(e, item)
-
- def _allow_fraction_in_unit(self):
- frappe.db.set_value("UOM", "Unit", "must_be_whole_number", 0)
-
- def _save_vendor(self, vendor):
- try:
- if not frappe.db.exists(
- {"doctype": "Supplier", "quickbooks_id": vendor["Id"], "company": self.company}
- ):
- erpsupplier = frappe.get_doc(
- {
- "doctype": "Supplier",
- "quickbooks_id": vendor["Id"],
- "supplier_name": encode_company_abbr(vendor["DisplayName"], self.company),
- "supplier_group": "All Supplier Groups",
- "company": self.company,
- }
- ).insert()
- if "BillAddr" in vendor:
- self._create_address(erpsupplier, "Supplier", vendor["BillAddr"], "Billing")
- if "ShipAddr" in vendor:
- self._create_address(erpsupplier, "Supplier", vendor["ShipAddr"], "Shipping")
- except Exception as e:
- self._log_error(e)
-
- def _save_preference(self, preference):
- try:
- if preference["SalesFormsPrefs"]["AllowShipping"]:
- default_shipping_account_id = preference["SalesFormsPrefs"]["DefaultShippingAccount"]
- self.default_shipping_account = self._get_account_name_by_id(
- self, default_shipping_account_id
- )
- self.save()
- except Exception as e:
- self._log_error(e, preference)
-
- def _save_invoice(self, invoice):
- # Invoice can be Linked with Another Transactions
- # If any of these transactions is a "StatementCharge" or "ReimburseCharge" then in the UI
- # item list is populated from the corresponding transaction, these items are not shown in api response
- # Also as of now there is no way of fetching the corresponding transaction from api
- # We in order to correctly reflect account balance make an equivalent Journal Entry
- quickbooks_id = "Invoice - {}".format(invoice["Id"])
- if any(
- linked["TxnType"] in ("StatementCharge", "ReimburseCharge") for linked in invoice["LinkedTxn"]
- ):
- self._save_invoice_as_journal_entry(invoice, quickbooks_id)
- else:
- self._save_sales_invoice(invoice, quickbooks_id)
-
- def _save_credit_memo(self, credit_memo):
- # Credit Memo is equivalent to a return Sales Invoice
- quickbooks_id = "Credit Memo - {}".format(credit_memo["Id"])
- self._save_sales_invoice(credit_memo, quickbooks_id, is_return=True)
-
- def _save_sales_receipt(self, sales_receipt):
- # Sales Receipt is equivalent to a POS Sales Invoice
- quickbooks_id = "Sales Receipt - {}".format(sales_receipt["Id"])
- self._save_sales_invoice(sales_receipt, quickbooks_id, is_pos=True)
-
- def _save_refund_receipt(self, refund_receipt):
- # Refund Receipt is equivalent to a return POS Sales Invoice
- quickbooks_id = "Refund Receipt - {}".format(refund_receipt["Id"])
- self._save_sales_invoice(refund_receipt, quickbooks_id, is_return=True, is_pos=True)
-
- def _save_sales_invoice(self, invoice, quickbooks_id, is_return=False, is_pos=False):
- try:
- if not frappe.db.exists(
- {"doctype": "Sales Invoice", "quickbooks_id": quickbooks_id, "company": self.company}
- ):
- invoice_dict = {
- "doctype": "Sales Invoice",
- "quickbooks_id": quickbooks_id,
- # Quickbooks uses ISO 4217 Code
- # of course this gonna come back to bite me
- "currency": invoice["CurrencyRef"]["value"],
- # Exchange Rate is provided if multicurrency is enabled
- # It is not provided if multicurrency is not enabled
- "conversion_rate": invoice.get("ExchangeRate", 1),
- "posting_date": invoice["TxnDate"],
- # QuickBooks doesn't make Due Date a mandatory field this is a hack
- "due_date": invoice.get("DueDate", invoice["TxnDate"]),
- "customer": frappe.get_all(
- "Customer",
- filters={
- "quickbooks_id": invoice["CustomerRef"]["value"],
- "company": self.company,
- },
- )[0]["name"],
- "items": self._get_si_items(invoice, is_return=is_return),
- "taxes": self._get_taxes(invoice),
- # Do not change posting_date upon submission
- "set_posting_time": 1,
- # QuickBooks doesn't round total
- "disable_rounded_total": 1,
- "is_return": is_return,
- "is_pos": is_pos,
- "payments": self._get_invoice_payments(invoice, is_return=is_return, is_pos=is_pos),
- "company": self.company,
- }
- discount = self._get_discount(invoice["Line"])
- if discount:
- if invoice["ApplyTaxAfterDiscount"]:
- invoice_dict["apply_discount_on"] = "Net Total"
- else:
- invoice_dict["apply_discount_on"] = "Grand Total"
- invoice_dict["discount_amount"] = discount["Amount"]
-
- invoice_doc = frappe.get_doc(invoice_dict)
- invoice_doc.insert()
- invoice_doc.submit()
- except Exception as e:
- self._log_error(e, [invoice, invoice_dict, json.loads(invoice_doc.as_json())])
-
- def _get_si_items(self, invoice, is_return=False):
- items = []
- for line in invoice["Line"]:
- if line["DetailType"] == "SalesItemLineDetail":
- if line["SalesItemLineDetail"]["TaxCodeRef"]["value"] != "TAX":
- tax_code = line["SalesItemLineDetail"]["TaxCodeRef"]["value"]
- else:
- if "TxnTaxCodeRef" in invoice["TxnTaxDetail"]:
- tax_code = invoice["TxnTaxDetail"]["TxnTaxCodeRef"]["value"]
- else:
- tax_code = "NON"
- if line["SalesItemLineDetail"]["ItemRef"]["value"] != "SHIPPING_ITEM_ID":
- item = frappe.db.get_all(
- "Item",
- filters={
- "quickbooks_id": line["SalesItemLineDetail"]["ItemRef"]["value"],
- "company": self.company,
- },
- fields=["name", "stock_uom"],
- )[0]
- items.append(
- {
- "item_code": item["name"],
- "conversion_factor": 1,
- "uom": item["stock_uom"],
- "description": line.get(
- "Description", line["SalesItemLineDetail"]["ItemRef"]["name"]
- ),
- "qty": line["SalesItemLineDetail"]["Qty"],
- "price_list_rate": line["SalesItemLineDetail"]["UnitPrice"],
- "cost_center": self.default_cost_center,
- "warehouse": self.default_warehouse,
- "item_tax_rate": json.dumps(self._get_item_taxes(tax_code)),
- }
- )
- else:
- items.append(
- {
- "item_name": "Shipping",
- "conversion_factor": 1,
- "expense_account": self._get_account_name_by_id(
- "TaxRate - {}".format(line["SalesItemLineDetail"]["TaxCodeRef"]["value"])
- ),
- "uom": "Unit",
- "description": "Shipping",
- "income_account": self.default_shipping_account,
- "qty": 1,
- "price_list_rate": line["Amount"],
- "cost_center": self.default_cost_center,
- "warehouse": self.default_warehouse,
- "item_tax_rate": json.dumps(self._get_item_taxes(tax_code)),
- }
- )
- if is_return:
- items[-1]["qty"] *= -1
- elif line["DetailType"] == "DescriptionOnly":
- items[-1].update(
- {
- "margin_type": "Percentage",
- "margin_rate_or_amount": int(line["Description"].split("%")[0]),
- }
- )
- return items
-
- def _get_item_taxes(self, tax_code):
- tax_rates = self.tax_rates
- item_taxes = {}
- if tax_code != "NON":
- tax_code = self.tax_codes[tax_code]
- for rate_list_type in ("SalesTaxRateList", "PurchaseTaxRateList"):
- if rate_list_type in tax_code:
- for tax_rate_detail in tax_code[rate_list_type]["TaxRateDetail"]:
- if tax_rate_detail["TaxTypeApplicable"] == "TaxOnAmount":
- tax_head = self._get_account_name_by_id(
- "TaxRate - {}".format(tax_rate_detail["TaxRateRef"]["value"])
- )
- tax_rate = tax_rates[tax_rate_detail["TaxRateRef"]["value"]]
- item_taxes[tax_head] = tax_rate["RateValue"]
- return item_taxes
-
- def _get_invoice_payments(self, invoice, is_return=False, is_pos=False):
- if is_pos:
- amount = invoice["TotalAmt"]
- if is_return:
- amount = -amount
- return [
- {
- "mode_of_payment": "Cash",
- "account": self._get_account_name_by_id(invoice["DepositToAccountRef"]["value"]),
- "amount": amount,
- }
- ]
-
- def _get_discount(self, lines):
- for line in lines:
- if line["DetailType"] == "DiscountLineDetail" and "Amount" in line["DiscountLineDetail"]:
- return line
-
- def _save_invoice_as_journal_entry(self, invoice, quickbooks_id):
- try:
- accounts = []
- for line in self.general_ledger["Invoice"][invoice["Id"]]["lines"]:
- account_line = {"account": line["account"], "cost_center": self.default_cost_center}
- if line["debit"]:
- account_line["debit_in_account_currency"] = line["debit"]
- elif line["credit"]:
- account_line["credit_in_account_currency"] = line["credit"]
- if frappe.db.get_value("Account", line["account"], "account_type") == "Receivable":
- account_line["party_type"] = "Customer"
- account_line["party"] = frappe.get_all(
- "Customer",
- filters={"quickbooks_id": invoice["CustomerRef"]["value"], "company": self.company},
- )[0]["name"]
-
- accounts.append(account_line)
-
- posting_date = invoice["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, [invoice, accounts])
-
- def _save_journal_entry(self, journal_entry):
- # JournalEntry is equivalent to a Journal Entry
-
- def _get_je_accounts(lines):
- # Converts JounalEntry lines to accounts list
- posting_type_field_mapping = {
- "Credit": "credit_in_account_currency",
- "Debit": "debit_in_account_currency",
- }
- accounts = []
- for line in lines:
- if line["DetailType"] == "JournalEntryLineDetail":
- account_name = self._get_account_name_by_id(
- line["JournalEntryLineDetail"]["AccountRef"]["value"]
- )
- posting_type = line["JournalEntryLineDetail"]["PostingType"]
- accounts.append(
- {
- "account": account_name,
- posting_type_field_mapping[posting_type]: line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
- return accounts
-
- quickbooks_id = "Journal Entry - {}".format(journal_entry["Id"])
- accounts = _get_je_accounts(journal_entry["Line"])
- posting_date = journal_entry["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
-
- def __save_journal_entry(self, quickbooks_id, accounts, posting_date):
- try:
- if not frappe.db.exists(
- {"doctype": "Journal Entry", "quickbooks_id": quickbooks_id, "company": self.company}
- ):
- je = frappe.get_doc(
- {
- "doctype": "Journal Entry",
- "quickbooks_id": quickbooks_id,
- "company": self.company,
- "posting_date": posting_date,
- "accounts": accounts,
- "multi_currency": 1,
- }
- )
- je.insert()
- je.submit()
- except Exception as e:
- self._log_error(e, [accounts, json.loads(je.as_json())])
-
- def _save_bill(self, bill):
- # Bill is equivalent to a Purchase Invoice
- quickbooks_id = "Bill - {}".format(bill["Id"])
- self.__save_purchase_invoice(bill, quickbooks_id)
-
- def _save_vendor_credit(self, vendor_credit):
- # Vendor Credit is equivalent to a return Purchase Invoice
- quickbooks_id = "Vendor Credit - {}".format(vendor_credit["Id"])
- self.__save_purchase_invoice(vendor_credit, quickbooks_id, is_return=True)
-
- def __save_purchase_invoice(self, invoice, quickbooks_id, is_return=False):
- try:
- if not frappe.db.exists(
- {"doctype": "Purchase Invoice", "quickbooks_id": quickbooks_id, "company": self.company}
- ):
- credit_to_account = self._get_account_name_by_id(invoice["APAccountRef"]["value"])
- invoice_dict = {
- "doctype": "Purchase Invoice",
- "quickbooks_id": quickbooks_id,
- "currency": invoice["CurrencyRef"]["value"],
- "conversion_rate": invoice.get("ExchangeRate", 1),
- "posting_date": invoice["TxnDate"],
- "due_date": invoice.get("DueDate", invoice["TxnDate"]),
- "credit_to": credit_to_account,
- "supplier": frappe.get_all(
- "Supplier",
- filters={
- "quickbooks_id": invoice["VendorRef"]["value"],
- "company": self.company,
- },
- )[0]["name"],
- "items": self._get_pi_items(invoice, is_return=is_return),
- "taxes": self._get_taxes(invoice),
- "set_posting_time": 1,
- "disable_rounded_total": 1,
- "is_return": is_return,
- "udpate_stock": 0,
- "company": self.company,
- }
- invoice_doc = frappe.get_doc(invoice_dict)
- invoice_doc.insert()
- invoice_doc.submit()
- except Exception as e:
- self._log_error(e, [invoice, invoice_dict, json.loads(invoice_doc.as_json())])
-
- def _get_pi_items(self, purchase_invoice, is_return=False):
- items = []
- for line in purchase_invoice["Line"]:
- if line["DetailType"] == "ItemBasedExpenseLineDetail":
- if line["ItemBasedExpenseLineDetail"]["TaxCodeRef"]["value"] != "TAX":
- tax_code = line["ItemBasedExpenseLineDetail"]["TaxCodeRef"]["value"]
- else:
- if "TxnTaxCodeRef" in purchase_invoice["TxnTaxDetail"]:
- tax_code = purchase_invoice["TxnTaxDetail"]["TxnTaxCodeRef"]["value"]
- else:
- tax_code = "NON"
- item = frappe.db.get_all(
- "Item",
- filters={
- "quickbooks_id": line["ItemBasedExpenseLineDetail"]["ItemRef"]["value"],
- "company": self.company,
- },
- fields=["name", "stock_uom"],
- )[0]
- items.append(
- {
- "item_code": item["name"],
- "conversion_factor": 1,
- "uom": item["stock_uom"],
- "description": line.get(
- "Description", line["ItemBasedExpenseLineDetail"]["ItemRef"]["name"]
- ),
- "qty": line["ItemBasedExpenseLineDetail"]["Qty"],
- "price_list_rate": line["ItemBasedExpenseLineDetail"]["UnitPrice"],
- "warehouse": self.default_warehouse,
- "cost_center": self.default_cost_center,
- "item_tax_rate": json.dumps(self._get_item_taxes(tax_code)),
- }
- )
- elif line["DetailType"] == "AccountBasedExpenseLineDetail":
- if line["AccountBasedExpenseLineDetail"]["TaxCodeRef"]["value"] != "TAX":
- tax_code = line["AccountBasedExpenseLineDetail"]["TaxCodeRef"]["value"]
- else:
- if "TxnTaxCodeRef" in purchase_invoice["TxnTaxDetail"]:
- tax_code = purchase_invoice["TxnTaxDetail"]["TxnTaxCodeRef"]["value"]
- else:
- tax_code = "NON"
- items.append(
- {
- "item_name": line.get(
- "Description", line["AccountBasedExpenseLineDetail"]["AccountRef"]["name"]
- ),
- "conversion_factor": 1,
- "expense_account": self._get_account_name_by_id(
- line["AccountBasedExpenseLineDetail"]["AccountRef"]["value"]
- ),
- "uom": "Unit",
- "description": line.get(
- "Description", line["AccountBasedExpenseLineDetail"]["AccountRef"]["name"]
- ),
- "qty": 1,
- "price_list_rate": line["Amount"],
- "warehouse": self.default_warehouse,
- "cost_center": self.default_cost_center,
- "item_tax_rate": json.dumps(self._get_item_taxes(tax_code)),
- }
- )
- if is_return:
- items[-1]["qty"] *= -1
- return items
-
- def _save_payment(self, payment):
- try:
- quickbooks_id = "Payment - {}".format(payment["Id"])
- # If DepositToAccountRef is not set on payment that means it actually doesn't affect any accounts
- # No need to record such payment
- # Such payment record is created QuickBooks Payments API
- if "DepositToAccountRef" not in payment:
- return
-
- # A Payment can be linked to multiple transactions
- accounts = []
- for line in payment["Line"]:
- linked_transaction = line["LinkedTxn"][0]
- if linked_transaction["TxnType"] == "Invoice":
- si_quickbooks_id = "Invoice - {}".format(linked_transaction["TxnId"])
- # Invoice could have been saved as a Sales Invoice or a Journal Entry
- if frappe.db.exists(
- {
- "doctype": "Sales Invoice",
- "quickbooks_id": si_quickbooks_id,
- "company": self.company,
- }
- ):
- sales_invoice = frappe.get_all(
- "Sales Invoice",
- filters={
- "quickbooks_id": si_quickbooks_id,
- "company": self.company,
- },
- fields=["name", "customer", "debit_to"],
- )[0]
- reference_type = "Sales Invoice"
- reference_name = sales_invoice["name"]
- party = sales_invoice["customer"]
- party_account = sales_invoice["debit_to"]
-
- if frappe.db.exists(
- {
- "doctype": "Journal Entry",
- "quickbooks_id": si_quickbooks_id,
- "company": self.company,
- }
- ):
- journal_entry = frappe.get_doc(
- "Journal Entry",
- {
- "quickbooks_id": si_quickbooks_id,
- "company": self.company,
- },
- )
- # Invoice saved as a Journal Entry must have party and party_type set on line containing Receivable Account
- customer_account_line = next(
- filter(lambda acc: acc.party_type == "Customer", journal_entry.accounts)
- )
-
- reference_type = "Journal Entry"
- reference_name = journal_entry.name
- party = customer_account_line.party
- party_account = customer_account_line.account
-
- accounts.append(
- {
- "party_type": "Customer",
- "party": party,
- "reference_type": reference_type,
- "reference_name": reference_name,
- "account": party_account,
- "credit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- deposit_account = self._get_account_name_by_id(payment["DepositToAccountRef"]["value"])
- accounts.append(
- {
- "account": deposit_account,
- "debit_in_account_currency": payment["TotalAmt"],
- "cost_center": self.default_cost_center,
- }
- )
- posting_date = payment["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, [payment, accounts])
-
- def _save_bill_payment(self, bill_payment):
- try:
- quickbooks_id = "BillPayment - {}".format(bill_payment["Id"])
- # A BillPayment can be linked to multiple transactions
- accounts = []
- for line in bill_payment["Line"]:
- linked_transaction = line["LinkedTxn"][0]
- if linked_transaction["TxnType"] == "Bill":
- pi_quickbooks_id = "Bill - {}".format(linked_transaction["TxnId"])
- if frappe.db.exists(
- {
- "doctype": "Purchase Invoice",
- "quickbooks_id": pi_quickbooks_id,
- "company": self.company,
- }
- ):
- purchase_invoice = frappe.get_all(
- "Purchase Invoice",
- filters={
- "quickbooks_id": pi_quickbooks_id,
- "company": self.company,
- },
- fields=["name", "supplier", "credit_to"],
- )[0]
- reference_type = "Purchase Invoice"
- reference_name = purchase_invoice["name"]
- party = purchase_invoice["supplier"]
- party_account = purchase_invoice["credit_to"]
- accounts.append(
- {
- "party_type": "Supplier",
- "party": party,
- "reference_type": reference_type,
- "reference_name": reference_name,
- "account": party_account,
- "debit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- if bill_payment["PayType"] == "Check":
- bank_account_id = bill_payment["CheckPayment"]["BankAccountRef"]["value"]
- elif bill_payment["PayType"] == "CreditCard":
- bank_account_id = bill_payment["CreditCardPayment"]["CCAccountRef"]["value"]
-
- bank_account = self._get_account_name_by_id(bank_account_id)
- accounts.append(
- {
- "account": bank_account,
- "credit_in_account_currency": bill_payment["TotalAmt"],
- "cost_center": self.default_cost_center,
- }
- )
- posting_date = bill_payment["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, [bill_payment, accounts])
-
- def _save_purchase(self, purchase):
- try:
- quickbooks_id = "Purchase - {}".format(purchase["Id"])
- # Credit Bank Account
- accounts = [
- {
- "account": self._get_account_name_by_id(purchase["AccountRef"]["value"]),
- "credit_in_account_currency": purchase["TotalAmt"],
- "cost_center": self.default_cost_center,
- }
- ]
-
- # Debit Mentioned Accounts
- for line in purchase["Line"]:
- if line["DetailType"] == "AccountBasedExpenseLineDetail":
- account = self._get_account_name_by_id(
- line["AccountBasedExpenseLineDetail"]["AccountRef"]["value"]
- )
- elif line["DetailType"] == "ItemBasedExpenseLineDetail":
- account = (
- frappe.get_doc(
- "Item",
- {
- "quickbooks_id": line["ItemBasedExpenseLineDetail"]["ItemRef"]["value"],
- "company": self.company,
- },
- )
- .item_defaults[0]
- .expense_account
- )
- accounts.append(
- {
- "account": account,
- "debit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- # Debit Tax Accounts
- if "TxnTaxDetail" in purchase:
- for line in purchase["TxnTaxDetail"]["TaxLine"]:
- accounts.append(
- {
- "account": self._get_account_name_by_id(
- "TaxRate - {}".format(line["TaxLineDetail"]["TaxRateRef"]["value"])
- ),
- "debit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- # If purchase["Credit"] is set to be True then it represents a refund
- if purchase.get("Credit"):
- for account in accounts:
- if "debit_in_account_currency" in account:
- account["credit_in_account_currency"] = account["debit_in_account_currency"]
- del account["debit_in_account_currency"]
- else:
- account["debit_in_account_currency"] = account["credit_in_account_currency"]
- del account["credit_in_account_currency"]
-
- posting_date = purchase["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, [purchase, accounts])
-
- def _save_deposit(self, deposit):
- try:
- quickbooks_id = "Deposit - {}".format(deposit["Id"])
- # Debit Bank Account
- accounts = [
- {
- "account": self._get_account_name_by_id(deposit["DepositToAccountRef"]["value"]),
- "debit_in_account_currency": deposit["TotalAmt"],
- "cost_center": self.default_cost_center,
- }
- ]
-
- # Credit Mentioned Accounts
- for line in deposit["Line"]:
- if "LinkedTxn" in line:
- accounts.append(
- {
- "account": self.undeposited_funds_account,
- "credit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
- else:
- accounts.append(
- {
- "account": self._get_account_name_by_id(
- line["DepositLineDetail"]["AccountRef"]["value"]
- ),
- "credit_in_account_currency": line["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- # Debit Cashback if mentioned
- if "CashBack" in deposit:
- accounts.append(
- {
- "account": self._get_account_name_by_id(deposit["CashBack"]["AccountRef"]["value"]),
- "debit_in_account_currency": deposit["CashBack"]["Amount"],
- "cost_center": self.default_cost_center,
- }
- )
-
- posting_date = deposit["TxnDate"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, [deposit, accounts])
-
- def _save_advance_payment(self, advance_payment):
- quickbooks_id = "Advance Payment - {}".format(advance_payment["id"])
- self.__save_ledger_entry_as_je(advance_payment, quickbooks_id)
-
- def _save_tax_payment(self, tax_payment):
- quickbooks_id = "Tax Payment - {}".format(tax_payment["id"])
- self.__save_ledger_entry_as_je(tax_payment, quickbooks_id)
-
- def _save_inventory_qty_adjust(self, inventory_qty_adjust):
- quickbooks_id = "Inventory Qty Adjust - {}".format(inventory_qty_adjust["id"])
- self.__save_ledger_entry_as_je(inventory_qty_adjust, quickbooks_id)
-
- def __save_ledger_entry_as_je(self, ledger_entry, quickbooks_id):
- try:
- accounts = []
- for line in ledger_entry["lines"]:
- account_line = {"account": line["account"], "cost_center": self.default_cost_center}
- if line["credit"]:
- account_line["credit_in_account_currency"] = line["credit"]
- else:
- account_line["debit_in_account_currency"] = line["debit"]
- accounts.append(account_line)
-
- posting_date = ledger_entry["date"]
- self.__save_journal_entry(quickbooks_id, accounts, posting_date)
- except Exception as e:
- self._log_error(e, ledger_entry)
-
- def _get_taxes(self, entry):
- taxes = []
- if "TxnTaxDetail" not in entry or "TaxLine" not in entry["TxnTaxDetail"]:
- return taxes
- for line in entry["TxnTaxDetail"]["TaxLine"]:
- tax_rate = line["TaxLineDetail"]["TaxRateRef"]["value"]
- account_head = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
- tax_type_applicable = self._get_tax_type(tax_rate)
- if tax_type_applicable == "TaxOnAmount":
- taxes.append(
- {
- "charge_type": "On Net Total",
- "account_head": account_head,
- "description": account_head,
- "cost_center": self.default_cost_center,
- "rate": 0,
- }
- )
- else:
- parent_tax_rate = self._get_parent_tax_rate(tax_rate)
- parent_row_id = self._get_parent_row_id(parent_tax_rate, taxes)
- taxes.append(
- {
- "charge_type": "On Previous Row Amount",
- "row_id": parent_row_id,
- "account_head": account_head,
- "description": account_head,
- "cost_center": self.default_cost_center,
- "rate": line["TaxLineDetail"]["TaxPercent"],
- }
- )
- return taxes
-
- def _get_tax_type(self, tax_rate):
- for tax_code in self.tax_codes.values():
- for rate_list_type in ("SalesTaxRateList", "PurchaseTaxRateList"):
- if rate_list_type in tax_code:
- for tax_rate_detail in tax_code[rate_list_type]["TaxRateDetail"]:
- if tax_rate_detail["TaxRateRef"]["value"] == tax_rate:
- return tax_rate_detail["TaxTypeApplicable"]
-
- def _get_parent_tax_rate(self, tax_rate):
- parent = None
- for tax_code in self.tax_codes.values():
- for rate_list_type in ("SalesTaxRateList", "PurchaseTaxRateList"):
- if rate_list_type in tax_code:
- for tax_rate_detail in tax_code[rate_list_type]["TaxRateDetail"]:
- if tax_rate_detail["TaxRateRef"]["value"] == tax_rate:
- parent = tax_rate_detail["TaxOnTaxOrder"]
- if parent:
- for tax_rate_detail in tax_code[rate_list_type]["TaxRateDetail"]:
- if tax_rate_detail["TaxOrder"] == parent:
- return tax_rate_detail["TaxRateRef"]["value"]
-
- def _get_parent_row_id(self, tax_rate, taxes):
- tax_account = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
- for index, tax in enumerate(taxes):
- if tax["account_head"] == tax_account:
- return index + 1
-
- def _create_address(self, entity, doctype, address, address_type):
- try:
- if not frappe.db.exists({"doctype": "Address", "quickbooks_id": address["Id"]}):
- frappe.get_doc(
- {
- "doctype": "Address",
- "quickbooks_address_id": address["Id"],
- "address_title": entity.name,
- "address_type": address_type,
- "address_line1": address["Line1"],
- "city": address["City"],
- "links": [{"link_doctype": doctype, "link_name": entity.name}],
- }
- ).insert()
- except Exception as e:
- self._log_error(e, address)
-
- def _get(self, *args, **kwargs):
- kwargs["headers"] = {
- "Accept": "application/json",
- "Authorization": f"Bearer {self.access_token}",
- }
- response = requests.get(*args, **kwargs)
- # HTTP Status code 401 here means that the access_token is expired
- # We can refresh tokens and retry
- # However limitless recursion does look dangerous
- if response.status_code == 401:
- self._refresh_tokens()
- response = self._get(*args, **kwargs)
- return response
-
- def _get_account_name_by_id(self, quickbooks_id):
- return frappe.get_all("Account", filters={"quickbooks_id": quickbooks_id, "company": self.company})[
- 0
- ]["name"]
-
- def _publish(self, *args, **kwargs):
- frappe.publish_realtime("quickbooks_progress_update", *args, **kwargs, user=self.modified_by)
-
- def _get_unique_account_name(self, quickbooks_name, number=0):
- if number:
- quickbooks_account_name = f"{quickbooks_name} - {number} - QB"
- else:
- quickbooks_account_name = f"{quickbooks_name} - QB"
- company_encoded_account_name = encode_company_abbr(quickbooks_account_name, self.company)
- if frappe.db.exists(
- {"doctype": "Account", "name": company_encoded_account_name, "company": self.company}
- ):
- unique_account_name = self._get_unique_account_name(quickbooks_name, number + 1)
- else:
- unique_account_name = quickbooks_account_name
- return unique_account_name
-
- def _log_error(self, execption, data=""):
- frappe.log_error(
- title="QuickBooks Migration Error",
- message="\n".join(
- [
- "Data",
- json.dumps(data, sort_keys=True, indent=4, separators=(",", ": ")),
- "Exception",
- traceback.format_exc(),
- ]
- ),
- )
-
- def set_indicator(self, status):
- self.status = status
- self.save()
- frappe.db.commit()
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/test_quickbooks_migrator.py b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/test_quickbooks_migrator.py
deleted file mode 100644
index 92e79ec8a4a..00000000000
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/test_quickbooks_migrator.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-
-class TestQuickBooksMigrator(unittest.TestCase):
- pass
diff --git a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
deleted file mode 100644
index 556c332634d..00000000000
--- a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.provide("erpnext.tally_migration");
-
-frappe.ui.form.on("Tally Migration", {
- onload: function (frm) {
- let reload_status = true;
- frappe.realtime.on("tally_migration_progress_update", function (data) {
- if (reload_status) {
- frappe.model.with_doc(frm.doc.doctype, frm.doc.name, () => {
- frm.refresh_header();
- });
- reload_status = false;
- }
- frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
- let error_occurred = data.count === -1;
- if (data.count == data.total || error_occurred) {
- window.setTimeout(
- (title) => {
- frm.dashboard.hide_progress(title);
- frm.reload_doc();
- if (error_occurred) {
- frappe.msgprint({
- message: __("An error has occurred during {0}. Check {1} for more details", [
- repl(
- "%(tally_document)s",
- {
- tally_document: frm.docname,
- }
- ),
- "Error Log",
- ]),
- title: __("Tally Migration Error"),
- indicator: "red",
- });
- }
- },
- 2000,
- data.title
- );
- }
- });
- },
-
- refresh: function (frm) {
- frm.trigger("show_logs_preview");
- erpnext.tally_migration.failed_import_log = JSON.parse(frm.doc.failed_import_log);
- erpnext.tally_migration.fixed_errors_log = JSON.parse(frm.doc.fixed_errors_log);
-
- ["default_round_off_account", "default_warehouse", "default_cost_center"].forEach((account) => {
- frm.toggle_reqd(account, frm.doc.is_master_data_imported === 1);
- frm.toggle_enable(account, frm.doc.is_day_book_data_processed != 1);
- });
-
- if (frm.doc.master_data && !frm.doc.is_master_data_imported) {
- if (frm.doc.is_master_data_processed) {
- if (frm.doc.status != "Importing Master Data") {
- frm.events.add_button(frm, __("Import Master Data"), "import_master_data");
- }
- } else {
- if (frm.doc.status != "Processing Master Data") {
- frm.events.add_button(frm, __("Process Master Data"), "process_master_data");
- }
- }
- }
-
- if (frm.doc.day_book_data && !frm.doc.is_day_book_data_imported) {
- if (frm.doc.is_day_book_data_processed) {
- if (frm.doc.status != "Importing Day Book Data") {
- frm.events.add_button(frm, __("Import Day Book Data"), "import_day_book_data");
- }
- } else {
- if (frm.doc.status != "Processing Day Book Data") {
- frm.events.add_button(frm, __("Process Day Book Data"), "process_day_book_data");
- }
- }
- }
- },
-
- erpnext_company: function (frm) {
- frappe.db.exists("Company", frm.doc.erpnext_company).then((exists) => {
- if (exists) {
- frappe.msgprint(
- __(
- "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts",
- [frm.doc.erpnext_company]
- )
- );
- }
- });
- },
-
- add_button: function (frm, label, method) {
- frm.add_custom_button(label, () => {
- frm.call({
- doc: frm.doc,
- method: method,
- freeze: true,
- });
- frm.reload_doc();
- });
- },
-
- render_html_table(frm, shown_logs, hidden_logs, field) {
- if (shown_logs && shown_logs.length > 0) {
- frm.toggle_display(field, true);
- } else {
- frm.toggle_display(field, false);
- return;
- }
- let rows = erpnext.tally_migration.get_html_rows(shown_logs, field);
- let rows_head, table_caption;
-
- let table_footer =
- hidden_logs && hidden_logs.length > 0
- ? `| ${__("#")} | -${__("DocType")} | - ${rows_head} -
|---|
${traceback}
- ${JSON.stringify(erpnext.tally_migration.cleanDoc(doc), null, 1)}
- {0}.
- - """ + content = "{}
".format( + _("You have been invited to collaborate on the project: {0}").format(url) + ) for user in self.users: if user.welcome_email_sent == 0: frappe.sendmail( user.user, subject=_("Project Collaboration Invitation"), - content=content.format(*messages), + content=content, ) user.welcome_email_sent = 1 @@ -669,31 +687,8 @@ def update_project_sales_billing(): return # Else simply fallback to Daily - exists_query = "(SELECT 1 from `tab{doctype}` where docstatus = 1 and project = `tabProject`.name)" - project_map = {} - for project_details in frappe.db.sql( - """ - SELECT name, 1 as order_exists, null as invoice_exists from `tabProject` where - exists {order_exists} - union - SELECT name, null as order_exists, 1 as invoice_exists from `tabProject` where - exists {invoice_exists} - """.format( - order_exists=exists_query.format(doctype="Sales Order"), - invoice_exists=exists_query.format(doctype="Sales Invoice"), - ), - as_dict=True, - ): - project = project_map.setdefault( - project_details.name, frappe.get_doc("Project", project_details.name) - ) - if project_details.order_exists: - project.update_sales_amount() - if project_details.invoice_exists: - project.update_billed_amount() - - for project in project_map.values(): - project.save() + for project in frappe.get_all("Project", filters={"status": ["!=", "Cancelled"]}): + frappe.get_doc("Project", project.name).save() @frappe.whitelist() @@ -744,7 +739,6 @@ def get_users_email(doc): def calculate_total_purchase_cost(project: str | None = None): if project: pitem = qb.DocType("Purchase Invoice Item") - frappe.qb.DocType("Purchase Invoice Item") total_purchase_cost = ( qb.from_(pitem) .select(Sum(pitem.base_net_amount)) diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py index 1b7460f7a2a..e5996c2da9d 100644 --- a/erpnext/projects/doctype/project/test_project.py +++ b/erpnext/projects/doctype/project/test_project.py @@ -199,6 +199,34 @@ class TestProject(FrappeTestCase): if not pt.is_group: self.assertIsNotNone(pt.parent_task) + def test_project_having_no_tasks_complete(self): + project_name = "Test Project - No Tasks Completion" + frappe.db.sql(""" delete from tabTask where project = %s """, project_name) + frappe.delete_doc("Project", project_name) + + project = frappe.get_doc( + { + "doctype": "Project", + "project_name": project_name, + "status": "Open", + "expected_start_date": nowdate(), + "company": "_Test Company", + } + ).insert() + + tasks = frappe.get_all( + "Task", + ["subject", "exp_end_date", "depends_on_tasks", "name", "parent_task"], + dict(project=project.name), + order_by="creation asc", + ) + + self.assertEqual(project.status, "Open") + self.assertEqual(len(tasks), 0) + project.status = "Completed" + project.save() + self.assertEqual(project.status, "Completed") + def get_project(name, template): project = frappe.get_doc( diff --git a/erpnext/projects/doctype/project/test_records.json b/erpnext/projects/doctype/project/test_records.json index 567f359b50d..1482336631b 100644 --- a/erpnext/projects/doctype/project/test_records.json +++ b/erpnext/projects/doctype/project/test_records.json @@ -1,6 +1,7 @@ [ { "project_name": "_Test Project", - "status": "Open" + "status": "Open", + "company": "_Test Company" } ] \ No newline at end of file diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json index 2f452cc2d75..e82bbfab7bf 100644 --- a/erpnext/projects/doctype/project_user/project_user.json +++ b/erpnext/projects/doctype/project_user/project_user.json @@ -12,6 +12,7 @@ "full_name", "welcome_email_sent", "view_attachments", + "hide_timesheets", "section_break_5", "project_status" ], @@ -64,6 +65,13 @@ "in_list_view": 1, "label": "View attachments" }, + { + "columns": 2, + "default": "0", + "fieldname": "hide_timesheets", + "fieldtype": "Check", + "label": "Hide timesheets" + }, { "fieldname": "section_break_5", "fieldtype": "Section Break" diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.json b/erpnext/projects/doctype/projects_settings/projects_settings.json index 7fa1558a76f..2a840b4275c 100644 --- a/erpnext/projects/doctype/projects_settings/projects_settings.json +++ b/erpnext/projects/doctype/projects_settings/projects_settings.json @@ -1,189 +1,69 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2018-02-21 16:42:13.882879", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "actions": [], + "creation": "2018-02-21 16:42:13.882879", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "timesheet_sb", + "ignore_workstation_time_overlap", + "ignore_user_time_overlap", + "ignore_employee_time_overlap", + "fetch_timesheet_in_sales_invoice" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "timesheet_sb", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Timesheets", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "timesheet_sb", + "fieldtype": "Section Break", + "label": "Timesheets" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "ignore_workstation_time_overlap", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Ignore Workstation Time Overlap", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "ignore_workstation_time_overlap", + "fieldtype": "Check", + "label": "Ignore Workstation Time Overlap" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "ignore_user_time_overlap", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Ignore User Time Overlap", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "ignore_user_time_overlap", + "fieldtype": "Check", + "label": "Ignore User Time Overlap" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "ignore_employee_time_overlap", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Ignore Employee Time Overlap", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "default": "0", + "fieldname": "ignore_employee_time_overlap", + "fieldtype": "Check", + "label": "Ignore Employee Time Overlap" + }, + { + "default": "0", + "fieldname": "fetch_timesheet_in_sales_invoice", + "fieldtype": "Check", + "label": "Fetch Timesheet in Sales Invoice" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 1, - "istable": 0, - "max_attachments": 0, - "modified": "2018-02-21 16:42:42.357209", - "modified_by": "Administrator", - "module": "Projects", - "name": "Projects Settings", - "name_case": "", - "owner": "Administrator", + ], + "issingle": 1, + "links": [], + "modified": "2025-02-25 22:48:03.164862", + "modified_by": "Administrator", + "module": "Projects", + "name": "Projects Settings", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 } \ No newline at end of file diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.py b/erpnext/projects/doctype/projects_settings/projects_settings.py index 9d940184d98..4b1530fee8e 100644 --- a/erpnext/projects/doctype/projects_settings/projects_settings.py +++ b/erpnext/projects/doctype/projects_settings/projects_settings.py @@ -14,6 +14,7 @@ class ProjectsSettings(Document): if TYPE_CHECKING: from frappe.types import DF + fetch_timesheet_in_sales_invoice: DF.Check ignore_employee_time_overlap: DF.Check ignore_user_time_overlap: DF.Check ignore_workstation_time_overlap: DF.Check diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index c03c99b25d5..5eae55d71c5 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -153,14 +153,14 @@ class Task(NestedSet): def validate_parent_template_task(self): if self.parent_task: if not frappe.db.get_value("Task", self.parent_task, "is_template"): - parent_task_format = f"""{self.parent_task}""" + parent_task_format = f"""{self.parent_task}""" frappe.throw(_("Parent Task {0} is not a Template Task").format(parent_task_format)) def validate_depends_on_tasks(self): if self.depends_on: for task in self.depends_on: if not frappe.db.get_value("Task", task.task, "is_template"): - dependent_task_format = f"""{task.task}""" + dependent_task_format = f"""{task.task}""" frappe.throw(_("Dependent Task {0} is not a Template Task").format(dependent_task_format)) def validate_completed_on(self): diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py index da042f36aef..1e2688daf4d 100644 --- a/erpnext/projects/doctype/timesheet/test_timesheet.py +++ b/erpnext/projects/doctype/timesheet/test_timesheet.py @@ -5,6 +5,7 @@ import datetime import unittest import frappe +from frappe.tests.utils import change_settings from frappe.utils import add_to_date, now_datetime, nowdate from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice @@ -53,6 +54,7 @@ class TestTimesheet(unittest.TestCase): self.assertEqual(item.qty, 2.00) self.assertEqual(item.rate, 50.00) + @change_settings("Projects Settings", {"fetch_timesheet_in_sales_invoice": 1}) def test_timesheet_billing_based_on_project(self): emp = make_employee("test_employee_6@salary.com") project = frappe.get_value("Project", {"project_name": "_Test Project"}) @@ -62,6 +64,7 @@ class TestTimesheet(unittest.TestCase): ) sales_invoice = create_sales_invoice(do_not_save=True) sales_invoice.project = project + sales_invoice.add_timesheet_data() sales_invoice.submit() ts = frappe.get_doc("Timesheet", timesheet.name) diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js index 9aba75b3ce9..168b891e98c 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.js +++ b/erpnext/projects/doctype/timesheet/timesheet.js @@ -58,10 +58,10 @@ frappe.ui.form.on("Timesheet", { } if (frm.doc.docstatus < 1) { - let button = "Start Timer"; + let button = __("Start Timer"); $.each(frm.doc.time_logs || [], function (i, row) { if (row.from_time <= frappe.datetime.now_datetime() && !row.completed) { - button = "Resume Timer"; + button = __("Resume Timer"); } }); diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index fb15b507efb..09fdfad66ba 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -22,6 +22,46 @@ class OverWorkLoggedError(frappe.ValidationError): class Timesheet(Document): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.projects.doctype.timesheet_detail.timesheet_detail import TimesheetDetail + + amended_from: DF.Link | None + base_total_billable_amount: DF.Currency + base_total_billed_amount: DF.Currency + base_total_costing_amount: DF.Currency + company: DF.Link | None + currency: DF.Link | None + customer: DF.Link | None + department: DF.Link | None + employee: DF.Link | None + employee_name: DF.Data | None + end_date: DF.Date | None + exchange_rate: DF.Float + naming_series: DF.Literal["TS-.YYYY.-"] + note: DF.TextEditor | None + parent_project: DF.Link | None + per_billed: DF.Percent + sales_invoice: DF.Link | None + start_date: DF.Date | None + status: DF.Literal["Draft", "Submitted", "Billed", "Payslip", "Completed", "Cancelled"] + time_logs: DF.Table[TimesheetDetail] + title: DF.Data | None + total_billable_amount: DF.Currency + total_billable_hours: DF.Float + total_billed_amount: DF.Currency + total_billed_hours: DF.Float + total_costing_amount: DF.Currency + total_hours: DF.Float + user: DF.Link | None + # end: auto-generated types + def validate(self): self.set_status() self.validate_dates() @@ -126,13 +166,17 @@ class Timesheet(Document): if data.task and data.task not in tasks: task = frappe.get_doc("Task", data.task) task.update_time_and_costing() - task.save() + task.save(ignore_permissions=True) tasks.append(data.task) - elif data.project and data.project not in projects: - frappe.get_doc("Project", data.project).update_project() + if data.project and data.project not in projects: projects.append(data.project) + for project in projects: + project_doc = frappe.get_doc("Project", project) + project_doc.update_project() + project_doc.save(ignore_permissions=True) + def validate_dates(self): for data in self.time_logs: if data.from_time and data.to_time and time_diff_in_hours(data.to_time, data.from_time) < 0: diff --git a/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py b/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py index 766e40e319c..dc3da259662 100644 --- a/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py +++ b/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py @@ -77,7 +77,7 @@ def get_chart_data(data): charts = { "data": { "labels": [_("On Track"), _("Delayed")], - "datasets": [{"name": "Delayed", "values": [on_track, delay]}], + "datasets": [{"name": _("Delayed"), "values": [on_track, delay]}], }, "type": "percentage", "colors": ["#84D5BA", "#CB4B5F"], diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py index 7a35fd236a0..261517f02c6 100644 --- a/erpnext/projects/report/project_summary/project_summary.py +++ b/erpnext/projects/report/project_summary/project_summary.py @@ -15,6 +15,7 @@ def execute(filters=None): filters=filters, fields=[ "name", + "project_name", "status", "percent_complete", "expected_start_date", @@ -48,6 +49,11 @@ def get_columns(): "options": "Project", "width": 200, }, + { + "fieldname": "project_name", + "label": _("Project Name"), + "width": 200, + }, { "fieldname": "project_type", "label": _("Type"), @@ -82,7 +88,7 @@ def get_chart_data(data): overdue = [] for project in data: - labels.append(project.name) + labels.append(project.project_name) total.append(project.total_tasks) completed.append(project.completed_tasks) overdue.append(project.overdue_tasks) diff --git a/erpnext/projects/workspace/projects/projects.json b/erpnext/projects/workspace/projects/projects.json index 94ae9c04a40..19c94bc8f90 100644 --- a/erpnext/projects/workspace/projects/projects.json +++ b/erpnext/projects/workspace/projects/projects.json @@ -210,7 +210,7 @@ "doc_view": "List", "label": "Learn Project Management", "type": "URL", - "url": "https://frappe.school/courses/project-management?utm_source=in_app" + "url": "https://school.frappe.io/lms/courses/project-management?utm_source=in_app" }, { "color": "Blue", @@ -245,4 +245,4 @@ } ], "title": "Projects" -} \ No newline at end of file +} diff --git a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js index 4aa087e99cf..ad5fd528cda 100644 --- a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js +++ b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js @@ -16,7 +16,7 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager { } make_dt() { - var me = this; + const me = this; frappe.call({ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions", args: { @@ -193,6 +193,7 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager { args: { bank_account: this.bank_account, till_date: this.bank_statement_to_date, + company: this.company, }, callback: (response) => (this.cleared_balance = response.message), }); diff --git a/erpnext/public/js/bom_configurator/bom_configurator.bundle.js b/erpnext/public/js/bom_configurator/bom_configurator.bundle.js index 5061be9d20a..6d24751792c 100644 --- a/erpnext/public/js/bom_configurator/bom_configurator.bundle.js +++ b/erpnext/public/js/bom_configurator/bom_configurator.bundle.js @@ -25,6 +25,9 @@ class BOMConfigurator { }; frappe.views.trees["BOM Configurator"] = new frappe.views.TreeView(options); + let node = frappe.views.trees["BOM Configurator"].tree.root_node; + frappe.views.trees["BOM Configurator"].tree.show_toolbar(node); + frappe.views.trees["BOM Configurator"].tree.load_children(node, true); this.tree_view = frappe.views.trees["BOM Configurator"]; } @@ -137,17 +140,17 @@ class BOMConfigurator { btnClass: "hidden-xs", }, { - label: __("Expand All"), + label: __("Collapse All"), click: function (node) { let view = frappe.views.trees["BOM Configurator"]; if (!node.expanded) { view.tree.load_children(node, true); $(node.parent[0]).find(".tree-children").show(); - node.$toolbar.find(".expand-all-btn").html("Collapse All"); + node.$toolbar.find(".expand-all-btn").html(__("Collapse All")); } else { node.$tree_link.trigger("click"); - node.$toolbar.find(".expand-all-btn").html("Expand All"); + node.$toolbar.find(".expand-all-btn").html(__("Expand All")); } }, condition: function (node) { @@ -187,10 +190,10 @@ class BOMConfigurator { if (!node.expanded) { view.tree.load_children(node, true); $(node.parent[0]).find(".tree-children").show(); - node.$toolbar.find(".expand-all-btn").html("Collapse All"); + node.$toolbar.find(".expand-all-btn").html(__("Collapse All")); } else { node.$tree_link.trigger("click"); - node.$toolbar.find(".expand-all-btn").html("Expand All"); + node.$toolbar.find(".expand-all-btn").html(__("Expand All")); } }, condition: function (node) { @@ -207,6 +210,13 @@ class BOMConfigurator { [ { label: __("Item"), fieldname: "item_code", fieldtype: "Link", options: "Item", reqd: 1 }, { label: __("Qty"), fieldname: "qty", default: 1.0, fieldtype: "Float", reqd: 1 }, + { + label: __("Allow Alternative Item"), + fieldname: "allow_alternative_item", + default: 1.0, + fieldtype: "Check", + reqd: 1, + }, ], (data) => { if (!node.data.parent_id) { @@ -221,6 +231,7 @@ class BOMConfigurator { item_code: data.item_code, fg_reference_id: node.data.name || this.frm.doc.name, qty: data.qty, + allow_alternative_item: data.allow_alternative_item, }, callback: (r) => { view.events.load_tree(r, node); @@ -255,6 +266,7 @@ class BOMConfigurator { fg_item: node.data.value, fg_reference_id: node.data.name || this.frm.doc.name, bom_item: bom_item, + allow_alternative_item: bom_item.allow_alternative_item, }, callback: (r) => { view.events.load_tree(r, node); @@ -275,6 +287,14 @@ class BOMConfigurator { reqd: 1, read_only: read_only, }, + { + label: __("Allow Alternative Item"), + fieldname: "allow_alternative_item", + default: 1.0, + fieldtype: "Check", + reqd: 1, + read_only: read_only, + }, { fieldtype: "Column Break" }, { label: __("Qty"), @@ -283,6 +303,13 @@ class BOMConfigurator { fieldtype: "Float", reqd: 1, read_only: read_only, + change() { + this.layout.fields_dict.items.grid.data.forEach((row) => { + row.qty = flt(this.value); + }); + + this.layout.fields_dict.items.grid.refresh(); + }, }, { fieldtype: "Section Break" }, { diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js index c39fb524264..c7b08f1dc15 100644 --- a/erpnext/public/js/controllers/accounts.js +++ b/erpnext/public/js/controllers/accounts.js @@ -160,7 +160,7 @@ erpnext.accounts.taxes = { let tax = frappe.get_doc(cdt, cdn); try { me.validate_taxes_and_charges(cdt, cdn); - me.validate_inclusive_tax(tax); + me.validate_inclusive_tax(tax, frm); } catch(e) { tax.included_in_print_rate = 0; refresh_field("included_in_print_rate", tax.name, tax.parentfield); @@ -170,7 +170,8 @@ erpnext.accounts.taxes = { }); }, - validate_inclusive_tax: function(tax) { + validate_inclusive_tax: function(tax, frm) { + this.frm = this.frm || frm; let actual_type_error = function() { var msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx]) frappe.throw(msg); @@ -186,12 +187,12 @@ erpnext.accounts.taxes = { if(tax.charge_type == "Actual") { // inclusive tax cannot be of type Actual actual_type_error(); - } else if(tax.charge_type == "On Previous Row Amount" && + } else if(tax.charge_type == "On Previous Row Amount" && this.frm && !cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_print_rate) ) { // referred row should also be an inclusive tax on_previous_row_error(tax.row_id); - } else if(tax.charge_type == "On Previous Row Total") { + } else if(tax.charge_type == "On Previous Row Total" && this.frm) { var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id), function(t) { return cint(t.included_in_print_rate) ? null : t; }); if(taxes_not_included.length > 0) { diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index b5a8b757706..cbc59867e46 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -25,6 +25,14 @@ erpnext.buying = { }; }); + this.frm.set_query("project", function (doc) { + return { + filters: { + company: doc.company, + }, + }; + }); + if (this.frm.doc.__islocal && frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) { @@ -145,6 +153,25 @@ erpnext.buying = { }); } + company(){ + if(!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return; + + frappe.call({ + method: "erpnext.setup.doctype.company.company.get_billing_shipping_address", + args: { + name: this.frm.doc.company, + billing_address:this.frm.doc.billing_address, + shipping_address: this.frm.doc.shipping_address + }, + callback: (r) => { + this.frm.set_value("billing_address", r.message.primary_address || ""); + + if(!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return; + this.frm.set_value("shipping_address", r.message.shipping_address || ""); + }, + }); + } + supplier_address() { erpnext.utils.get_address_display(this.frm); erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address"); @@ -167,7 +194,7 @@ erpnext.buying = { } qty(doc, cdt, cdn) { - if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && (doc.update_stock || doc.is_return))) { + if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) { this.calculate_received_qty(doc, cdt, cdn) } super.qty(doc, cdt, cdn); @@ -342,12 +369,15 @@ erpnext.buying = { add_serial_batch_bundle(doc, cdt, cdn) { let item = locals[cdt][cdn]; let me = this; + let fields = ["has_batch_no", "has_serial_no"]; - frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) + frappe.db.get_value("Item", item.item_code, fields) .then((r) => { if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) { - item.has_serial_no = r.message.has_serial_no; - item.has_batch_no = r.message.has_batch_no; + fields.forEach((field) => { + item[field] = r.message[field]; + }); + item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward"; item.is_rejected = false; @@ -380,13 +410,16 @@ erpnext.buying = { add_serial_batch_for_rejected_qty(doc, cdt, cdn) { let item = locals[cdt][cdn]; let me = this; + let fields = ["has_batch_no", "has_serial_no"]; - frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) + frappe.db.get_value("Item", item.item_code, fields) .then((r) => { if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) { - item.has_serial_no = r.message.has_serial_no; - item.has_batch_no = r.message.has_batch_no; - item.type_of_transaction = item.rejected_qty > 0 ? "Inward" : "Outward"; + fields.forEach((field) => { + item[field] = r.message[field]; + }); + + item.type_of_transaction = !doc.is_return > 0 ? "Inward" : "Outward"; item.is_rejected = true; new erpnext.SerialBatchPackageSelector( @@ -398,7 +431,7 @@ erpnext.buying = { } let update_values = { - "serial_and_batch_bundle": r.name, + "rejected_serial_and_batch_bundle": r.name, "use_serial_batch_fields": 0, "rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item)) } diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index adf05ffb154..4bc787f85ff 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -103,7 +103,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { this.determine_exclusive_rate(); this.calculate_net_total(); this.calculate_taxes(); - this.manipulate_grand_total_for_inclusive_tax(); + this.adjust_grand_total_for_inclusive_tax(); this.calculate_totals(); this._cleanup(); } @@ -128,7 +128,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { calculate_item_values() { var me = this; if (!this.discount_amount_applied) { - for (const item of this.frm._items || []) { + for (const item of this.frm.doc.items || []) { frappe.model.round_floats_in(item); item.net_rate = item.rate; item.qty = item.qty === undefined ? (me.frm.doc.is_return ? -1 : 1) : item.qty; @@ -185,7 +185,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { if (!this.discount_amount_applied) { erpnext.accounts.taxes.validate_taxes_and_charges(tax.doctype, tax.name); - erpnext.accounts.taxes.validate_inclusive_tax(tax); + erpnext.accounts.taxes.validate_inclusive_tax(tax, this.frm); } frappe.model.round_floats_in(tax); }); @@ -227,7 +227,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { }); if(has_inclusive_tax==false) return; - $.each(me.frm._items || [], function(n, item) { + $.each(this.frm.doc.items || [], function(n, item) { var item_tax_map = me._load_item_tax_rate(item.item_tax_rate); var cumulated_tax_fraction = 0.0; var total_inclusive_tax_amount_per_qty = 0; @@ -250,7 +250,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { if(!me.discount_amount_applied && item.qty && (total_inclusive_tax_amount_per_qty || cumulated_tax_fraction)) { var amount = flt(item.amount) - total_inclusive_tax_amount_per_qty; - item.net_amount = flt(amount / (1 + cumulated_tax_fraction)); + item.net_amount = flt(amount / (1 + cumulated_tax_fraction), precision("net_amount", item)); item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0; me.set_in_company_currency(item, ["net_rate", "net_amount"]); @@ -305,6 +305,8 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { me.frm.doc.net_total += item.net_amount; me.frm.doc.base_net_total += item.base_net_amount; }); + + frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]); } calculate_shipping_charges() { @@ -341,7 +343,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { calculate_taxes() { var me = this; - this.frm.doc.rounding_adjustment = 0; + this.grand_total_diff = 0; var actual_tax_dict = {}; // maintain actual tax rate based on idx @@ -415,7 +417,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { // adjust Discount Amount loss in last tax iteration if ((i == me.frm.doc["taxes"].length - 1) && me.discount_amount_applied && me.frm.doc.apply_discount_on == "Grand Total" && me.frm.doc.discount_amount) { - me.frm.doc.rounding_adjustment = flt(me.frm.doc.grand_total - + me.grand_total_diff = flt(me.frm.doc.grand_total - flt(me.frm.doc.discount_amount) - tax.total, precision("rounding_adjustment")); } } @@ -523,9 +525,18 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { } } + /** + * @deprecated Use adjust_grand_total_for_inclusive_tax instead. + */ manipulate_grand_total_for_inclusive_tax() { + // for backward compatablility - if in case used by an external application + this.adjust_grand_total_for_inclusive_tax() + } + + adjust_grand_total_for_inclusive_tax() { var me = this; - // if fully inclusive taxes and diff + + // if any inclusive taxes and diff if (this.frm.doc["taxes"] && this.frm.doc["taxes"].length) { var any_inclusive_tax = false; $.each(this.frm.doc.taxes || [], function(i, d) { @@ -536,7 +547,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { var non_inclusive_tax_amount = frappe.utils.sum($.map(this.frm.doc.taxes || [], function(d) { if(!d.included_in_print_rate) { - return flt(d.tax_amount_after_discount_amount); + let tax_amount = d.category === "Valuation" ? 0 : d.tax_amount_after_discount_amount; + if (d.add_deduct_tax === "Deduct") tax_amount *= -1; + return tax_amount; } } )); @@ -550,7 +563,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { diff = flt(diff, precision("rounding_adjustment")); if ( diff && Math.abs(diff) <= (5.0 / Math.pow(10, precision("tax_amount", last_tax))) ) { - me.frm.doc.rounding_adjustment = diff; + me.grand_total_diff = diff; } } } @@ -561,7 +574,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { var me = this; var tax_count = this.frm.doc["taxes"] ? this.frm.doc["taxes"].length : 0; this.frm.doc.grand_total = flt(tax_count - ? this.frm.doc["taxes"][tax_count - 1].total + flt(this.frm.doc.rounding_adjustment) + ? this.frm.doc["taxes"][tax_count - 1].total + this.grand_total_diff : this.frm.doc.net_total); if(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)) { @@ -593,9 +606,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { } this.frm.doc.total_taxes_and_charges = flt(this.frm.doc.grand_total - this.frm.doc.net_total - - flt(this.frm.doc.rounding_adjustment), precision("total_taxes_and_charges")); + - this.grand_total_diff, precision("total_taxes_and_charges")); - this.set_in_company_currency(this.frm.doc, ["total_taxes_and_charges", "rounding_adjustment"]); + this.set_in_company_currency(this.frm.doc, ["total_taxes_and_charges"]); // Round grand total as per precision frappe.model.round_floats_in(this.frm.doc, ["grand_total", "base_grand_total"]); @@ -615,13 +628,14 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { if (cint(disable_rounded_total)) { this.frm.doc.rounded_total = 0; this.frm.doc.base_rounded_total = 0; + this.frm.doc.rounding_adjustment = 0; return; } if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) { this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.grand_total, this.frm.doc.currency, precision("rounded_total")); - this.frm.doc.rounding_adjustment += flt(this.frm.doc.rounded_total - this.frm.doc.grand_total, + this.frm.doc.rounding_adjustment = flt(this.frm.doc.rounded_total - this.frm.doc.grand_total, precision("rounding_adjustment")); this.set_in_company_currency(this.frm.doc, ["rounding_adjustment", "rounded_total"]); @@ -630,7 +644,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { _cleanup() { this.frm.doc.base_in_words = this.frm.doc.in_words = ""; - let items = this.frm._items; + let items = this.frm.doc.items; if(items && items.length) { if(!frappe.meta.get_docfield(items[0].doctype, "item_tax_amount", this.frm.doctype)) { @@ -683,23 +697,26 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { return; } - var total_for_discount_amount = this.get_total_for_discount_amount(); - var net_total = 0; + const total_for_discount_amount = this.get_total_for_discount_amount(); + let net_total = 0; + let expected_net_total = 0; + // calculate item amount after Discount Amount if (total_for_discount_amount) { $.each(this.frm._items || [], function(i, item) { distributed_amount = flt(me.frm.doc.discount_amount) * item.net_amount / total_for_discount_amount; - item.net_amount = flt(item.net_amount - distributed_amount, - precision("base_amount", item)); + + const adjusted_net_amount = item.net_amount - distributed_amount; + expected_net_total += adjusted_net_amount + item.net_amount = flt(adjusted_net_amount, precision("net_amount", item)); net_total += item.net_amount; - // discount amount rounding loss adjustment if no taxes - if ((!(me.frm.doc.taxes || []).length || total_for_discount_amount==me.frm.doc.net_total || (me.frm.doc.apply_discount_on == "Net Total")) - && i == (me.frm._items || []).length - 1) { - var discount_amount_loss = flt(me.frm.doc.net_total - net_total - - me.frm.doc.discount_amount, precision("net_total")); - item.net_amount = flt(item.net_amount + discount_amount_loss, - precision("net_amount", item)); + // discount amount rounding adjustment + // assignment to rounding_difference is intentional + const rounding_difference = flt(expected_net_total - net_total, precision("net_total")); + if (rounding_difference) { + item.net_amount = flt(item.net_amount + rounding_difference, precision("net_amount", item)); + net_total += rounding_difference; } item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0; me.set_in_company_currency(item, ["net_rate", "net_amount"]); @@ -712,29 +729,38 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { } get_total_for_discount_amount() { - if(this.frm.doc.apply_discount_on == "Net Total") { + if(this.frm.doc.apply_discount_on == "Net Total") return this.frm.doc.net_total; - } else { - var total_actual_tax = 0.0; - var actual_taxes_dict = {}; - $.each(this.frm.doc["taxes"] || [], function(i, tax) { - if (["Actual", "On Item Quantity"].includes(tax.charge_type)) { - var tax_amount = (tax.category == "Valuation") ? 0.0 : tax.tax_amount; - tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0; - actual_taxes_dict[tax.idx] = tax_amount; - } else if (actual_taxes_dict[tax.row_id] !== null) { - var actual_tax_amount = flt(actual_taxes_dict[tax.row_id]) * flt(tax.rate) / 100; - actual_taxes_dict[tax.idx] = actual_tax_amount; - } - }); + let total_actual_tax = 0.0; + let actual_taxes_dict = {}; - $.each(actual_taxes_dict, function(key, value) { - if (value) total_actual_tax += value; - }); + function update_actual_taxes_dict(tax, tax_amount) { + if (tax.add_deduct_tax == "Deduct") tax_amount *= -1; + if (tax.category != "Valuation") total_actual_tax += tax_amount; - return flt(this.frm.doc.grand_total - total_actual_tax, precision("grand_total")); + actual_taxes_dict[tax.idx] = { + tax_amount: tax_amount, + cumulative_total: total_actual_tax + }; } + + $.each(this.frm.doc["taxes"] || [], function(i, tax) { + if (["Actual", "On Item Quantity"].includes(tax.charge_type)) { + update_actual_taxes_dict(tax, tax.tax_amount); + return; + } + + const base_row = actual_taxes_dict[tax.row_id]; + if (!base_row) return; + + // if charge type is 'On Previous Row Amount', calculate tax on previous row amount + // else (On Previous Row Total) calculate tax on cumulative total + const base_tax_amount = tax.charge_type == "On Previous Row Amount" ? base_row["tax_amount"]: base_row["cumulative_total"]; + update_actual_taxes_dict(tax, base_tax_amount * tax.rate / 100); + }); + + return this.frm.doc.grand_total - total_actual_tax; } calculate_total_advance(update_paid_amount) { @@ -811,7 +837,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { } } - set_total_amount_to_default_mop() { + async set_total_amount_to_default_mop() { let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total; let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total; @@ -833,21 +859,66 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { ); } - if(!this.frm.doc.is_return){ - this.frm.doc.payments.find(payment => { - if (payment.default) { + /* + During returns, if an user select mode of payment other than + default mode of payment, it should retain the user selection + instead resetting it to default mode of payment. + */ + + let payment_amount = 0; + this.frm.doc.payments.forEach(payment => { + payment_amount += payment.amount + }); + + if (payment_amount == total_amount_to_pay) { + return; + } + + /* + For partial return, if the payment was made using single mode of payment + it should set the return to that mode of payment only. + */ + + let return_against_mop = await frappe.call({ + method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data', + args: { + invoice: this.frm.doc.return_against + } + }); + + if (return_against_mop.message.length === 1) { + this.frm.doc.payments.forEach(payment => { + if (payment.mode_of_payment == return_against_mop.message[0].mode_of_payment) { payment.amount = total_amount_to_pay; + } else { + payment.amount = 0; } }); + this.frm.refresh_fields(); + return; } + this.frm.doc.payments.find(payment => { + if (payment.default) { + payment.amount = total_amount_to_pay; + } else { + payment.amount = 0 + } + }); + this.frm.refresh_fields(); } - set_default_payment(total_amount_to_pay, update_paid_amount) { + async set_default_payment(total_amount_to_pay, update_paid_amount) { var me = this; var payment_status = true; if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)) { + let r = await frappe.db.get_value("POS Profile", this.frm.doc.pos_profile, "disable_grand_total_to_default_mop"); + + if (r.message.disable_grand_total_to_default_mop) { + return; + } + $.each(this.frm.doc['payments'] || [], function(index, data) { if(data.default && payment_status && total_amount_to_pay > 0) { let base_amount, amount; diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index d8bf4a5cf17..59dd337d3af 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -150,6 +150,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe }); } + if (this.frm.fields_dict["items"].grid.get_field("uom")) { + this.frm.set_query("uom", "items", function(doc, cdt, cdn) { + let row = locals[cdt][cdn]; + + return { + query: "erpnext.controllers.queries.get_item_uom_query", + filters: { + "item_code": row.item_code + } + }; + }); + } + if( this.frm.docstatus < 2 && this.frm.fields_dict["payment_terms_template"] @@ -238,6 +251,15 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } } + use_serial_batch_fields(frm, cdt, cdn) { + const item = locals[cdt][cdn]; + if (!item.use_serial_batch_fields) { + frappe.model.set_value(cdt, cdn, "serial_no", ""); + frappe.model.set_value(cdt, cdn, "batch_no", ""); + frappe.model.set_value(cdt, cdn, "rejected_serial_no", ""); + } + } + set_fields_onload_for_line_item() { if (this.frm.is_new() && this.frm.doc?.items) { this.frm.doc.items.forEach(item => { @@ -289,28 +311,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } ]); } - - if(this.frm.fields_dict['items'].grid.get_field('serial_and_batch_bundle')) { - let sbb_field = this.frm.get_docfield('items', 'serial_and_batch_bundle'); - if (sbb_field) { - sbb_field.get_route_options_for_new_doc = (row) => { - return { - 'item_code': row.doc.item_code, - } - }; - } - } - - if(this.frm.fields_dict['items'].grid.get_field('batch_no')) { - let batch_no_field = this.frm.get_docfield('items', 'batch_no'); - if (batch_no_field) { - batch_no_field.get_route_options_for_new_doc = function(row) { - return { - 'item': row.doc.item_code - } - }; - } - } } is_return() { @@ -324,12 +324,16 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe return; } + let show_qc_button = true; + if (["Sales Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) { + show_qc_button = this.frm.doc.update_stock; + } + const me = this; - if (!this.frm.is_new() && this.frm.doc.docstatus === 0 && frappe.model.can_create("Quality Inspection")) { + if (!this.frm.is_new() && this.frm.doc.docstatus === 0 && frappe.model.can_create("Quality Inspection") && show_qc_button) { this.frm.add_custom_button(__("Quality Inspection(s)"), () => { me.make_quality_inspection(); }, __("Create")); - this.frm.page.set_inner_btn_group_as_primary(__('Create')); } const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype) @@ -353,7 +357,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe let d = locals[cdt][cdn]; return { filters: { - docstatus: 1, + docstatus: ["<", 2], inspection_type: inspection_type, reference_name: doc.name, item_code: d.item_code @@ -375,7 +379,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe recipient_id: me.frm.doc.contact_email, payment_request_type: payment_request_type, party_type: payment_request_type == 'Outward' ? "Supplier" : "Customer", - party: payment_request_type == 'Outward' ? me.frm.doc.supplier : me.frm.doc.customer + party: payment_request_type == 'Outward' ? me.frm.doc.supplier : me.frm.doc.customer, + party_name:payment_request_type == 'Outward' ? me.frm.doc.supplier_name : me.frm.doc.customer_name }, callback: function(r) { if(!r.exc){ @@ -408,6 +413,35 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe this.setup_quality_inspection(); this.validate_has_items(); erpnext.utils.view_serial_batch_nos(this.frm); + this.set_route_options_for_new_doc(); + } + + set_route_options_for_new_doc() { + // While creating the batch from the link field, copy item from line item to batch form + + if(this.frm.fields_dict['items'].grid.get_field('batch_no')) { + let batch_no_field = this.frm.get_docfield('items', 'batch_no'); + if (batch_no_field) { + batch_no_field.get_route_options_for_new_doc = function(row) { + return { + 'item': row.doc.item_code + } + }; + } + } + + // While creating the SABB from the link field, copy item, doctype from line item to SABB form + if(this.frm.fields_dict['items'].grid.get_field('serial_and_batch_bundle')) { + let sbb_field = this.frm.get_docfield('items', 'serial_and_batch_bundle'); + if (sbb_field) { + sbb_field.get_route_options_for_new_doc = (row) => { + return { + "item_code": row.doc.item_code, + "voucher_type": this.frm.doc.doctype, + } + }; + } + } } scan_barcode() { @@ -478,7 +512,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe setup_sms() { var me = this; let blacklist = ['Purchase Invoice', 'BOM']; - if(this.frm.doc.docstatus===1 && !["Lost", "Stopped", "Closed"].includes(this.frm.doc.status) + if(frappe.boot.sms_gateway_enabled && this.frm.doc.docstatus===1 && !["Lost", "Stopped", "Closed"].includes(this.frm.doc.status) && !blacklist.includes(this.frm.doctype)) { this.frm.page.add_menu_item(__('Send SMS'), function() { me.send_sms(); }); } @@ -567,12 +601,23 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe child_doctype: item.doctype, child_docname: item.name, is_old_subcontracting_flow: me.frm.doc.is_old_subcontracting_flow, + use_serial_batch_fields: item.use_serial_batch_fields, + serial_and_batch_bundle: item.serial_and_batch_bundle, } }, callback: function(r) { if(!r.exc) { frappe.run_serially([ + () => { + if (item.docstatus === 0 + && frappe.meta.has_field(item.doctype, "use_serial_batch_fields") + && !item.use_serial_batch_fields + && cint(frappe.user_defaults?.use_serial_batch_fields) === 1 + ) { + item["use_serial_batch_fields"] = 1; + } + }, () => { var d = locals[cdt][cdn]; me.add_taxes_from_item_tax_template(d.item_tax_rate); @@ -939,9 +984,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doctype)) { - erpnext.utils.get_shipping_address(this.frm, function() { - set_party_account(set_pricing); - }); + let is_drop_ship = me.frm.doc.items.some(item => item.delivered_by_supplier); + + if (!is_drop_ship) { + erpnext.utils.get_shipping_address(this.frm, function() { + set_party_account(set_pricing); + }); + } } else { set_party_account(set_pricing); @@ -990,28 +1039,55 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } } - due_date() { + due_date(doc, cdt) { // due_date is to be changed, payment terms template and/or payment schedule must // be removed as due_date is automatically changed based on payment terms - if (this.frm.doc.due_date && !this.frm.updating_party_details && !this.frm.doc.is_pos) { - if (this.frm.doc.payment_terms_template || - (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) { - var message1 = ""; - var message2 = ""; - var final_message = __("Please clear the") + " "; + if (doc.doctype !== cdt) { + // triggered by change to the due_date field in payment schedule child table + // do nothing to avoid infinite clearing loop + return; + } - if (this.frm.doc.payment_terms_template) { - message1 = __("selected Payment Terms Template"); - final_message = final_message + message1; - } + // if there is only one row in payment schedule child table, set its due date as the due date + if (doc.payment_schedule.length == 1){ + doc.payment_schedule[0].due_date = doc.due_date; + this.frm.refresh_field("payment_schedule"); + return + } - if ((this.frm.doc.payment_schedule || []).length) { - message2 = __("Payment Schedule Table"); - if (message1.length !== 0) message2 = " and " + message2; - final_message = final_message + message2; - } - frappe.msgprint(final_message); + if ( + doc.due_date && + !this.frm.updating_party_details && + !doc.is_pos && + ( + doc.payment_terms_template || + doc.payment_schedule?.length + ) + ) { + const to_clear = []; + if (doc.payment_terms_template) { + to_clear.push(__(frappe.meta.get_label(cdt, "payment_terms_template"))); } + + if (doc.payment_schedule?.length) { + to_clear.push(__(frappe.meta.get_label(cdt, "payment_schedule"))); + } + + frappe.confirm( + __( + "For the new {0} to take effect, would you like to clear the current {1}?", + [ + __(frappe.meta.get_label(cdt, "due_date")), + frappe.utils.comma_and(to_clear) + ], + "Clear payment terms template and/or payment schedule when due date is changed" + ), + () => { + this.frm.set_value("payment_terms_template", ""); + this.frm.clear_table("payment_schedule"); + this.frm.refresh_field("payment_schedule"); + } + ); } } @@ -1051,13 +1127,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe currency() { // The transaction date be either transaction_date (from orders) or posting_date (from invoices) let transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date; + let inter_company_reference = this.frm.doc.inter_company_order_reference || this.frm.doc.inter_company_invoice_reference; let me = this; this.set_dynamic_labels(); let company_currency = this.get_company_currency(); // Added `load_after_mapping` to determine if document is loading after mapping from another doc if(this.frm.doc.currency && this.frm.doc.currency !== company_currency - && !this.frm.doc.__onload?.load_after_mapping) { + && (!this.frm.doc.__onload?.load_after_mapping || inter_company_reference)) { this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency, function(exchange_rate) { @@ -1102,7 +1179,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe apply_discount_on_item(doc, cdt, cdn, field) { var item = frappe.get_doc(cdt, cdn); - if(!item.price_list_rate) { + if(item && !item.price_list_rate) { item[field] = 0.0; } else { this.price_list_rate(doc, cdt, cdn); @@ -1215,8 +1292,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe }, callback: function(r) { if(!r.exc) { - me.apply_price_list(item, true) frappe.model.set_value(cdt, cdn, 'conversion_factor', r.message.conversion_factor); + me.apply_price_list(item, true); } } }); @@ -1258,6 +1335,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe "Purchase Receipt": ["purchase_order_item", "purchase_invoice_item", "purchase_receipt_item"], "Purchase Invoice": ["purchase_order_item", "pr_detail", "po_detail"], "Sales Order": ["prevdoc_docname", "quotation_item"], + "Purchase Order": ["supplier_quotation_item"], }; const mappped_fields = mapped_item_field_map[this.frm.doc.doctype] || []; @@ -1267,6 +1345,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe .filter(Boolean).length > 0; } else if (this.frm.doc?.items) { let first_row = this.frm.doc.items[0]; + if (!first_row) { + return false + }; + let mapped_rows = mappped_fields.filter(d => first_row[d]) return mapped_rows?.length > 0; @@ -1299,6 +1381,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe () => this.calculate_stock_uom_rate(doc, cdt, cdn), () => this.apply_pricing_rule(item, true) ]); + } else { + this.conversion_factor(doc, cdt, cdn, true) } } @@ -1501,6 +1585,31 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } } + batch_no(frm, cdt, cdn) { + let row = locals[cdt][cdn]; + if (row.use_serial_batch_fields && row.batch_no) { + var params = this._get_args(row); + params.batch_no = row.batch_no; + params.uom = row.uom; + + frappe.call({ + method: "erpnext.stock.get_item_details.get_batch_based_item_price", + args: { + params: params, + item_code: row.item_code, + }, + callback: function(r) { + if (!r.exc && r.message) { + row.price_list_rate = r.message; + row.rate = r.message; + refresh_field("rate", row.name, row.parentfield); + refresh_field("price_list_rate", row.name, row.parentfield); + } + } + }) + } + } + toggle_item_grid_columns(company_currency) { const me = this; // toggle columns @@ -1510,8 +1619,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency); }); - var show = (cint(cur_frm.doc.discount_amount)) || - ((cur_frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length); + var show = (cint(this.frm.doc.discount_amount)) || + ((this.frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length); $.each(["net_rate", "net_amount"], function(i, fname) { if(frappe.meta.get_docfield(item_grid.doctype, fname)) @@ -1601,7 +1710,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe }, callback: function(r) { if (!r.exc && r.message) { - me.remove_pricing_rule(r.message, removed_pricing_rule); + me.remove_pricing_rule(r.message, removed_pricing_rule, item.name); me.calculate_taxes_and_totals(); if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on"); } @@ -1694,7 +1803,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe "serial_no": d.serial_no, "batch_no": d.batch_no, "price_list_rate": d.price_list_rate, - "conversion_factor": d.conversion_factor || 1.0 + "conversion_factor": d.conversion_factor || 1.0, + "discount_percentage" : d.discount_percentage, + "discount_amount" : d.discount_amount, }); // if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list @@ -1770,18 +1881,16 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe apply_rule_on_other_items(args) { const me = this; - const fields = ["discount_percentage", "pricing_rules", "discount_amount", "rate"]; + const fields = ["pricing_rules"]; for(var k in args) { let data = args[k]; if (data && data.apply_rule_on_other_items && JSON.parse(data.apply_rule_on_other_items)) { + fields.push(frappe.scrub(data.pricing_rule_for)) me.frm.doc.items.forEach(d => { - if (in_list(JSON.parse(data.apply_rule_on_other_items), d[data.apply_rule_on])) { + if (JSON.parse(data.apply_rule_on_other_items).includes(d[data.apply_rule_on])) { for(var k in data) { - if (data.pricing_rule_for == "Discount Percentage" && data.apply_rule_on_other_items && k == "discount_amount") { - continue; - } if (in_list(fields, k) && data[k] && (data.price_or_product_discount === 'Price' || k === 'pricing_rules')) { frappe.model.set_value(d.doctype, d.name, k, data[k]); @@ -1798,7 +1907,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe const exist_items = items.map(row => { return {item_code: row.item_code, pricing_rules: row.pricing_rules};}); - args.free_item_data.forEach(pr_row => { + args.free_item_data.forEach(async pr_row => { let row_to_modify = {}; // If there are no free items, or if the current free item doesn't exist in the table, add it @@ -1816,6 +1925,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe for (let key in pr_row) { row_to_modify[key] = pr_row[key]; } + + if (this.frm.doc.hasOwnProperty("is_pos") && this.frm.doc.is_pos) { + let r = await frappe.db.get_value("POS Profile", this.frm.doc.pos_profile, "cost_center"); + if (r.message.cost_center) { + row_to_modify["cost_center"] = r.message.cost_center; + } + } + this.frm.script_manager.copy_from_first_row("items", row_to_modify, ["expense_account", "income_account"]); }); @@ -1852,8 +1969,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe callback: function(r) { if (!r.exc) { frappe.run_serially([ - () => me.frm.set_value("price_list_currency", r.message.parent.price_list_currency), - () => me.frm.set_value("plc_conversion_rate", r.message.parent.plc_conversion_rate), + () => { + if (r.message.parent.price_list_currency) + me.frm.set_value("price_list_currency", r.message.parent.price_list_currency); + }, + () => { + if (r.message.parent.plc_conversion_rate) + me.frm.set_value("plc_conversion_rate", r.message.parent.plc_conversion_rate); + }, () => { if(args.items.length) { me._set_values_for_item_list(r.message.children); @@ -1874,11 +1997,15 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe }); } - remove_pricing_rule(item, removed_pricing_rule) { + remove_pricing_rule(item, removed_pricing_rule, row_name) { let me = this; const fields = ["discount_percentage", "discount_amount", "margin_rate_or_amount", "rate_with_margin"]; + if (!item) { + return; + } + if(item.remove_free_item) { let items = []; @@ -1909,6 +2036,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe me.trigger_price_list_rate(); } + else if(!item.is_free_item && row_name){ + me.frm.doc.items.forEach(d => { + if (d.name != row_name) return; + + Object.assign(d, item); + }); + } } trigger_price_list_rate() { @@ -2248,6 +2382,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe fieldname: "batch_no", label: __("Batch No"), hidden: true + }, + { + fieldtype: "Data", + fieldname: "child_row_reference", + label: __("Child Row Reference"), + hidden: true } ] } @@ -2287,29 +2427,39 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe primary_action_label: __("Create") }); - this.frm.doc.items.forEach(item => { - if (this.has_inspection_required(item)) { - let dialog_items = dialog.fields_dict.items; - dialog_items.df.data.push({ - "docname": item.name, - "item_code": item.item_code, - "item_name": item.item_name, - "qty": item.qty, - "description": item.description, - "serial_no": item.serial_no, - "batch_no": item.batch_no, - "sample_size": item.sample_quantity + frappe.call({ + method: "erpnext.controllers.stock_controller.check_item_quality_inspection", + args: { + doctype: this.frm.doc.doctype, + items: this.frm.doc.items + }, + freeze: true, + callback: function (r) { + r.message.forEach(item => { + if (me.has_inspection_required(item)) { + let dialog_items = dialog.fields_dict.items; + dialog_items.df.data.push({ + "item_code": item.item_code, + "item_name": item.item_name, + "qty": item.qty, + "description": item.description, + "serial_no": item.serial_no, + "batch_no": item.batch_no, + "sample_size": item.sample_quantity, + "child_row_reference": item.name, + }); + dialog_items.grid.refresh(); + } }); - dialog_items.grid.refresh(); + + data = dialog.fields_dict.items.df.data; + if (!data.length) { + frappe.msgprint(__("All items in this document already have a linked Quality Inspection.")); + } else { + dialog.show(); + } } }); - - data = dialog.fields_dict.items.df.data; - if (!data.length) { - frappe.msgprint(__("All items in this document already have a linked Quality Inspection.")); - } else { - dialog.show(); - } } has_inspection_required(item) { @@ -2379,6 +2529,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe 'item_code': item.item_code, 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], 'item_group': item.item_group, + "base_net_rate": item.base_net_rate, } if (doc.tax_category) @@ -2395,7 +2546,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe payment_terms_template() { var me = this; const doc = this.frm.doc; - if(doc.payment_terms_template && doc.doctype !== 'Delivery Note') { + if(doc.payment_terms_template && doc.doctype !== 'Delivery Note' && !doc.is_return) { var posting_date = doc.posting_date || doc.transaction_date; frappe.call({ method: "erpnext.controllers.accounts_controller.get_payment_terms", diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js index bd80c254889..78796c4feb8 100644 --- a/erpnext/public/js/financial_statements.js +++ b/erpnext/public/js/financial_statements.js @@ -9,25 +9,20 @@ erpnext.financial_statements = { data && column.colIndex >= 3 ) { - //Assuming that the first three columns are s.no, account name and the very first year of the accounting values, to calculate the relative percentage values of the successive columns. - const lastAnnualValue = row[column.colIndex - 1].content; - const currentAnnualvalue = data[column.fieldname]; - if (currentAnnualvalue == undefined) return "NA"; //making this not applicable for undefined/null values - let annualGrowth = 0; - if (lastAnnualValue == 0 && currentAnnualvalue > 0) { - //If the previous year value is 0 and the current value is greater than 0 - annualGrowth = 1; - } else if (lastAnnualValue > 0) { - annualGrowth = (currentAnnualvalue - lastAnnualValue) / lastAnnualValue; - } + const growthPercent = data[column.fieldname]; - const growthPercent = Math.round(annualGrowth * 10000) / 100; //calculating the rounded off percentage + if (growthPercent == undefined) return "NA"; //making this not applicable for undefined/null values - value = $(`${(growthPercent >= 0 ? "+" : "") + growthPercent + "%"}`); - if (growthPercent < 0) { - value = $(value).addClass("text-danger"); + if (column.fieldname === "total") { + value = $(`${growthPercent}`); } else { - value = $(value).addClass("text-success"); + value = $(`${(growthPercent >= 0 ? "+" : "") + growthPercent + "%"}`); + + if (growthPercent < 0) { + value = $(value).addClass("text-danger"); + } else { + value = $(value).addClass("text-success"); + } } value = $(value).wrap("").parent().html(); @@ -38,11 +33,9 @@ erpnext.financial_statements = { this.baseData = row; } if (column.colIndex >= 2) { - //Assuming that the first two columns are s.no and account name, to calculate the relative percentage values of the successive columns. - const currentAnnualvalue = data[column.fieldname]; - const baseValue = this.baseData[column.colIndex].content; - if (currentAnnualvalue == undefined || baseValue <= 0) return "NA"; - const marginPercent = Math.round((currentAnnualvalue / baseValue) * 10000) / 100; + const marginPercent = data[column.fieldname]; + + if (marginPercent == undefined) return "NA"; //making this not applicable for undefined/null values value = $(`${marginPercent + "%"}`); if (marginPercent < 0) value = $(value).addClass("text-danger"); @@ -53,7 +46,8 @@ erpnext.financial_statements = { } if (data && column.fieldname == "account") { - value = data.account_name || value; + // first column + value = data.section_name || data.account_name || value; if (filter && filter?.text && filter?.type == "contains") { if (!value.toLowerCase().includes(filter.text)) { @@ -61,7 +55,7 @@ erpnext.financial_statements = { } } - if (data.account) { + if (data.account || data.accounts) { column.link_onclick = "erpnext.financial_statements.open_general_ledger(" + JSON.stringify(data) + ")"; } @@ -70,7 +64,7 @@ erpnext.financial_statements = { value = default_formatter(value, row, column, data); - if (data && !data.parent_account) { + if (data && !data.parent_account && !data.parent_section) { value = $(`${value}`); var $value = $(value).css("font-weight", "bold"); @@ -84,13 +78,13 @@ erpnext.financial_statements = { return value; }, open_general_ledger: function (data) { - if (!data.account) return; + if (!data.account && !data.accounts) return; let project = $.grep(frappe.query_report.filters, function (e) { return e.df.fieldname == "project"; }); frappe.route_options = { - account: data.account, + account: data.account || data.accounts, company: frappe.query_report.get_filter_value("company"), from_date: data.from_date || data.year_start_date, to_date: data.to_date || data.year_end_date, @@ -195,15 +189,15 @@ function get_filters() { fieldname: "period_start_date", label: __("Start Date"), fieldtype: "Date", - reqd: 1, depends_on: "eval:doc.filter_based_on == 'Date Range'", + mandatory_depends_on: "eval:doc.filter_based_on == 'Date Range'", }, { fieldname: "period_end_date", label: __("End Date"), fieldtype: "Date", - reqd: 1, depends_on: "eval:doc.filter_based_on == 'Date Range'", + mandatory_depends_on: "eval:doc.filter_based_on == 'Date Range'", }, { fieldname: "from_fiscal_year", @@ -253,6 +247,7 @@ function get_filters() { company: frappe.query_report.get_filter_value("company"), }); }, + options: "Cost Center", }, { fieldname: "project", @@ -263,6 +258,7 @@ function get_filters() { company: frappe.query_report.get_filter_value("company"), }); }, + options: "Project", }, ]; diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js index d7edac3cb9f..63651ec8759 100644 --- a/erpnext/public/js/queries.js +++ b/erpnext/public/js/queries.js @@ -28,9 +28,13 @@ $.extend(erpnext.queries, { customer_filter: function (doc) { if (!doc.customer) { - frappe.throw( - __("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "customer", doc.name))]) - ); + cur_frm.scroll_to_field("customer"); + frappe.show_alert({ + message: __("Please set {0} first.", [ + __(frappe.meta.get_label(doc.doctype, "customer", doc.name)), + ]), + indicator: "orange", + }); } return { filters: { customer: doc.customer } }; @@ -39,11 +43,13 @@ $.extend(erpnext.queries, { contact_query: function (doc) { if (frappe.dynamic_link) { if (!doc[frappe.dynamic_link.fieldname]) { - frappe.throw( - __("Please set {0}", [ + cur_frm.scroll_to_field(frappe.dynamic_link.fieldname); + frappe.show_alert({ + message: __("Please set {0} first.", [ __(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name)), - ]) - ); + ]), + indicator: "orange", + }); } return { @@ -56,14 +62,27 @@ $.extend(erpnext.queries, { } }, + company_contact_query: function (doc) { + if (!doc.company) { + frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "company", doc.name))])); + } + + return { + query: "frappe.contacts.doctype.contact.contact.contact_query", + filters: { link_doctype: "Company", link_name: doc.company }, + }; + }, + address_query: function (doc) { if (frappe.dynamic_link) { if (!doc[frappe.dynamic_link.fieldname]) { - frappe.throw( - __("Please set {0}", [ + cur_frm.scroll_to_field(frappe.dynamic_link.fieldname); + frappe.show_alert({ + message: __("Please set {0} first.", [ __(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name)), - ]) - ); + ]), + indicator: "orange", + }); } return { @@ -77,24 +96,41 @@ $.extend(erpnext.queries, { }, company_address_query: function (doc) { + if (!doc.company) { + cur_frm.scroll_to_field("company"); + frappe.show_alert({ + message: __("Please set {0} first.", [ + __(frappe.meta.get_label(doc.doctype, "company", doc.name)), + ]), + indicator: "orange", + }); + } + return { query: "frappe.contacts.doctype.address.address.address_query", - filters: { is_your_company_address: 1, link_doctype: "Company", link_name: doc.company || "" }, + filters: { link_doctype: "Company", link_name: doc.company }, }; }, dispatch_address_query: function (doc) { + var filters = { link_doctype: "Company", link_name: doc.company || "" }; + var is_drop_ship = doc.items.some((item) => item.delivered_by_supplier); + if (is_drop_ship) filters = {}; return { query: "frappe.contacts.doctype.address.address.address_query", - filters: { link_doctype: "Company", link_name: doc.company || "" }, + filters: filters, }; }, supplier_filter: function (doc) { if (!doc.supplier) { - frappe.throw( - __("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "supplier", doc.name))]) - ); + cur_frm.scroll_to_field("supplier"); + frappe.show_alert({ + message: __("Please set {0} first.", [ + __(frappe.meta.get_label(doc.doctype, "supplier", doc.name)), + ]), + indicator: "orange", + }); } return { filters: { supplier: doc.supplier } }; @@ -102,9 +138,13 @@ $.extend(erpnext.queries, { lead_filter: function (doc) { if (!doc.lead) { - frappe.throw( - __("Please specify a {0}", [__(frappe.meta.get_label(doc.doctype, "lead", doc.name))]) - ); + cur_frm.scroll_to_field("lead"); + frappe.show_alert({ + message: __("Please specify a {0} first.", [ + __(frappe.meta.get_label(doc.doctype, "lead", doc.name)), + ]), + indicator: "orange", + }); } return { filters: { lead: doc.lead } }; diff --git a/erpnext/public/js/templates/visual_plant_floor_template.html b/erpnext/public/js/templates/visual_plant_floor_template.html index 2e67085c022..a1639f07370 100644 --- a/erpnext/public/js/templates/visual_plant_floor_template.html +++ b/erpnext/public/js/templates/visual_plant_floor_template.html @@ -1,5 +1,16 @@ {% $.each(workstations, (idx, row) => { %}{{row.status}}
-| {d.batch_no} | {d.serial_no} | {abs(d.qty)} |
|---|---|---|
| {d.batch_no} | {d.serial_no} | {abs(d.qty)} |
| {d.batch_no} | {abs(d.qty)} |
| Child Document | +Non Child Document | +
|---|---|
|
+ To access parent document field use parent.fieldname and to access child table document field use doc.fieldname + + |
+
+ To access document field use doc.fieldname + |
+
|
+ Example: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test"" + + |
+
+ Example: doc.doctype == ""Stock Entry"" and doc.purpose == ""Manufacture"" + |
+
| Podređeni Dokument | +Nadređeni Dokument | +
|---|---|
|
+ Za pristup polju nadređenog dokumenta koristite ime parent.field, a za pristup polju dokumenta podređene tabele koristite doc.fieldname + + |
+
+ Za pristup polju dokumenta koristite doc.fieldname + |
+
|
+ Primjer: parent.doctype == ""Stock Entry"" i doc.item_code == ""Test"" + + |
+
+ Primjer: doc.doctype == ""Stock Entry"" i doc.purpose == ""Proizvodnja"" + |
+
This action will also delete all associated Common Code documents.
,Jeste li sigurni da želite izbrisati {0}?Ova radnja će također izbrisati sve povezane Zajedničke Kod dokumente.
, +Are you sure you want to restart this subscription?,Jeste li sigurni da želite ponovo pokrenuti ovu pretplatu?, +As on Date,Kao na Datum, +"As there are existing submitted transactions against item {0}, you can not change the value of {1}.","Pošto postoje postojeće podnešene transakcije naspram artikla {0}, ne možete promijeniti vrijednost {1}.", +"As there are negative stock, you can not enable {0}.","Pošto postoje negativne zalihe, ne možete omogućiti {0}.", +"As there are reserved stock, you cannot disable {0}.","Pošto postoje rezervisane zalihe, ne možete onemogućiti {0}.", +"As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}.","Pošto ima dovoljno artikala podsklopa, radni nalog nije potreban za Skladište {0}.", +"As {0} is enabled, you can not enable {1}.","Pošto je {0} omogućen, ne možete omogućiti {1}.", +Assembly Items,Artikli za Motiranje, +Asset Activity,Aktivnost Imovine, +Asset Capitalization,Kapitalizacija Imovine, +Asset Capitalization Asset Item,Kapitalizacija Imovine Artikal Imovine, +Asset Capitalization Service Item,Kapitalizacije Imovine Servisni Artikal, +Asset Capitalization Stock Item,Kapitalizacija Imovine Artikal Zalihe, +Asset Depreciation Details,Detalji Amortizacije Imovine, +Asset Depreciation Schedule,Raspored Amortizacije Imovine, +Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation,Raspored Amortizacije Imovine {0} i Finansijski Registar {1} ne koristi amortizaciju zasnovanu na smjenama, +Asset Depreciation Schedule not found for Asset {0} and Finance Book {1},Raspored amortizacije imovine nije pronađen za Imovinu {0} i Finansijski Registar {1}, +Asset Depreciation Schedule {0} for Asset {1} already exists.,Raspored Amortizacije Imovine {0} za Imovinu {1} već postoji., +Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists.,Raspored Amortizacije Imovine {0} za Imovinu {1} i Finansijski Registar {2} već postoji., +"Asset Depreciation Schedules created:This action will also delete all associated Common Code documents.
,"Sind Sie sicher, dass Sie {0} löschen möchten?Durch dieser Aktion werden auch alle zugehörigen Common Code Dokumente gelöscht.
", +At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} for the batch {4} in the warehouse {5}. Please restock the item.,In Zeile #{0}: Die entnommene Menge {1} für den Artikel {2} ist größer als der verfügbare Bestand {3} für die Charge {4} im Lager {5}. Bitte füllen Sie den Artikel wieder auf., +At least one account with exchange gain or loss is required,Mindestens ein Konto mit Wechselkursgewinnen oder -verlusten ist erforderlich, +Auto Fetch Serial Numbers,Seriennummern automatisch abrufen, +Auto Reconciliation Job Trigger,Auslöser für automatischen Abgleichsjob, +Auto Reconciliation has started in the background,Der automatische Abgleich wurde im Hintergrund gestartet, +Bank Account {} in Bank Transaction {} is not matching with Bank Account {},Bankkonto {} in Banktransaktion {} stimmt nicht mit Bankkonto {} überein, +"Batch No {0} is not present in the original {1} {2}, hence you can't return it against the {1} {2}","Charge Nr. {0} ist im Original {1} {2} nicht vorhanden, daher können Sie sie nicht gegen {1} {2} zurückgeben", +Billing Address does not belong to the {0},Die Rechnungsadresse gehört nicht zu {0}, +CANCELLED,Abgebrochen, +Child Row Reference,Zeilenreferenz, +Code List,Code-Liste, +Company Contact Person,Kontaktperson des Unternehmens, +Company {0} added multiple times,Unternehmen {0} mehrfach hinzugefügt, +"Consumed Stock Items, Consumed Asset Items or Consumed Service Items is mandatory for Capitalization","Verbrauchte Lagerartikel, verbrauchte Vermögensgegenstand-Artikel oder verbrauchte Dienstleistungsartikel sind für die Aktivierung obligatorisch.", +Contact Person does not belong to the {0},Die Kontaktperson gehört nicht zu {0}, +Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}.,"Der Umrechnungsfaktor für Artikel {0} wurde auf 1,0 zurückgesetzt, da die Maßeinheit {1} dieselbe ist wie die Lagermaßeinheit {2}.", +Conversion rate cannot be 0,Der Umrechnungskurs kann nicht 0 sein, +"Conversion rate is 1.00, but document currency is different from company currency","Der Umrechnungskurs beträgt 1,00, aber die Währung des Dokuments unterscheidet sich von der Währung des Unternehmens", +Conversion rate must be 1.00 if document currency is same as company currency,"Der Umrechnungskurs muss 1,00 betragen, wenn die Belegwährung mit der Währung des Unternehmens übereinstimmt", +Cost Center for Item rows has been updated to {0},Die Kostenstelle für Artikelzeilen wurde auf {0} aktualisiert, +"Credit Note will update it's own outstanding amount, even if 'Return Against' is specified.","Den ausstehenden Betrag dieser Rechnungskorrektur separat buchen, statt den der korrigierten Rechnung zu verringern.", +Cron Interval should be between 1 and 59 Min,Das Cron-Intervall sollte zwischen 1 und 59 Minuten liegen, +Dates,Daten, +"Debit Note will update it's own outstanding amount, even if 'Return Against' is specified.","Den ausstehenden Betrag dieser Rechnungskorrektur separat buchen, statt den der korrigierten Rechnung zu verringern.", +Default Common Code,Standard Common Code, +Demand,Nachfrage, +Depreciation Expense Account should be an Income or Expense Account.,Das Abschreibungsaufwandskonto sollte ein Erlös- oder Aufwandskonto sein., +Depreciation Posting Date cannot be before Available-for-use Date,Das Buchungsdatum der Abschreibung kann nicht vor dem Datum der Verfügbarkeit liegen, +Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date,Abschreibungszeile {0}: Das Buchungsdatum der Abschreibung darf nicht vor dem Verfügbarkeitsdatum liegen, +Depreciation eliminated via reversal,Abschreibung durch Umkehr eliminiert, +Disassemble Order,Demontageauftrag, +Discount cannot be greater than 100%.,Der Rabatt kann nicht mehr als 100% betragen., +Do you still want to enable immutable ledger?,Möchten Sie das unveränderliche Hauptbuch dennoch aktivieren?, +Documents Processed on each trigger. Queue Size should be between 5 and 100,Bei jedem Trigger verarbeitete Dokumente. Die Größe der Warteschlange sollte zwischen 5 und 100 liegen., +Don't Enforce Free Item Qty,Kostenlose Artikelmenge nicht erzwingen, +Download PDF for Supplier,PDF für Lieferanten herunterladen, +Email Receipt,Quittung per E-Mail senden, +Employee {0} is currently working on another workstation. Please assign another employee.,Der Mitarbeiter {0} arbeitet derzeit an einem anderen Arbeitsplatz. Bitte weisen Sie einen anderen Mitarbeiter zu., +"Enable this option to calculate daily depreciation by considering the total number of days in the entire depreciation period, (including leap years) while using daily pro-rata based depreciation","Aktivieren Sie diese Option, um die tägliche Abschreibung unter Berücksichtigung der Gesamtzahl der Tage im gesamten Abschreibungszeitraum (einschließlich Schaltjahre) zu berechnen, während die tägliche anteilige Abschreibung verwendet wird", +Exit Full Screen,Vollbildmodus verlassen, +Fetch Timesheet in Sales Invoice,Zeiterfassung in Ausgangsrechnung laden, +Full Screen,Vollbild, +Handle Employee Advances,Umgang mit Mitarbeitervorschüssen, +Has Corrective Cost,Hat Korrekturkosten, +Has Item Scanned,Artikel wurde gescannt, +Hide timesheets,Zeiterfassung verstecken, +"If there is no title column, use the code column for the title.","Wenn es keine Titelspalte gibt, verwenden Sie die Code-Spalte für den Titel.", +Ignore Exchange Rate Revaluation Journals,Wechselkursneubewertungsjournale ignorieren, +Ignore Pricing Rule is enabled. Cannot apply coupon code.,„Preisregel ignorieren“ ist aktiviert. Gutscheincode kann nicht angewendet werden., +Ignore Voucher Type filter and Select Vouchers Manually,Gutscheintyp-Filter ignorieren und Gutscheine manuell auswählen, +Import Genericode File,Genericode-Datei importieren, +Import completed. {0} common codes created.,Import abgeschlossen. {0} gemeinsame Codes erstellt., +Importing Common Codes,Gemeinsame Codes importieren, +Include Zero Stock Items,Nullbestandsartikel einschließen, +Incorrect Reference Document (Purchase Receipt Item),Falsches Referenzdokument (Eingangsbeleg Artikel), +Incorrect Serial and Batch Bundle,Ungültiges Serien- und Chargenbündel, +Incorrect Stock Value Report,Falscher Lagerwertbericht, +Individual GL Entry cannot be cancelled.,Einzelne Hauptbucheinträge können nicht storniert werden., +Initialize Summary Table,Übersichtstabelle initialisieren, +Interval should be between 1 to 59 MInutes,Das Intervall sollte zwischen 1 und 59 Minuten liegen, +Invalid Discount,Ungültiger Rabatt, +Invoice ID,Rechnungs-ID, +Is Corrective Job Card,Ist Nacharbeitsauftrag, +Is Period Closing Voucher Entry,Ist Periodenabschlussbeleg, +Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0},"Artikelpreis wurde auf Null aktualisiert, da „Nullbewertung zulassen“ für Artikel {0} aktiviert ist", +Last transacted,Zuletzt verarbeitet, +Loading Invoices! Please Wait...,Rechnungen werden geladen! Bitte warten..., +Missing Item,Fehlender Artikel, +Mobile: ,Mobil: , +More/Less than 12 months.,Mehr/Weniger als 12 Monate., +Negative Batch Quantity,Negative Chargenmenge, +No recent transactions found,Keine kürzlichen Transaktionen gefunden, +Only applies for Normal Payments,Gilt nur für normale Zahlungen, +"Only values between [0,1) are allowed. Like {0.00, 0.04, 0.09, ...} +Ex: If allowance is set at 0.07, accounts that have balance of 0.07 in either of the currencies will be considered as zero balance account","Es sind nur Werte zwischen [0;1) zulässig. Wie {0,00; 0,04; 0,09; ...} +Beispiel: Wenn der Freibetrag auf 0,07 festgelegt ist, werden Konten mit einem Saldo von 0,07 in einer der beiden Währungen als Konten mit Nullsaldo betrachtet.", +POS Invoice is already consolidated,POS-Rechnung ist bereits konsolidiert, +POS Invoice should have the field {0} checked.,Für die POS-Rechnung sollte das Feld {0} aktiviert sein., +POS Profile doesn't match {},POS-Profil stimmt nicht mit {} überein, +Parent Row No not found for {0},Übergeordnete Zeilennummer für {0} nicht gefunden, +Partial Payment in POS Invoice is not allowed.,Teilzahlungen in POS-Rechnungen sind nicht zulässig., +Party Type and Party can only be set for Receivable / Payable accountStatement Of Accounts for {{ customer.customer_name }}Hello {{ customer.customer_name }},
PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}. Estado de Cuentas para {{ customer.customer_name }}Hola {{ customer.customer_name }},
PFA tu Estado de Cuenta del {{ doc.from_date }} al {{ doc.to_date }}. Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","Agregue un grupo de Artículos en otro Artículo. Esto es útil si está agrupando ciertos Artículos en un paquete y mantiene existencias de los Artículos empaquetados y no del Artículo agregado.
+El Artículo del paquete tendrá Es Artículo de Stock como No y Es Artículo de Venta como Sí.
Si está vendiendo Portátiles y Mochilas por separado y tiene un precio especial si el cliente compra ambos, entonces el Portátil + Mochila será un nuevo Artículo de Paquete de Productos.
", +"There are 3 variables that could be used within the endpoint, result key and in values of the parameter.
+Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.
+Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}
","Hay 3 variables que se pueden utilizar dentro del endpoint, clave de resultado y en valores del parámetro.
+El tipo de cambio entre {from_currency} y {to_currency} en {transaction_date} es obtenido por la API.
+Ejemplo: Si su endpoint es exchange.com/2021-08-01, entonces, tendrá que introducir exchange.com/{transaction_date}
", +"The fieldnames you can use in your template are the fields in the document. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Los nombres de campo que puede utilizar en su plantilla son los campos del documento. Puede averiguar los campos de cualquier documento a través de Configuración > Personalizar vista de formulario y seleccionando el tipo de documento (por ejemplo, Factura de venta)
+ +Las plantillas se compilan utilizando el lenguaje de plantillas Jinja. Para saber más sobre Jinja, lea esta documentación.
", +"Contract for Customer {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+The field names you can use in your Contract Template are the fields in the Contract for which you are creating the template. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Contract)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Contrato para cliente {{ party_name }}
+
+-Válido desde : {{ start_date }}
+-Válido hasta : {{ end_date }}
+
+
+Los nombres de campo que puede utilizar en su Plantilla de Contrato son los campos del Contrato para el que está creando la plantilla. Puede averiguar los campos de cualquier documento a través de Configuración > Personalizar vista de formulario y seleccionando el tipo de documento (por ejemplo, Contrato)
+ +Las plantillas se compilan utilizando el lenguaje de plantillas Jinja. Para saber más sobre Jinja, lea esta documentación.
", +"Delivery Terms for Order number {{ name }}
+
+-Order Date : {{ transaction_date }}
+-Expected Delivery Date : {{ delivery_date }}
+
+
+The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Condiciones de entrega para el número de pedido {{ name }}
+
+-Fecha de pedido : {{ transaction_date }}
+-Fecha de entrega prevista : {{ delivery_date }}
+
+
+Los nombres de campo que puede utilizar en su plantilla de correo electrónico son los campos del documento desde el que está enviando el correo electrónico. Puede averiguar los campos de cualquier documento a través de Configuración > Personalizar vista de formulario y seleccionando el tipo de documento (por ejemplo, Factura de venta)
+ +Las plantillas se compilan utilizando el lenguaje de plantillas Jinja. Para saber más sobre Jinja, lea esta documentación.
", +"In your Email Template, you can use the following special variables: +
+{{ update_password_link }}: A link where your supplier can set a new password to log into your portal.
+ {{ portal_link }}: A link to this RFQ in your supplier portal.
+ {{ supplier_name }}: The company name of your supplier.
+ {{ contact.salutation }} {{ contact.last_name }}: The contact person of your supplier.
+ {{ user_fullname }}: Your full name.
+ Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.
En su plantilla de correo electrónico, puede utilizar las siguientes variables especiales: +
+{{ update_password_link }}: Un enlace donde su proveedor puede establecer una nueva contraseña para acceder a su portal.
+ {{ portal_link }}: Un enlace a esta petición de oferta en su portal de proveedores.
+ {{ supplier_name }}: El nombre de la empresa de su proveedor.
+ {{ contact.salutation }} {{ contact.last_name }}: La persona de contacto de su proveedor.
+ {{ user_fullname }}: Su nombre completo.
+ Aparte de éstos, puede acceder a todos los valores de esta petición de oferta, como {{ message_for_supplier }} o {{ terms }}.
+","Message Example
+ +<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p> + +<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p> + +<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Ejemplo de mensaje
+ +<p> ¡Gracias por formar parte de {{ doc.company }}! Esperamos que esté disfrutando del servicio.</p> + +<p> Le adjuntamos el extracto de la factura E. El importe pendiente es de {{ doc.grand_total }}.</p> + +<p> No queremos que pierda tiempo dando vueltas para pagar su Factura.
¡Después de todo, la vida es bella y el tiempo de que dispone debe emplearlo en disfrutarla!
¡Así que aquí tiene nuestras pequeñas maneras de ayudarle a tener más tiempo para la vida! </p> + +<a href=""{{ payment_url }}""> pulse aquí para pagar </a> + +
+","Message Example
+ +<p>Dear {{ doc.contact_person }},</p> + +<p>Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Masters & Reports","Datos Maestros & Informes", +"Quick Access","Acceso rápido", +"Reports & Masters","Informes y Datos Maestros", +"Reports & Masters","Informes & Datos Maestros", +"Settings","Configuración", +"Shortcuts","Accesos directos", +"Your Shortcuts + + + + + + ","Tus accesos directos + + + + + + ", +"Your Shortcuts","Tus accesos directos", +Grand Total: {0},Total general: {0}, +Outstanding Amount: {0},Importe pendiente: {0}, +"Ejemplo de mensaje
+ +<p>Estimado {{ doc.contact_person }},</p> + +<p>Solicitando pago por {{ doc.doctype }}, {{ doc.name }} por {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> Haga clic aquí para pagar </a> + +
| Child Document | +Non Child Document | +
|---|---|
|
+ To access parent document field use parent.fieldname and to access child table document field use doc.fieldname + + |
+
+ To access document field use doc.fieldname + |
+
|
+ Example: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test"" + + |
+
+ Example: doc.doctype == ""Stock Entry"" and doc.purpose == ""Manufacture"" + |
+
| Documento secundario | +Documento no secundario | +
|---|---|
|
+ Para acceder al campo del documento principal, utilice parent.fieldname y para acceder al campo del documento de la tabla secundaria, utilice doc.fieldname + + |
+
+ Para acceder al campo del documento, utilice doc.fieldname + |
+
|
+ Ejemplo: parent.doctype == ""Entrada de stock"" y doc.item_code == ""Prueba"" + + |
+
+ Ejemplo: doc.doctype == ""Entrada de stock"" y doc.purpose == ""Fabricación"" + |
+
Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","گروهی از آیتمها را در آیتم دیگری جمع آوری کنید. اگر آیتمهای خاصی را در یک باندل قرار دهید و موجودی آیتمهای بسته بندی شده را حفظ کنید و نه آیتمهای جمع آوری شده، مفید است.
+بسته آیتم دارای آیتم موجودی است به عنوان خیر و آیتم فروش است به عنوان بله خواهد بود. .
اگر لپتاپ و کولهپشتی را جداگانه میفروشید و اگر مشتری هر دو را بخرد، قیمت ویژهای دارید، لپتاپ + کولهپشتی یک کالای باندل محصول جدید خواهد بود.
", +"Statement Of Accounts for {{ customer.customer_name }}Hello {{ customer.customer_name }},
PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}. Relevés de comptes pour {{ customer.customer_name }}Bonjour {{ customer.customer_name }},
Vous trouverez en pièce-jointe vos relevés de comptes du {{ doc.from_date }} au {{ doc.to_date }}. Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","Constituer un article composé d'autres articles. Utile si vous avez certains articles dans un lot de vente et que vous maintenez un stock individuel de chaque article du lot et non de l'ensemble Article.
+Le lot Article aura la variable Article de stock sur Non et Article de vente sur Oui.
Si vous vendez des ordinateurs portables et des sacs à dos séparément et bénéficiez d'un prix spécial si le client achète les deux , l'ordinateur portable + le sac à dos constitueront un nouvel élément du pack de produits.
", +"There are 3 variables that could be used within the endpoint, result key and in values of the parameter.
+Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.
+Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}
","Trois variables peuvent être utilisées dans le point final, la clé de résultat et les valeurs du paramètre.
+Le taux de change entre {from_currency} et {to_currency} sur {transaction_date} est récupéré par l'API.
+Exemple : Si votre point de terminaison est exchange.com/2021-08-01, vous devrez saisir exchange.com/{transaction_date}.
", +"Masters & Reports","Rapports & Fonctionnalités principales", +"Reports & Masters","Rapports et Pages principales", +"Your Shortcuts","Vos raccourcis", +A - C,A-C, +A Holiday List can be added to exclude counting these days for the Workstation.,Une liste de jours fériés peut être ajoutée pour exclure le comptage de ces jours pour le poste de travail., +A Packing Slip can only be created for Draft Delivery Note.,Un bordereau d'emballage ne peut être créé que pour les brouillons de bons de livraison., +"A Price List is a collection of Item Prices either Selling, Buying, or both","Une liste de prix est une liste de prix d'articles à la vente, à l'achat, ou les deux", +A Reconciliation Job {0} is running for the same filters. Cannot reconcile now,Un travail de réconciliation {0} est en cours d'exécution pour les mêmes filtres. Impossible de réconcilier maintenant, +A customer must have primary contact email.,Un client doit avoir un courriel de contact principal., +A driver must be set to submit.,Un conducteur doit être défini pour soumettre., +A template with tax category {0} already exists. Only one template is allowed with each tax category,Un modèle avec la catégorie de taxe {0} existe déjà. Un seul modèle est autorisé pour chaque catégorie de taxe, +Actual Time,Heure actuelle, +Add Columns in Transaction Currency,Ajouter des colonnes dans la devise de la transaction, +Add Discount,Ajouter une promotion, +Add Items in the Purpose Table,Ajouter des éléments dans le tableau des objectifs, +Add Lead to Prospect,Ajouter un lead à un prospect, +Add Local Holidays,Ajouter des jours fériés locaux, +Add Manually,Ajouter manuellement, +Add Or Deduct,Ajouter ou déduire, +Add Serial / Batch Bundle,Ajouter une série / un lot, +Add Stock,Ajouter du stock, +Add Template,Ajouter un modèle, +Additional,Additionnel, +Advance Account: {0} must be in either customer billing currency: {1} or Company default currency: {2},Compte d'avance : {0} doit être dans la devise de facturation du client : {1} ou dans la devise par défaut de l'entreprise : {2}, +Advance Payment,Acompte, +Advance Payment Date,Date du paiement anticipé, +Advance Reconciliation Takes Effect On,Le rapprochement anticipé prend effet le, +Advance payments allocated against orders will only be fetched,Seul les paiements anticipés alloués aux commandes seront uniquement récupérés, +Attendance & Leaves,Présences et congés, +Avg Rate (Balance Stock),Valorisation Moyenne (Livre d'inventaire), +BOM UoM,UdM de la nomenclature, +BOM Update Batch,Mise à jour en lot des nomenclatures, +"Based on your HR Policy, select your leave allocation period's end date","En fonction de votre politique RH, sélectionnez la date de fin de la période d'attribution des congés", +Batch Nos,Numéros de lots, +Batch and Serial No,N° de lot et de série, +CANCELLED,ANNULÉ, +Company Details,Détail de la société, +Deferred accounting failed for some invoices:,La comptabilité différée a échoué pour certaines factures :, +Delivery Manager,Gestionnaire des livraisons, +Delivery User,Utilisateur de la livraison, +Error while processing deferred accounting for {0},Erreur lors du traitement de la comptabilité différée pour {0}, +Only Include Allocated Payments,Inclure uniquement les paiements alloués, +Parcel weight cannot be 0,Le poids du colis ne peut pas être égal à 0, +Please enter Shipment Parcel information,Veuillez entrer les informations sur l'expédition du colis, +Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries.,Ligne #{0}: Vous ne pouvez pas utiliser la dimension de stock '{1}' dans l'inventaire pour modifier la quantité ou le taux de valorisation. L'inventaire avec les dimensions du stock est destiné uniquement à effectuer les écritures d'ouverture., +Row {0}: Item Tax template updated as per validity and rate applied,Ligne {0}: Modèle de taxe d'article mis à jour selon la validité et le taux appliqué, +Shipment Parcel,Expédition Colis, +Shipment Parcel Template,Modèle d'expédition de colis, +"The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:Statement Of Accounts for {{ customer.customer_name }}Hello {{ customer.customer_name }},
PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}. Konto besked för {{ customer.customer_name }}Hej {{ customer.customer_name }},
Kontoutdrag från {{ doc.from_date }} till {{ doc.to_date }}. Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","Paketera grupp av artiklar till annan Artikel. Det är användbart om man paketerar vissa Artiklar i paket och har lager av packade Artiklar och inte paketarad Artikel.Artikel kommer att ha Artikel. Är Lagerar Artikel som Nej och Är Försäljning Artikel som Ja.
Om man säljer bärbara datorer och ryggsäckar separat och har specialpris om kunder köper båda, så kommer det att vara bärbar dator + ryggsäck som paket artikel.", +"
There are 3 variables that could be used within the endpoint, result key and in values of the parameter.
+Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.
+Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}
","Det finns 3 variabler som kan användas av slutpunkt, resultat nyckel och i parameter värde.
+Växelkurs mellan {from_currency} och {to_currency} {transaction_date} hämtas av API.
+Exempel: Om slutpunkt är exchange.com/2021-08-01 måste du ange exchange.com/{transaction_date}
", +"The fieldnames you can use in your template are the fields in the document. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Fältnamn man kan använda i mall är fält i dokument. Du kan ta reda på fält namn för alla dokument via Inställningar > Anpassa formulärvy och välj dokument typ (t.ex. Försäljning Faktura)
+ +Mallar kompileras med Jinja Templating Language. Om du vill veta mer om Jinja läs denna dokumentation.
", +"Contract for Customer {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+The field names you can use in your Contract Template are the fields in the Contract for which you are creating the template. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Contract)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Avtal för Kund {{ party_name }}
+
+-Giltigt från: {{ start_date }}
+-Gäller till: {{ end_date }}
+
+
+Fältnamn du kan använda i avtal mall är fält i avtal som du skapar mallen för. Du kan ta reda på fält namn för alla dokument via Inställningar > Anpassa formulärvy och välj dokument typ (t.ex. Avtal)
+ +Mallar kompileras med Jinja Templating Language. Om du vill veta mer om Jinja läser du den här dokumentationen.
", +"Delivery Terms for Order number {{ name }}
+
+-Order Date : {{ transaction_date }}
+-Expected Delivery Date : {{ delivery_date }}
+
+
+The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Leverans Villkor för Order Nummer {{ name }}
+
+-Order Datum: {{ transaction_date }}
+-Förväntat Leverans Datum: {{ delivery_date }}
+
+
+Fältnamn som kan användas i E-post Mall är fält i Dokument som man skickar E-post meddelande från. Man kan ta reda på fält namn för alla dokument via Inställning > Anpassa Formulär Vy och välja Dokument Typ (t.ex. Försäljning Faktura)
+ +Mallar kompileras med Jinja Mall Språk. Läs mer om Jinja dokumentation:
", +"In your Email Template, you can use the following special variables: +
+{{ update_password_link }}: A link where your supplier can set a new password to log into your portal.
+ {{ portal_link }}: A link to this RFQ in your supplier portal.
+ {{ supplier_name }}: The company name of your supplier.
+ {{ contact.salutation }} {{ contact.last_name }}: The contact person of your supplier.
+ {{ user_fullname }}: Your full name.
+ Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.
I E-post Mall kan följande specialvariabler användas: +
+{{ update_password_link }} : Länk där leverantör kan ange nytt lösenord för att logga in på leverantör portal.
+ {{ portal_link }}: Länk till offert begäran på leverantör portal.
+ {{ supplier_name }}: Leverantör namn.
+ {{ contact.salutation }} {{ contact.last_name }}: Kontakt person för leverantör.
+ {{ user_fullname } }: Användarens fullständiga namn.
+ +
+Förutom dessa kan man komma åt alla värden i offert begäran, som {{ message_for_supplier }} eller {{ terms }}.
+","Message Example
+ +<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p> + +<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p> + +<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Meddelande Exempel
+ +<p> Tack för att ni är en del av {{ doc.company }}! Vi hoppas att ni gillar tjänst.</p> + +<p> Vänligen se bifogat E-faktura. Utestående belopp är {{ doc.grand_total }}.</p> + +<p> Vi vill inte att ni ska spendera tid med att springa runt för att betala faktura.
Livet är trots allt vackert och den tid man har bör spenderas för att njuta av livet!
Så här är våra små sätt att hjälpa er att få mer tid för livet! < /p> + +<a href=""{{ payment_url }}""> klicka här för att betala </a> + +
+","Message Example
+ +<p>Dear {{ doc.contact_person }},</p> + +<p>Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Masters & Reports","Inställningar & Rapporter", +"Quick Access","Genvägar", +"Reports & Masters","Rapporter & Inställningar", +"Reports & Masters","Rapporter & Inställningar", +"Settings","Inställningar", +"Shortcuts","Genvägar", +"Your Shortcuts + + + + + + ","Genvägar + + + + + + ", +"Your Shortcuts","Genvägar", +Grand Total: {0},Totalt: {0}, +Outstanding Amount: {0},Utestående belopp: {0}, +"Meddelande Exempel
+ +<p>Hej {{ doc.contact_person }},</p> + +<p>Begär betalning för {{ doc.doctype }}, {{ doc.name }} för {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> klicka här för att betala </a> + +
| Child Document | +Non Child Document | +
|---|---|
|
+ To access parent document field use parent.fieldname and to access child table document field use doc.fieldname + + |
+
+ To access document field use doc.fieldname + |
+
|
+ Example: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test"" + + |
+
+ Example: doc.doctype == ""Stock Entry"" and doc.purpose == ""Manufacture"" + |
+
För att komma åt överordnad dokument fält använd parent.fieldname och för att komma åt underordnad dokument fält använd doc.fieldname
+ +För att komma åt dokument fält använd doc.fieldname
+Exampel: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test""
+ +Exampel: doc.doctype == ""Stock Entry"" and doc.purpose == ""Produktion""
+This action will also delete all associated Common Code documents.
,Är du säker på att du vill ta bort {0}?Denna åtgärd kommer också att ta bort alla associerade Gemensamma Kod dokument.
, +At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} for the batch {4} in the warehouse {5}. Please restock the item.,Rad #{0}: Plockad kvantitet {1} för artikel {2} är högre än som är tillgängligt lager {3} för parti {4} på lager {5}. Fyll på Lager., +At least one account with exchange gain or loss is required,Minst ett konto med Valutaväxling Resultat erfordras, +Auto Reconciliation Job Trigger,Automatisk Avstämning Jobb Utlösare, +"Batch No {0} is not present in the original {1} {2}, hence you can't return it against the {1} {2}","Parti nr {0} finns inte i {1} {2}, därför kan du inte returnera det mot {1} {2}", +CC,Kopia Till, +Cannot delete Exchange Gain/Loss row,Kan inte ta bort Valutaväxling Resultat rad, +Cannot {0} from {1} without any negative outstanding invoice,Kan inte {0} från {1} utan någon negativ utestående faktura, +Canonical URI,Kanonisk URI, +Child Row Reference,Underordnad Rad Referens, +Code List,Kod Lista, +Common Code,Vanlig Kod, +Company Contact Person,Bolag Kontakt, +"Credit Note will update it's own outstanding amount, even if 'Return Against' is specified.","Kredit Faktura kommer att uppdatera sitt eget utestående belopp, även om ""Retur Mot"" är angivet.", +Cron Interval should be between 1 and 59 Min,Cron Intervall ska vara mellan 1 och 59 minuter, +Dates,Datum, +"Debit Note will update it's own outstanding amount, even if 'Return Against' is specified.","Debet Faktura kommer att uppdatera sitt eget utestående belopp, även om ""Retur Mot"" är angivet.", +Default Common Code,Standard Gemensam Kod, +Deleting {0} and all associated Common Code documents...,Tar bort {0} och alla tillhörande Gemensamma Kod dokument..., +Demand,Efterfråga, +Dimensions,Dimensioner, +Discount cannot be greater than 100%.,Rabatt kan inte vara högre än 100%., +Do you still want to enable immutable ledger?,Vill du fortfarande aktivera oföränderlig bokföring?, +Documents Processed on each trigger. Queue Size should be between 5 and 100,Dokument Behandlade vid varje utlösare. Kö storlek bör vara mellan 5 och 100, +Download PDF for Supplier,Ladda ner PDF för Leverantör, +Email Receipt,E-post, +Error in party matching for Bank Transaction {0},Fel i parti avstämning för banktransaktion {0}, +Event,Händelse, +Exchange Gain / Loss,Valutaväxling Resultat, +Exit Full Screen,Avsluta Helskärm, +Fetching Error,Hämtar Fel, +Forecast,Prognos, +Full Screen,Helskärm, +Has Corrective Cost,Har Korrigerande Kostnad, +"If there is no title column, use the code column for the title.","Om det inte finns någon titel kolumn, använd kod kolumn för titel.", +Ignore Is Opening check for reporting,Ignorera Öppning Kontroll för rapportering, +Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports,Ignorerar gammal 'Är Öppning' fält i Bokföring Post som gör det möjligt att lägga till Öppning Saldo Post efter att system används vid skapande av rapporter, +Import Genericode File,Importera generisk kod fil, +Import completed. {0} common codes created.,Import klar. {0} gemensamma koder skapade., +Importing Common Codes,Importerar Gemensamma Koder, +Interval should be between 1 to 59 MInutes,Intervall ska vara mellan 1 och 59 minuter, +Invalid Discount,Ogiltig Rabatt, +Is Exchange Gain / Loss?,Är Valutaväxling Resultat?, +Is Short/Long Year,Är Kort/Långt År, +Last transacted,Senast genomförd:, +Loading Invoices! Please Wait...,Laddar Fakturor! Vänta..., +Missing Default in Company,Standard Inställningar i Bolag saknas, +Missing Item,Saknad Artikel, +More/Less than 12 months.,Mer/Mindre än 12 månader., +No recent transactions found,Inga nya transaktioner hittades, +Oldest Of Invoice Or Advance,Äldsta Faktura eller Förskott, +Only applies for Normal Payments,Gäller endast för Normala Betalningar, +"Opening Invoice has rounding adjustment of {0}.Statement Of Accounts for {{ customer.customer_name }}Hello {{ customer.customer_name }},
PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}. Hesap Özeti {{ customer.customer_name }}Merhaba {{ customer.customer_name }},
Hesap Özetinizi {{ doc.from_date }} 'den {{ doc.to_date }}'e kadar PFA yapın. Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","Bir grup Ürünü başka bir Üründe toplar. Bu, belirli Ürünleri bir pakette topluyorsanız ve toplu Ürünün değil paketlenmiş Ürünlerin stokunu tutuyorsanız kullanışlıdır.
+Paket Ürünü Stok Ürünü mü Hayır ve Satış Ürünü mü Evet olarak ayarlanacaktır.
Dizüstü Bilgisayarları ve Sırt Çantalarını ayrı ayrı satıyorsanız ve müşteri her ikisini de satın alırsa özel bir fiyatınız varsa, Dizüstü Bilgisayar + Sırt Çantası yeni bir Ürün Paketinin Ürünü olacaktır.
", +"There are 3 variables that could be used within the endpoint, result key and in values of the parameter.
+Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.
+Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}
","Son nokta, sonuç anahtarı ve parametre değerlerinde kullanılabilecek 3 değişken vardır.
+{transaction_date} tarihinde {from_currency} ile {to_currency} arasındaki döviz kuru API tarafından alınır.
+Örnek: Son noktanız exchange.com/2024-08-01 ise, exchange.com/{transaction_date}
girmeniz gerekecektir.", +"The fieldnames you can use in your template are the fields in the document. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Şablonunuzda kullanabileceğiniz alan adları belgede yer alan alanlardır. Herhangi bir belgenin alanlarını Kurulum > Form Görünümünü Özelleştir üzerinden ve belge türünü seçerek öğrenebilirsiniz (örn. Satış Faturası)
+ +Şablonlar Jinja Templating Language kullanılarak derlenir. Jinja hakkında daha fazla bilgi edinmek için bu belgeyi okuyun.
", +"Contract for Customer {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+The field names you can use in your Contract Template are the fields in the Contract for which you are creating the template. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Contract)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Müşteri için Sözleşme {{ party_name }}
+
+-Geçerli Başlangıç : {{ start_date }}
+-Geçerli Bitiş : {{ end_date }}
+
+
+Sözleşme Şablonunuzda kullanabileceğiniz alan adları, şablonunu oluşturduğunuz Sözleşmedeki alanlardır. Herhangi bir belgenin alanlarını Kurulum > Form Görünümünü Özelleştir aracılığıyla ve belge türünü (örneğin Sözleşme) seçerek öğrenebilirsiniz
+ +Şablonlar Jinja Templating Language kullanılarak derlenir. Jinja hakkında daha fazla bilgi edinmek için bu belgeyi okuyun.
", +"Delivery Terms for Order number {{ name }}
+
+-Order Date : {{ transaction_date }}
+-Expected Delivery Date : {{ delivery_date }}
+
+
+The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","Sipariş numarası için Teslimat Koşulları {{ name }}
+
+-Sipariş Tarihi: {{ transaction_date }}
+-Beklenen Teslimat Tarihi: {{ delivery_date }}
+
+
+E-posta şablonunuzda kullanabileceğiniz alan adları, e-postayı gönderdiğiniz belgedeki alanlardır. Herhangi bir belgenin alanlarını Kurulum > Form Görünümünü Özelleştir ve belge türünü (örneğin Satış Faturası) seçerek bulabilirsiniz
+ +Şablonlar Jinja Şablonlama Dili kullanılarak derlenir. Jinja hakkında daha fazla bilgi edinmek için bu dokümanı okuyun.
", +"In your Email Template, you can use the following special variables: +
+{{ update_password_link }}: A link where your supplier can set a new password to log into your portal.
+ {{ portal_link }}: A link to this RFQ in your supplier portal.
+ {{ supplier_name }}: The company name of your supplier.
+ {{ contact.salutation }} {{ contact.last_name }}: The contact person of your supplier.
+ {{ user_fullname }}: Your full name.
+ Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.
E-posta Şablonunuzda, aşağıdaki özel değişkenleri kullanabilirsiniz: +
+{{ update_password_link }}: Tedarikçinizin portalınıza giriş yapmak için yeni bir şifre belirleyebileceği bir bağlantı.
+ {{ portal_link }}: Tedarikçi portalınızda bu Fiyat Teklifi Talebine yönlendiren bir bağlantı.
+ {{ supplier_name }}: Tedarikçinizin şirket adı.
+ {{ contact.salutation }} {{ contact.last_name }}: Tedarikçinizin iletişim kişisi.
+ {{ user_fullname }}: Tam adınız.
+ Bunların dışında, bu Fiyat Teklifi Talebindeki tüm değerlere, {{ message_for_supplier }} veya {{ terms }} gibi, erişebilirsiniz.
+","Message Example
+ +<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p> + +<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p> + +<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Mesaj Örneği
+ +<p> {{ doc.company }}'in bir parçası olduğunuz için teşekkür ederiz! Hizmetten keyif aldığınızı umuyoruz.</p> + +<p> E-Fatura ekstresini ekte bulabilirsiniz. Ödenmemiş tutar {{ doc.grand_total }}'dir.</p> + +<p> Faturanızı ödemek için oradan oraya koşturarak zaman harcamanızı istemiyoruz.
Sonuçta, hayat güzeldir ve elinizdeki zamanı tadını çıkarmak için harcamalısınız!
İşte hayatınıza daha fazla zaman ayırmanıza yardımcı olacak küçük yollarımız! </p> + +<a href=""{{ payment_url }}""> ödeme yapmak için tıklayın </a> + +
+","Message Example
+ +<p>Dear {{ doc.contact_person }},</p> + +<p>Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Masters & Reports","Kayıtlar & Raporlar", +"Quick Access","Hızlı Erişim", +"Reports & Masters","Raporlar & Kayıtlar", +"Reports & Masters","Raporlar & Kayıtlar", +"Settings","Ayarlar", +"Shortcuts","Kısayollar", +"Your Shortcuts + + + + + + ","Kısayollar + + + + + + ", +"Your Shortcuts","Kısayollar", +Grand Total: {0},Genel Toplam: {0}, +Outstanding Amount: {0},Ödenmemiş Tutar: {0}, +"Mesaj Örneği
+ +<p>Sevgili {{ doc.contact_person }},</p> + +<p> {{ doc.doctype }}, {{ doc.name }} için {{ doc.grand_total }}için ödeme talep ediyoruz.</p> + +<a href=""{{ payment_url }}""> ödemek için buraya tıklayın </a> + +
| Child Document | +Non Child Document | +
|---|---|
|
+ To access parent document field use parent.fieldname and to access child table document field use doc.fieldname + + |
+
+ To access document field use doc.fieldname + |
+
|
+ Example: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test"" + + |
+
+ Example: doc.doctype == ""Stock Entry"" and doc.purpose == ""Manufacture"" + |
+
| Çocuk Belgesi | +Çocuk Olmayan Belge | +
|---|---|
|
+ Üst belge alanına erişmek için parent.fieldname ve alt tablo belge alanına erişmek için doc.fieldname kullanın + + |
+
+ Belge alanına erişmek için doc.fieldname kullanın + |
+
|
+ Örnek: parent.doctype == ""Stok Girişi"" ve doc.item_code == ""Test"" + + |
+
+ Örnek: doc.doctype == ""Stok Girişi"" ve doc.purpose == ""Üretim"" + |
+
This action will also delete all associated Common Code documents.
,"{0} girişini silmek istediğinizden emin misiniz?Bu işlem, ilişkili tüm Ortak Kod belgelerini de silecektir.
", +Are you sure you want to restart this subscription?,Bu aboneliği yeniden başlatmak istediğinizden emin misiniz?, +As on Date,Tarih itibariyle, +"As there are existing submitted transactions against item {0}, you can not change the value of {1}.","{0} Ürününe karşı mevcut gönderilmiş işlemler olduğundan, {1} değerini değiştiremezsiniz.", +"As there are negative stock, you can not enable {0}.",Negatif stok olduğu için {0} özelliğini aktif hale getiremezsiniz., +"As there are reserved stock, you cannot disable {0}.",Depolarda Rezerv stok olduğu için {0} ayarını devre dışı bırakamazsınız., +"As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}.","Yeterli Alt Montaj Ürünleri mevcut olduğundan, {0} Deposu için İş Emri gerekli değildir.", +"As {0} is enabled, you can not enable {1}.",{0} etkinleştirildiğinden {1} etkinleştirilemez., +Asset Capitalization Asset Item,Varlık Sermayelendirmesi Varlık Kalemi, +Asset Capitalization Service Item,Varlık Sermayelendirme Hizmet Kalemi, +Asset Capitalization Stock Item,Varlık Sermayesi Stok Kalemi, +Asset Depreciation Details,Varlık Amortisman Detayları, +Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation,Varlık Amortisman Programı {0} ve Finans Defteri {1} için vardiya bazlı amortisman kullanmıyor, +Asset Depreciation Schedule not found for Asset {0} and Finance Book {1},Varlık Amortisman Programı Varlık {0} ve Finans Defteri {1} için bulunamadı, +Asset Depreciation Schedule {0} for Asset {1} already exists.,Varlık Amortisman Programı {0} Varlık {1} için zaten mevcut., +Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists.,Varlık Amortisman Programı {0} Varlık {1} ve Finans Defteri {2} için zaten mevcut., +"Asset Depreciation Schedules created:Statement Of Accounts for {{ customer.customer_name }}Hello {{ customer.customer_name }},
PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}. {{ customer.customer_name }}的账目报表 您好 {{ customer.customer_name }},
PFA 您的会计报表从 {{ doc.from_date }} 转到 {{ doc.to_date }}。 Aggregate group of Items into another Item. This is useful if you are bundling a certain Items into a package and you maintain stock of the packed Items and not the aggregate Item.
+The package Item will have Is Stock Item as No and Is Sales Item as Yes.
If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
","将一组货品汇总到另一个货品中。如果您要将某个项目捆绑到一个包中，而您只保留打包项目的库存，而不保留汇总项目的库存，这将非常有用。
+打包项目的Is Stock Item （库存项目）为No，Is Sales Item （销售项目）为Yes。
如果您分别销售笔记本电脑和背包，并且如果客户同时购买这两件商品，您可以享受优惠价格，那么笔记本电脑+背包将成为一个新的产品组合项目。
", +"There are 3 variables that could be used within the endpoint, result key and in values of the parameter.
+Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.
+Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}
","在端点、结果键和参数值中可以使用 3 个变量。
+API 将获取 {transaction_date} 上 {from_currency} 和 {to_currency} 之间的汇率。
+举例说明：如果您的端点是 exchange.com/2021-08-01，则必须输入 exchange.com/{transaction_date}。
", +"The fieldnames you can use in your template are the fields in the document. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","您可以在模板中使用的字段名是文档中的字段。您可以通过设置 > 自定义表单视图并选择文档类型（如销售发票）来查找任何文档的字段。
+ +模板使用 Jinja 模板语言编译。要了解有关 Jinja 的更多信息，请阅读此文档。
", +"Contract for Customer {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+The field names you can use in your Contract Template are the fields in the Contract for which you are creating the template. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Contract)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","客户合同 {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+您可以在合同模板中使用的字段名称是您创建模板的合同中的字段。您可以通过设置 > 自定义表单视图并选择文档类型（如合同）来查找任何文档的字段。
+ +模板使用 Jinja 模板语言编译。要了解有关 Jinja 的更多信息，请阅读此文档。
", +"Delivery Terms for Order number {{ name }}
+
+-Order Date : {{ transaction_date }}
+-Expected Delivery Date : {{ delivery_date }}
+
+
+The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
+ +Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
","客户合同 {{ party_name }}
+
+-Valid From : {{ start_date }}
+-Valid To : {{ end_date }}
+
+
+您可以在合同模板中使用的字段名称是您创建模板的合同中的字段。您可以通过设置 > 自定义表单视图并选择文档类型（如合同）来查找任何文档的字段。
+ +模板使用 Jinja 模板语言编译。要了解有关 Jinja 的更多信息，请阅读此文档。
", +"In your Email Template, you can use the following special variables: +
+{{ update_password_link }}: A link where your supplier can set a new password to log into your portal.
+ {{ portal_link }}: A link to this RFQ in your supplier portal.
+ {{ supplier_name }}: The company name of your supplier.
+ {{ contact.salutation }} {{ contact.last_name }}: The contact person of your supplier.
+ {{ user_fullname }}: Your full name.
+ Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.
在电子邮件模板中，您可以使用以下特殊变量： +
+{{ update_password_link }}:供应商可以设置新密码登录门户网站的链接。
+ {{ portal_link }}:供应商门户网站中该询价单的链接。
+ {{ supplier_name }}:供应商的公司名称。
+ {{ contact.salutation }} {{ contact.last_name }}:供应商的联系人。
+ {{ user_fullname }}:您的全名。
+ 除此之外，您还可以访问此 RFQ 中的所有值，如 {{ message_for_supplier }}或 {{ terms }}.
+","Message Example
+ +<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p> + +<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p> + +<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"信息示例
+ +<p> 感谢您成为 {{ doc.company }}的一员！希望您能享受我们的服务。</p> + +<p> 随信附上电子账单。未付金额为 {{ doc.grand_total }}。</p> + +<p> 我们不希望您为了支付账单而花费时间四处奔波。
毕竟，生活是美好的，您手中的时间应该用来享受生活！
因此，我们有一些小方法来帮助您获得更多的生活时间！ </p> + +<a href=""{{ payment_url }}""> 点击此处付款 </a> + +
+","Message Example
+ +<p>Dear {{ doc.contact_person }},</p> + +<p>Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.</p> + +<a href=""{{ payment_url }}""> click here to pay </a> + +
+", +"Quick Access","快速访问", +"Reports & Masters","报表与主数据", +"Reports & Masters","报表 & 主数据", +"Settings","设置", +"Shortcuts","快捷方式", +"Your Shortcuts + + + + + + ","快速访问 + + + + + + ", +"Your Shortcuts","快速访问", +Grand Total: {0},总计： {0}, +Outstanding Amount: {0},未清金额： {0}, +"消息示例
+ +<p>亲爱的 {{ doc.contact_person }}，</p> + +<p>请求支付 {{ doc.doctype }}、 {{ doc.name }} 和 {{ doc.grand_total }}的费用。</p> + +<a href=""{{ payment_url }}""> 点击此处支付 </a> + +
| Child Document | +Non Child Document | +
|---|---|
|
+ To access parent document field use parent.fieldname and to access child table document field use doc.fieldname + + |
+
+ To access document field use doc.fieldname + |
+
|
+ Example: parent.doctype == ""Stock Entry"" and doc.item_code == ""Test"" + + |
+
+ Example: doc.doctype == ""Stock Entry"" and doc.purpose == ""Manufacture"" + |
+
| 子文档 | +非子文档 | +
|---|---|
|
+ 要访问父文档字段，请使用 parent.字段名；要访问子表文档字段，请使用doc.字段名 + + |
+
+ 要访问文档字段，请使用 doc.字段名 + |
+
|
+ 示例： parent.doctype == ""入库单"" 和 doc.item_code == ""测试物料"" + + |
+
+ 示例： doc.doctype == “入库单” 和 doc.purpose == “生产用途” + |
+
This action will also delete all associated Common Code documents.
,确认删除{0}？此操作将同时删除所有关联通用编码文档
, +Are you sure you want to restart this subscription?,确认重启此订阅？, +As on Date,截至日期, +"As there are existing submitted transactions against item {0}, you can not change the value of {1}.",由于存在针对物料{0}的已提交交易，不可修改{1}的值, +"As there are negative stock, you can not enable {0}.",存在负库存时不可启用{0}, +"As there are reserved stock, you cannot disable {0}.",存在预留库存时不可禁用{0}, +"As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}.",由于子装配件充足，仓库{0}无需工单, +"As {0} is enabled, you can not enable {1}.",{0}已启用时不可启用{1}, +Assembly Items,装配物料, +Asset Activity,资产活动, +Asset Capitalization,资产资本化, +Asset Capitalization Asset Item,资产资本化资产项目, +Asset Capitalization Service Item,资产资本化服务项目, +Asset Capitalization Stock Item,资产资本化库存项目, +Asset Depreciation Details,资产折旧明细, +Asset Depreciation Schedule,资产折旧计划, +Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation,资产{0}与财务账簿{1}的折旧计划未采用班次折旧法, +Asset Depreciation Schedule not found for Asset {0} and Finance Book {1},未找到资产{0}与财务账簿{1}的折旧计划, +Asset Depreciation Schedule {0} for Asset {1} already exists.,资产{1}的折旧计划{0}已存在, +Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists.,资产{1}与财务账簿{2}的折旧计划{0}已存在, +"Asset Depreciation Schedules created: