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

Merge branch 'develop' into fix-profit-and-loss-statement

Browse Source
This commit is contained in:
Suraj Shetty 2019-12-14 23:36:11 +05:30 committed by GitHub
commit ba3c9b7651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v12_0/set_gst_category.py
View File

@ -7,6 +7,8 @@ def execute():
if not company: if not company:
return return
frappe.reload_doc('accounts', 'doctype', 'Tax Category')
make_custom_fields() make_custom_fields()
for doctype in ['Sales Invoice', 'Purchase Invoice']: for doctype in ['Sales Invoice', 'Purchase Invoice']:

1
erpnext/setup/doctype/company/company.py
View File

@ -14,6 +14,7 @@ from frappe.model.document import Document
from frappe.contacts.address_and_contact import load_address_and_contact from frappe.contacts.address_and_contact import load_address_and_contact
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet
from past.builtins import cmp
import functools import functools
class Company(NestedSet): class Company(NestedSet):