Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into dev_enhance_upgrade_process

Browse Source
This commit is contained in:
HENRY Florian 2022-09-02 13:01:06 +02:00 committed by GitHub
commit 7919513c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.py
View File

@ -34,4 +34,4 @@ class ProcessDeferredAccounting(Document):
filters={"against_voucher_type": self.doctype, "against_voucher": self.name}, filters={"against_voucher_type": self.doctype, "against_voucher": self.name},
) )
make_gl_entries(gl_entries=gl_entries, cancel=1) make_gl_entries(gl_map=gl_entries, cancel=1)

13
erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
View File

@ -57,3 +57,16 @@ class TestProcessDeferredAccounting(unittest.TestCase):
] ]
check_gl_entries(self, si.name, expected_gle, "2019-01-10") check_gl_entries(self, si.name, expected_gle, "2019-01-10")
def test_pda_submission_and_cancellation(self):
pda = frappe.get_doc(
dict(
doctype="Process Deferred Accounting",
posting_date="2019-01-01",
start_date="2019-01-01",
end_date="2019-01-31",
type="Income",
)
)
pda.submit()
pda.cancel()

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

@ -535,7 +535,11 @@ def get_accounts(root_type, companies):
): ):
if account.account_name not in added_accounts: if account.account_name not in added_accounts:
accounts.append(account) accounts.append(account)
added_accounts.append(account.account_name) if account.account_number:
account_key = account.account_number + "-" + account.account_name
else:
account_key = account.account_name
added_accounts.append(account_key)
return accounts return accounts

4
erpnext/buying/doctype/buying_settings/buying_settings.json
View File

@ -76,7 +76,7 @@
"label": "Subcontracting Settings" "label": "Subcontracting Settings"
}, },
{ {
"default": "Material Transferred for Subcontract", "default": "BOM",
"fieldname": "backflush_raw_materials_of_subcontract_based_on", "fieldname": "backflush_raw_materials_of_subcontract_based_on",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Backflush Raw Materials of Subcontract Based On", "label": "Backflush Raw Materials of Subcontract Based On",
@ -148,7 +148,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2022-05-31 19:40:26.103909", "modified": "2022-09-01 18:01:34.994657",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Buying Settings", "name": "Buying Settings",