schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-08-13 11:22:52 +05:30
parent cef3573d79
commit e421e16fdc
2 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View File

@@ -391,11 +391,7 @@
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-18 12:20:08.965120",
=======
"modified": "2024-08-13 10:41:18.381165", "modified": "2024-08-13 10:41:18.381165",
>>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Statement Of Accounts", "name": "Process Statement Of Accounts",

57
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@@ -22,63 +22,6 @@ from erpnext.accounts.report.general_ledger.general_ledger import execute as get
class ProcessStatementOfAccounts(Document): class ProcessStatementOfAccounts(Document):
<<<<<<< HEAD
=======
# 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.accounts.doctype.process_statement_of_accounts_customer.process_statement_of_accounts_customer import (
ProcessStatementOfAccountsCustomer,
)
from erpnext.accounts.doctype.psoa_cost_center.psoa_cost_center import PSOACostCenter
from erpnext.accounts.doctype.psoa_project.psoa_project import PSOAProject
account: DF.Link | None
ageing_based_on: DF.Literal["Due Date", "Posting Date"]
based_on_payment_terms: DF.Check
body: DF.TextEditor | None
cc_to: DF.Link | None
collection_name: DF.DynamicLink | None
company: DF.Link
cost_center: DF.TableMultiSelect[PSOACostCenter]
currency: DF.Link | None
customer_collection: DF.Literal["", "Customer Group", "Territory", "Sales Partner", "Sales Person"]
customers: DF.Table[ProcessStatementOfAccountsCustomer]
enable_auto_email: DF.Check
filter_duration: DF.Int
finance_book: DF.Link | None
frequency: DF.Literal["Weekly", "Monthly", "Quarterly"]
from_date: DF.Date | None
group_by: DF.Literal["", "Group by Voucher", "Group by Voucher (Consolidated)"]
ignore_cr_dr_notes: DF.Check
ignore_exchange_rate_revaluation_journals: DF.Check
include_ageing: DF.Check
include_break: DF.Check
letter_head: DF.Link | None
orientation: DF.Literal["Landscape", "Portrait"]
payment_terms_template: DF.Link | None
pdf_name: DF.Data | None
posting_date: DF.Date | None
primary_mandatory: DF.Check
project: DF.TableMultiSelect[PSOAProject]
report: DF.Literal["General Ledger", "Accounts Receivable"]
sales_partner: DF.Link | None
sales_person: DF.Link | None
sender: DF.Link | None
show_net_values_in_party_account: DF.Check
start_date: DF.Date | None
subject: DF.Data | None
terms_and_conditions: DF.Link | None
territory: DF.Link | None
to_date: DF.Date | None
# end: auto-generated types
>>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts)
def validate(self): def validate(self):
if not self.subject: if not self.subject:
self.subject = "Statement Of Accounts for {{ customer.customer_name }}" self.subject = "Statement Of Accounts for {{ customer.customer_name }}"