nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47130 from frappe/mergify/bp/version-14-hotfix/pr-47125

Browse Source 
fix: create default warehouse (backport #47125)
This commit is contained in:
Raffael Meyer
2025-04-17 13:56:56 +02:00
committed by GitHub
parent 503b89a764 f04c73b9c2
commit 35c9375f0d
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/linters.yml vendored
View File

@@ -9,15 +9,16 @@ jobs:
name: linters name: linters
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python 3.10 - name: Set up Python 3.10
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: '3.10' python-version: '3.10'
cache: pip
- name: Install and Run Pre-commit - name: Install and Run Pre-commit
uses: pre-commit/action@v2.0.3 uses: pre-commit/action@v3.0.0
- name: Download Semgrep rules - name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

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

@@ -167,6 +167,7 @@ class Company(NestedSet):
frappe.clear_cache() frappe.clear_cache()
def create_default_warehouses(self): def create_default_warehouses(self):
parent_warehouse = None
for wh_detail in [ for wh_detail in [
{"warehouse_name": _("All Warehouses"), "is_group": 1}, {"warehouse_name": _("All Warehouses"), "is_group": 1},
{"warehouse_name": _("Stores"), "is_group": 0}, {"warehouse_name": _("Stores"), "is_group": 0},
@@ -174,24 +175,31 @@ class Company(NestedSet):
{"warehouse_name": _("Finished Goods"), "is_group": 0}, {"warehouse_name": _("Finished Goods"), "is_group": 0},
{"warehouse_name": _("Goods In Transit"), "is_group": 0, "warehouse_type": "Transit"}, {"warehouse_name": _("Goods In Transit"), "is_group": 0, "warehouse_type": "Transit"},
]: ]:
if not frappe.db.exists("Warehouse", "{} - {}".format(wh_detail["warehouse_name"], self.abbr)): if frappe.db.exists(
warehouse = frappe.get_doc( "Warehouse",
{ {
"doctype": "Warehouse", "warehouse_name": wh_detail["warehouse_name"],
"warehouse_name": wh_detail["warehouse_name"], "company": self.name,
"is_group": wh_detail["is_group"], },
"company": self.name, ):
"parent_warehouse": "{} - {}".format(_("All Warehouses"), self.abbr) continue
if not wh_detail["is_group"]
else "", warehouse = frappe.get_doc(
"warehouse_type": wh_detail["warehouse_type"] {
if "warehouse_type" in wh_detail "doctype": "Warehouse",
else None, "warehouse_name": wh_detail["warehouse_name"],
} "is_group": wh_detail["is_group"],
) "company": self.name,
warehouse.flags.ignore_permissions = True "parent_warehouse": parent_warehouse,
warehouse.flags.ignore_mandatory = True "warehouse_type": wh_detail.get("warehouse_type"),
warehouse.insert() }
)
warehouse.flags.ignore_permissions = True
warehouse.flags.ignore_mandatory = True
warehouse.insert()
if wh_detail["is_group"]:
parent_warehouse = warehouse.name
def create_default_accounts(self): def create_default_accounts(self):
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts