Merge branch 'develop' into fix-profit-and-loss-statement
This commit is contained in:
commit
ba3c9b7651
@ -7,6 +7,8 @@ def execute():
|
||||
if not company:
|
||||
return
|
||||
|
||||
frappe.reload_doc('accounts', 'doctype', 'Tax Category')
|
||||
|
||||
make_custom_fields()
|
||||
|
||||
for doctype in ['Sales Invoice', 'Purchase Invoice']:
|
||||
|
@ -14,6 +14,7 @@ from frappe.model.document import Document
|
||||
from frappe.contacts.address_and_contact import load_address_and_contact
|
||||
from frappe.utils.nestedset import NestedSet
|
||||
|
||||
from past.builtins import cmp
|
||||
import functools
|
||||
|
||||
class Company(NestedSet):
|
||||
|
Loading…
x
Reference in New Issue
Block a user