nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into pseudo-translate-in-setup-wizard

Browse Source
This commit is contained in:
Raffael Meyer
2024-08-22 16:01:17 +02:00
committed by GitHub
parent 97c2853497 2ca0f416a9
commit f6371f4a0d
162 changed files with 10544 additions and 8846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
erpnext/setup/doctype/brand/brand.js
View File

@@ -3,22 +3,14 @@
frappe.ui.form.on("Brand", {
setup: (frm) => {
frm.fields_dict["brand_defaults"].grid.get_field("default_warehouse").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("default_warehouse", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: { company: row.company },
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("default_discount_account").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("default_discount_account", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: {
@@ -27,13 +19,9 @@ frappe.ui.form.on("Brand", {
is_group: 0,
},
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("buying_cost_center").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("buying_cost_center", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: {
@@ -41,25 +29,17 @@ frappe.ui.form.on("Brand", {
company: row.company,
},
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("expense_account").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("expense_account", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.get_expense_account",
filters: { company: row.company },
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("default_provisional_account").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("default_provisional_account", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: {
@@ -68,13 +48,9 @@ frappe.ui.form.on("Brand", {
is_group: 0,
},
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("selling_cost_center").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("selling_cost_center", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: {
@@ -82,18 +58,14 @@ frappe.ui.form.on("Brand", {
company: row.company,
},
};
};
});
frm.fields_dict["brand_defaults"].grid.get_field("income_account").get_query = function (
doc,
cdt,
cdn
) {
frm.set_query("income_account", "brand_defaults", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.get_income_account",
filters: { company: row.company },
};
};
});
},
});

3
erpnext/setup/doctype/brand/brand.json
View File

@@ -56,10 +56,11 @@
"idx": 1,
"image_field": "image",
"links": [],
"modified": "2024-03-27 13:06:42.500721",
"modified": "2024-08-20 14:10:21.377962",
"modified_by": "Administrator",
"module": "Setup",
"name": "Brand",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{

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

@@ -202,7 +202,7 @@ class Company(NestedSet):
):
frappe.throw(
_("'{0}' should be in company currency {1}.").format(
frappe.bold("Default Advance Received Account"), frappe.bold(self.default_currency)
frappe.bold(_("Default Advance Received Account")), frappe.bold(self.default_currency)
)
)
@@ -213,7 +213,7 @@ class Company(NestedSet):
):
frappe.throw(
_("'{0}' should be in company currency {1}.").format(
frappe.bold("Default Advance Paid Account"), frappe.bold(self.default_currency)
frappe.bold(_("Default Advance Paid Account")), frappe.bold(self.default_currency)
)
)
@@ -444,7 +444,7 @@ class Company(NestedSet):
):
frappe.throw(
_("Set default {0} account for non stock items").format(
frappe.bold("Provisional Account")
frappe.bold(_("Provisional Account"))
)
)

67
erpnext/setup/form_tour/company/company.json
View File

@@ -1,67 +0,0 @@
{
"creation": "2021-11-24 10:17:18.534917",
"docstatus": 0,
"doctype": "Form Tour",
"first_document": 1,
"idx": 0,
"include_name_field": 0,
"is_standard": 1,
"modified": "2021-11-24 15:38:21.026582",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
"owner": "Administrator",
"reference_doctype": "Company",
"save_on_complete": 0,
"steps": [
{
"description": "This is the default currency for this company.",
"field": "",
"fieldname": "default_currency",
"fieldtype": "Link",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Default Currency",
"parent_field": "",
"position": "Right",
"title": "Default Currency"
},
{
"description": "Here, you can add multiple addresses of the company",
"field": "",
"fieldname": "company_info",
"fieldtype": "Section Break",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Address & Contact",
"parent_field": "",
"position": "Top",
"title": "Address & Contact"
},
{
"description": "Here, you can set default Accounts, which will ease the creation of accounting entries.",
"field": "",
"fieldname": "default_settings",
"fieldtype": "Section Break",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Accounts Settings",
"parent_field": "",
"position": "Top",
"title": "Accounts Settings"
},
{
"description": "This setting is recommended if you wish to track the real-time stock balance in your books of account. This will allow the creation of a General Ledger entry for every stock transaction.",
"field": "",
"fieldname": "enable_perpetual_inventory",
"fieldtype": "Check",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Enable Perpetual Inventory",
"parent_field": "",
"position": "Right",
"title": "Enable Perpetual Inventory"
}
],
"title": "Company"
}

47
erpnext/setup/module_onboarding/home/home.json
View File

@@ -1,47 +0,0 @@
{
"allow_roles": [
{
"role": "Accounts Manager"
},
{
"role": "Stock Manager"
},
{
"role": "Sales Manager"
},
{
"role": "Purchase Manager"
},
{
"role": "Manufacturing Manager"
},
{
"role": "Item Manager"
}
],
"creation": "2021-11-22 12:19:15.888642",
"docstatus": 0,
"doctype": "Module Onboarding",
"documentation_url": "https://docs.erpnext.com/docs/v14/user/manual/en/setting-up/company-setup",
"idx": 0,
"is_complete": 0,
"modified": "2023-05-23 13:20:19.703506",
"modified_by": "Administrator",
"module": "Setup",
"name": "Home",
"owner": "Administrator",
"steps": [
{
"step": "Create an Item"
},
{
"step": "Create a Customer"
},
{
"step": "Create Your First Sales Invoice"
}
],
"subtitle": "Item, Customer, Supplier and Quotation",
"success_message": "You're ready to start your journey with ERPNext",
"title": "Let's begin your journey with ERPNext"
}

21
erpnext/setup/onboarding_step/company_set_up/company_set_up.json
View File

@@ -1,21 +0,0 @@
{
"action": "Create Entry",
"action_label": "Let's review your Company",
"creation": "2021-11-22 11:55:48.931427",
"description": "# Set Up a Company\n\nA company is a legal entity for which you will set up your books of account and create accounting transactions. In ERPNext, you can create multiple companies, and establish relationships (group/subsidiary) among them.\n\nWithin the company master, you can capture various default accounts for that Company and set crucial settings related to the accounting methodology followed for a company.\n",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-15 09:18:42.895537",
"modified_by": "Administrator",
"name": "Company Set Up",
"owner": "Administrator",
"reference_document": "Company",
"show_form_tour": 1,
"show_full_form": 1,
"title": "Set Up a Company",
"validate_action": 1
}

21
erpnext/setup/onboarding_step/create_a_customer/create_a_customer.json
View File

@@ -1,21 +0,0 @@
{
"action": "Create Entry",
"action_label": "Let\u2019s create your first Customer",
"creation": "2020-05-14 17:46:41.831517",
"description": "# Create a Customer\n\nThe Customer master is at the heart of your sales transactions. Customers are linked in Quotations, Sales Orders, Invoices, and Payments. Customers can be either numbered or identified by name (you would typically do this based on the number of customers you have).\n\nThrough Customer\u2019s master, you can effectively track essentials like:\n - Customer\u2019s multiple address and contacts\n - Account Receivables\n - Credit Limit and Credit Period\n",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-23 12:45:55.138580",
"modified_by": "Administrator",
"name": "Create a Customer",
"owner": "Administrator",
"reference_document": "Customer",
"show_form_tour": 0,
"show_full_form": 0,
"title": "Create a Customer",
"validate_action": 1
}

21
erpnext/setup/onboarding_step/create_a_quotation/create_a_quotation.json
View File

@@ -1,21 +0,0 @@
{
"action": "Create Entry",
"action_label": "Let\u2019s create your first Quotation",
"creation": "2020-06-01 13:34:58.958641",
"description": "# Create a Quotation\n\nLet\u2019s get started with business transactions by creating your first Quotation. You can create a Quotation for an existing customer or a prospect. It will be an approved document, with items you sell and the proposed price + taxes applied. After completing the instructions, you will get a Quotation in a ready to share print format.",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-15 09:18:42.984170",
"modified_by": "Administrator",
"name": "Create a Quotation",
"owner": "Administrator",
"reference_document": "Quotation",
"show_form_tour": 1,
"show_full_form": 1,
"title": "Create your first Quotation",
"validate_action": 1
}

21
erpnext/setup/onboarding_step/create_a_supplier/create_a_supplier.json
View File

@@ -1,21 +0,0 @@
{
"action": "Create Entry",
"action_label": "Let\u2019s create your first Supplier",
"creation": "2020-05-14 22:09:10.043554",
"description": "# Create a Supplier\n\nAlso known as Vendor, is a master at the center of your purchase transactions. Suppliers are linked in Request for Quotation, Purchase Orders, Receipts, and Payments. Suppliers can be either numbered or identified by name.\n\nThrough Supplier\u2019s master, you can effectively track essentials like:\n - Supplier\u2019s multiple address and contacts\n - Account Receivables\n - Credit Limit and Credit Period\n",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-19 15:32:55.069257",
"modified_by": "Administrator",
"name": "Create a Supplier",
"owner": "Administrator",
"reference_document": "Supplier",
"show_form_tour": 0,
"show_full_form": 0,
"title": "Create a Supplier",
"validate_action": 1
}

23
erpnext/setup/onboarding_step/create_an_item/create_an_item.json
View File

@@ -1,23 +0,0 @@
{
"action": "Create Entry",
"action_label": "Create a new Item",
"creation": "2021-05-17 13:47:18.515052",
"description": "# Create an Item\n\nItem is a product or a service offered by your company, or something you buy as a part of your supplies or raw materials.\n\nItems are integral to everything you do in ERPNext - from billing, purchasing to managing inventory. Everything you buy or sell, whether it is a physical product or a service is an Item. Items can be stock, non-stock, variants, serialized, batched, assets, etc.\n",
"docstatus": 0,
"doctype": "Onboarding Step",
"form_tour": "Item General",
"idx": 1,
"intro_video_url": "",
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-23 12:43:08.484206",
"modified_by": "Administrator",
"name": "Create an Item",
"owner": "Administrator",
"reference_document": "Item",
"show_form_tour": 1,
"show_full_form": 0,
"title": "Create an Item",
"validate_action": 1
}

20
erpnext/setup/onboarding_step/create_your_first_sales_invoice/create_your_first_sales_invoice.json
View File

@@ -1,20 +0,0 @@
{
"action": "Create Entry",
"creation": "2020-05-14 17:48:21.019019",
"description": "# All about sales invoice\n\nA Sales Invoice is a bill that you send to your Customers against which the Customer makes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice, the system updates the receivable and books income against a Customer Account.",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-22 21:20:15.589644",
"modified_by": "Administrator",
"name": "Create Your First Sales Invoice",
"owner": "Administrator",
"reference_document": "Sales Invoice",
"show_form_tour": 1,
"show_full_form": 1,
"title": "Create Your First Sales Invoice ",
"validate_action": 1
}

21
erpnext/setup/onboarding_step/data_import/data_import.json
View File

@@ -1,21 +0,0 @@
{
"action": "Watch Video",
"action_label": "Learn more about data migration",
"creation": "2021-05-19 05:29:16.809610",
"description": "# Import Data from Spreadsheet\n\nIn ERPNext, you can easily migrate your historical data using spreadsheets. You can use it for migrating not just masters (like Customer, Supplier, Items), but also for transactions like (outstanding invoices, opening stock and accounting entries, etc).",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-15 09:18:42.962231",
"modified_by": "Administrator",
"name": "Data import",
"owner": "Administrator",
"show_form_tour": 0,
"show_full_form": 0,
"title": "Import Data from Spreadsheet",
"validate_action": 1,
"video_url": "https://youtu.be/DQyqeurPI64"
}

21
erpnext/setup/onboarding_step/letterhead/letterhead.json
View File

@@ -1,21 +0,0 @@
{
"action": "Create Entry",
"action_label": "Let\u2019s setup your first Letter Head",
"creation": "2021-11-22 12:36:34.583783",
"description": "# Create a Letter Head\n\nA Letter Head contains your organization's name, logo, address, etc which appears at the header and footer portion in documents. You can learn more about Setting up Letter Head in ERPNext here.\n",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-15 09:18:42.995184",
"modified_by": "Administrator",
"name": "Letterhead",
"owner": "Administrator",
"reference_document": "Letter Head",
"show_form_tour": 1,
"show_full_form": 1,
"title": "Setup Your Letterhead",
"validate_action": 1
}

21
erpnext/setup/onboarding_step/navigation_help/navigation_help.json
View File

@@ -1,21 +0,0 @@
{
"action": "Watch Video",
"action_label": "Learn about Navigation options",
"creation": "2021-11-22 12:09:52.233872",
"description": "# Navigation in ERPNext\n\nEase of navigating and browsing around the ERPNext is one of our core strengths. In the following video, you will learn how to reach a specific feature in ERPNext via module page or AwesomeBar.",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2023-05-16 12:53:25.939908",
"modified_by": "Administrator",
"name": "Navigation Help",
"owner": "Administrator",
"show_form_tour": 0,
"show_full_form": 0,
"title": "How to Navigate in ERPNext",
"validate_action": 1,
"video_url": "https://youtu.be/j60xyNFqX_A"
}

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

@@ -73,29 +73,53 @@ def install(country=None):
"parent_item_group": _("All Item Groups"),
},
# Stock Entry Type
{"doctype": "Stock Entry Type", "name": _("Material Issue"), "purpose": "Material Issue"},
{"doctype": "Stock Entry Type", "name": _("Material Receipt"), "purpose": "Material Receipt"},
{
"doctype": "Stock Entry Type",
"name": _("Material Issue"),
"purpose": "Material Issue",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Material Receipt"),
"purpose": "Material Receipt",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Material Transfer"),
"purpose": "Material Transfer",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Manufacture"),
"purpose": "Manufacture",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Repack"),
"purpose": "Repack",
"is_standard": 1,
},
{"doctype": "Stock Entry Type", "name": _("Manufacture"), "purpose": "Manufacture"},
{"doctype": "Stock Entry Type", "name": _("Repack"), "purpose": "Repack"},
{
"doctype": "Stock Entry Type",
"name": _("Send to Subcontractor"),
"purpose": "Send to Subcontractor",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Material Transfer for Manufacture"),
"purpose": "Material Transfer for Manufacture",
"is_standard": 1,
},
{
"doctype": "Stock Entry Type",
"name": _("Material Consumption for Manufacture"),
"purpose": "Material Consumption for Manufacture",
"is_standard": 1,
},
# territory: with two default territories, one for home country and one named Rest of the World
{