nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12

Browse Source 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
This commit is contained in:
Saif Ur Rehman
2019-03-08 01:29:39 +05:00
parent 590491779a 703a597478
commit e62bd893c5
254 changed files with 43145 additions and 38593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/company/test_company.py
View File

@@ -46,7 +46,7 @@ class TestCompany(unittest.TestCase):
def test_coa_based_on_country_template(self):
countries = ["India", "Brazil", "United Arab Emirates", "Canada", "Germany", "France",
"Guatemala", "Indonesia", "Mexico", "Nicaragua", "Netherlands", "Singapore",
"Guatemala", "Indonesia", "Italy", "Mexico", "Nicaragua", "Netherlands", "Singapore",
"Brazil", "Argentina", "Hungary", "Taiwan"]
for country in countries:

70
erpnext/setup/doctype/item_group/item_group.json
View File

@@ -275,6 +275,72 @@
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": "",
"columns": 0,
"fieldname": "sec_break_taxes",
"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": "Item Tax",
"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
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "taxes",
"fieldtype": "Table",
"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": "Taxes",
"length": 0,
"no_copy": 0,
"options": "Item Tax",
"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
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
@@ -617,7 +683,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
"modified": "2019-01-07 16:52:06.106336",
"modified": "2018-11-23 15:17:28.003933",
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",
@@ -748,4 +814,4 @@
"track_changes": 0,
"track_seen": 0,
"track_views": 0
}
}

34
erpnext/setup/doctype/item_group/test_records.json
View File

@@ -69,5 +69,39 @@
"is_group": 1,
"item_group_name": "_Test Item Group D",
"parent_item_group": "All Item Groups"
},
{
"doctype": "Item Group",
"is_group": 1,
"item_group_name": "_Test Item Group Tax Parent",
"parent_item_group": "All Item Groups",
"taxes": [
{
"doctype": "Item Tax",
"parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 10",
"tax_category": ""
},
{
"doctype": "Item Tax",
"parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 12",
"tax_category": "_Test Tax Category 1"
}
]
},
{
"doctype": "Item Group",
"is_group": 0,
"item_group_name": "_Test Item Group Tax Child Override",
"parent_item_group": "_Test Item Group Tax Parent",
"taxes": [
{
"doctype": "Item Tax",
"parentfield": "taxes",
"item_tax_template": "_Test Account Excise Duty @ 15",
"tax_category": ""
}
]
}
]

5
erpnext/setup/doctype/setup_progress/setup_progress.py
View File

@@ -16,8 +16,9 @@ def get_setup_progress():
return frappe.local.setup_progress
def get_action_completed_state(action_name):
return [d.is_completed for d in get_setup_progress().actions
if d.action_name == action_name][0]
for d in get_setup_progress().actions:
if d.action_name == action_name:
return d.is_completed
def update_action_completed_state(action_name):
action_table_doc = [d for d in get_setup_progress().actions

5
erpnext/setup/setup_wizard/operations/defaults_setup.py
View File

@@ -5,7 +5,6 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr, getdate
from frappe.core.doctype.communication.comment import add_info_comment
def set_default_settings(args):
# enable default currency
@@ -114,9 +113,7 @@ def create_territories():
def create_feed_and_todo():
"""update Activity feed and create todo for creation of item, customer, vendor"""
add_info_comment(**{
"subject": _("ERPNext Setup Complete!")
})
return
def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year

6
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -252,7 +252,7 @@ def install(country=None):
from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import make_default_records
make_default_records()
make_records(records, True)
make_records(records)
set_more_defaults()
@@ -366,7 +366,7 @@ def install_company(args):
}
]
make_records(records, True)
make_records(records)
def install_post_company_fixtures(args=None):
@@ -474,7 +474,7 @@ def install_defaults(args=None):
},
]
make_records(records, True)
make_records(records)
def get_fy_details(fy_start_date, fy_end_date):