diff --git a/.eslintrc b/.eslintrc index db469e5..1a9f8a2 100644 --- a/.eslintrc +++ b/.eslintrc @@ -61,7 +61,7 @@ "globals": { "xhiveframework": true, "Vue": true, - "erpnext": true, + "xhiveerp": true, "hub": true, "$": true, "jQuery": true, diff --git a/.gitignore b/.gitignore index 89f5626..6f4a683 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ latest_updates.json .wnf-lang-status *.egg-info dist/ -erpnext/public/dist -erpnext/docs/current +xhiveerp/public/dist +xhiveerp/docs/current *.swp *.swo __pycache__ @@ -16,4 +16,4 @@ __pycache__ .idea/ .vscode/ node_modules/ -.backportrc.json \ No newline at end of file +.backportrc.json diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d70977c..f19a3fe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: rev: v4.0.1 hooks: - id: trailing-whitespace - files: "erpnext.*" + files: "xhiveerp.*" exclude: ".*json$|.*txt$|.*csv|.*md" - id: check-yaml - id: no-commit-to-branch diff --git a/.releaserc b/.releaserc index 3c54123..439d4df 100644 --- a/.releaserc +++ b/.releaserc @@ -10,12 +10,12 @@ "@semantic-release/release-notes-generator", [ "@semantic-release/exec", { - "prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" erpnext/__init__.py' + "prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" xhiveerp/__init__.py' } ], [ "@semantic-release/git", { - "assets": ["erpnext/__init__.py"], + "assets": ["xhiveerp/__init__.py"], "message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}" } ], diff --git a/CODEOWNERS b/CODEOWNERS index 7f8c4d1..501de63 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,23 +3,23 @@ # These owners will be the default owners for everything in # the repo. Unless a later match takes precedence, -erpnext/accounts/ @deepeshgarg007 @ruthra-kumar -erpnext/assets/ @anandbaburajan @deepeshgarg007 -erpnext/loan_management/ @deepeshgarg007 -erpnext/regional @deepeshgarg007 @ruthra-kumar -erpnext/selling @deepeshgarg007 @ruthra-kumar -erpnext/support/ @deepeshgarg007 -pos* +xhiveerp/accounts/ @deepeshgarg007 @ruthra-kumar +xhiveerp/assets/ @anandbaburajan @deepeshgarg007 +xhiveerp/loan_management/ @deepeshgarg007 +xhiveerp/regional @deepeshgarg007 @ruthra-kumar +xhiveerp/selling @deepeshgarg007 @ruthra-kumar +xhiveerp/support/ @deepeshgarg007 +pos* -erpnext/buying/ @rohitwaghchaure @s-aga-r -erpnext/maintenance/ @rohitwaghchaure @s-aga-r -erpnext/manufacturing/ @rohitwaghchaure @s-aga-r -erpnext/quality_management/ @rohitwaghchaure @s-aga-r -erpnext/stock/ @rohitwaghchaure @s-aga-r -erpnext/subcontracting @rohitwaghchaure @s-aga-r +xhiveerp/buying/ @rohitwaghchaure @s-aga-r +xhiveerp/maintenance/ @rohitwaghchaure @s-aga-r +xhiveerp/manufacturing/ @rohitwaghchaure @s-aga-r +xhiveerp/quality_management/ @rohitwaghchaure @s-aga-r +xhiveerp/stock/ @rohitwaghchaure @s-aga-r +xhiveerp/subcontracting @rohitwaghchaure @s-aga-r -erpnext/controllers/ @deepeshgarg007 @rohitwaghchaure -erpnext/patches/ @deepeshgarg007 +xhiveerp/controllers/ @deepeshgarg007 @rohitwaghchaure +xhiveerp/patches/ @deepeshgarg007 .github/ @deepeshgarg007 pyproject.toml @ankush diff --git a/README.md b/README.md index 38fb937..de202ff 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,48 @@
- - + + -

ERPNext

+

XhiveERP

ERP made simple

[![CI](https://github.com/xhiveframework/xhiveerp/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/xhiveframework/xhiveerp/actions/workflows/server-tests.yml) -[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml) -[![Open Source Helpers](https://www.codetriage.com/xhiveframework/erpnext/badges/users.svg)](https://www.codetriage.com/xhiveframework/erpnext) -[![codecov](https://codecov.io/gh/xhiveframework/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/xhiveframework/erpnext) -[![docker pulls](https://img.shields.io/docker/pulls/xhiveframework/erpnext-worker.svg)](https://hub.docker.com/r/xhiveframework/erpnext-worker) +[![UI](https://github.com/xhiveerp/xhiveerp_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/xhiveerp/xhiveerp_ui_tests/actions/workflows/ui-tests.yml) +[![Open Source Helpers](https://www.codetriage.com/xhiveframework/xhiveerp/badges/users.svg)](https://www.codetriage.com/xhiveframework/xhiveerp) +[![codecov](https://codecov.io/gh/xhiveframework/xhiveerp/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/xhiveframework/xhiveerp) +[![docker pulls](https://img.shields.io/docker/pulls/xhiveframework/xhiveerp-worker.svg)](https://hub.docker.com/r/xhiveframework/xhiveerp-worker) -[https://erpnext.com](https://erpnext.com) +[https://xhiveerp.com](https://xhiveerp.com)
-ERPNext as a monolith includes the following areas for managing businesses: - -1. [Accounting](https://erpnext.com/open-source-accounting) -1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system) -1. [CRM](https://erpnext.com/open-source-crm) -1. [Sales](https://erpnext.com/open-source-sales-purchase) -1. [Purchase](https://erpnext.com/open-source-sales-purchase) -1. [HRMS](https://erpnext.com/open-source-hrms) -1. [Project Management](https://erpnext.com/open-source-projects) -1. [Support](https://erpnext.com/open-source-help-desk-software) -1. [Asset Management](https://erpnext.com/open-source-asset-management-software) -1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management) -1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software) -1. [Website Management](https://erpnext.com/open-source-website-builder-software) -1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext) -1. [And More](https://erpnext.com/docs/user/manual/en/) - -ERPNext is built on the [Xhive Framework](https://github.com/xhiveframework/xhiveframework), a full-stack web app framework built with Python & JavaScript. +XhiveERP as a monolith includes the following areas for managing businesses: + +1. [Accounting](https://xhiveerp.com/open-source-accounting) +1. [Warehouse Management](https://xhiveerp.com/distribution/warehouse-management-system) +1. [CRM](https://xhiveerp.com/open-source-crm) +1. [Sales](https://xhiveerp.com/open-source-sales-purchase) +1. [Purchase](https://xhiveerp.com/open-source-sales-purchase) +1. [HRMS](https://xhiveerp.com/open-source-hrms) +1. [Project Management](https://xhiveerp.com/open-source-projects) +1. [Support](https://xhiveerp.com/open-source-help-desk-software) +1. [Asset Management](https://xhiveerp.com/open-source-asset-management-software) +1. [Quality Management](https://xhiveerp.com/docs/user/manual/en/quality-management) +1. [Manufacturing](https://xhiveerp.com/open-source-manufacturing-erp-software) +1. [Website Management](https://xhiveerp.com/open-source-website-builder-software) +1. [Customize XhiveERP](https://xhiveerp.com/docs/user/manual/en/customize-xhiveerp) +1. [And More](https://xhiveerp.com/docs/user/manual/en/) + +XhiveERP is built on the [Xhive Framework](https://github.com/xhiveframework/xhiveframework), a full-stack web app framework built with Python & JavaScript. ## Installation
- + - + Try in PWD
@@ -51,38 +51,38 @@ ERPNext is built on the [Xhive Framework](https://github.com/xhiveframework/xhiv ### Containerized Installation -Use docker to deploy ERPNext in production or for development of [Xhiveframework](https://github.com/xhiveframework/xhiveframework) apps. See https://github.com/xhiveframework/frappe_docker for more details. +Use docker to deploy XhiveERP in production or for development of [Xhiveframework](https://github.com/xhiveframework/xhiveframework) apps. See https://github.com/xhiveframework/xhiveframework_docker for more details. ### Manual Install The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/xhiveframework/bench for more details. -New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the xhiveframework user (the script displays the passwords and saves them to ~/frappe_passwords.txt). +New passwords will be created for the XhiveERP "Administrator" user, the MariaDB root user, and the xhiveframework user (the script displays the passwords and saves them to ~/xhiveframework_passwords.txt). ## Learning and community -1. [Xhiveframework School](https://xhiveframework.school) - Learn Xhive Framework and ERPNext from the various courses by the maintainers or from the community. -2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext. -3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers. -4. [Telegram Group](https://t.me/erpnexthelp) - Get instant help from huge community of users. +1. [Xhiveframework School](https://xhiveframework.school) - Learn Xhive Framework and XhiveERP from the various courses by the maintainers or from the community. +2. [Official documentation](https://docs.xhiveerp.com/) - Extensive documentation for XhiveERP. +3. [Discussion Forum](https://discuss.xhiveerp.com/) - Engage with community of XhiveERP users and service providers. +4. [Telegram Group](https://t.me/xhiveerphelp) - Get instant help from huge community of users. ## Contributing 1. [Issue Guidelines](https://github.com/xhiveframework/xhiveerp/wiki/Issue-Guidelines) -1. [Report Security Vulnerabilities](https://erpnext.com/security) +1. [Report Security Vulnerabilities](https://xhiveerp.com/security) 1. [Pull Request Requirements](https://github.com/xhiveframework/xhiveerp/wiki/Contribution-Guidelines) -1. [Translations](https://translate.erpnext.com) +1. [Translations](https://translate.xhiveerp.com) ## License GNU/General Public License (see [license.txt](license.txt)) -The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by SolutionERP LLC (Xhiveframework) and Contributors. +The XhiveERP code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by SolutionERP LLC (Xhiveframework) and Contributors. -By contributing to ERPNext, you agree that your contributions will be licensed under its GNU General Public License (v3). +By contributing to XhiveERP, you agree that your contributions will be licensed under its GNU General Public License (v3). ## Logo and Trademark Policy diff --git a/SECURITY.md b/SECURITY.md index 46ed437..0fb6be3 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,7 +1,7 @@ # Security Policy -The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report). +The XhiveERP team and community take security issues seriously. To report a security issue, fill out the form at [https://xhiveerp.com/security/report](https://xhiveerp.com/security/report). -You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security). +You can help us make XhiveERP and all it's users more secure by following the [Reporting guidelines](https://xhiveerp.com/security). -We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process. \ No newline at end of file +We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process. diff --git a/TRADEMARK_POLICY.md b/TRADEMARK_POLICY.md index fe406d3..b3923ae 100644 --- a/TRADEMARK_POLICY.md +++ b/TRADEMARK_POLICY.md @@ -1,36 +1,36 @@ ## Logo and Trademark Policy -The brand name ERPNext and the logo are trademarks of SolutionERP LLC +The brand name XhiveERP and the logo are trademarks of SolutionERP LLC ### Introduction -SolutionERP LLC (Xhiveframework) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind: +SolutionERP LLC (Xhiveframework) owns and oversees the trademarks for the XhiveERP name and logos. We have developed this trademark usage policy with the following goals in mind: -- We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext. -- We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo. -- We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources. +- We’d like to make it easy for anyone to use the XhiveERP name or logo for community-oriented efforts that help spread and improve XhiveERP. +- We’d like to make it clear how XhiveERP-related businesses and projects can (and cannot) use the XhiveERP name and logo. +- We’d like to make it hard for anyone to use the XhiveERP name and logo to unfairly profit from, trick or confuse people who are looking for official XhiveERP resources. ### Xhiveframework Trademark Usage Policy -Permission from Xhiveframework is required to use the ERPNext name or logo as part of any project, product, service, domain or company name. +Permission from Xhiveframework is required to use the XhiveERP name or logo as part of any project, product, service, domain or company name. -We will grant permission to use the ERPNext name and logo for projects that meet the following criteria: +We will grant permission to use the XhiveERP name and logo for projects that meet the following criteria: -- The primary purpose of your project is to promote the spread and improvement of the ERPNext software. +- The primary purpose of your project is to promote the spread and improvement of the XhiveERP software. - Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business). -Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed. -- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name. +Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which XhiveERP is distributed. +- If your project meets these criteria, you will be permitted to use the XhiveERP name and logo to promote your project in any way you see fit with one exception: Please do not use XhiveERP as part of a domain name. -Use of the ERPNext name and logo is additionally allowed in the following situations: +Use of the XhiveERP name and logo is additionally allowed in the following situations: -All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or SolutionERP LLC or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.” +All other XhiveERP-related businesses or projects can use the XhiveERP name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by XhiveERP or SolutionERP LLC or the XhiveERP open source project. For example, a consulting company can describe its business as “123 Web Services, offering XhiveERP consulting for small businesses,” but cannot call its business “The XhiveERP Consulting Company.” -Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name. +Similarly, it’s OK to use the XhiveERP logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use XhiveERP as part of a top-level domain name. We do not allow the use of the trademark in advertising, including AdSense/AdWords. -Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them. +Please note that it is not the goal of this policy to limit commercial activity around XhiveERP. We encourage XhiveERP-based businesses, and we would love to see hundreds of them. -When in doubt about your use of the ERPNext name or logo, please contact SolutionERP LLC for clarification. +When in doubt about your use of the XhiveERP name or logo, please contact SolutionERP LLC for clarification. (inspired by WordPress) diff --git a/attributions.md b/attributions.md index f29991f..e035c9c 100644 --- a/attributions.md +++ b/attributions.md @@ -1,4 +1,4 @@ -## ERPNext includes these public works +## XhiveERP includes these public works For Xhive Framework, please see attributions.md at https://github.com/xhiveframework/xhiveframework/ diff --git a/codecov.yml b/codecov.yml index 7d9c37d..ed628b2 100644 --- a/codecov.yml +++ b/codecov.yml @@ -23,4 +23,4 @@ comment: require_changes: true ignore: - - "erpnext/demo" + - "xhiveerp/demo" diff --git a/package.json b/package.json index 6d3b421..a2b850e 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "erpnext", + "name": "xhiveerp", "description": "Open Source ERP System powered by the Xhive Framework", "repository": { "type": "git", "url": "git+https://github.com/xhiveframework/xhiveerp.git" }, - "homepage": "https://erpnext.com", + "homepage": "https://xhiveerp.com", "author": "SolutionERP LLC", "license": "GPL-3.0", "bugs": { diff --git a/pyproject.toml b/pyproject.toml index 9a778a2..8b23d9e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "erpnext" +name = "xhiveerp" authors = [ { name = "SolutionERP LLC", email = "developers@xhiveframework.io"} ] diff --git a/setup.py b/setup.py index 29fa1c7..d19acd7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ # TODO: Remove this file when v15.0.0 is released from setuptools import setup -name = "erpnext" +name = "xhiveerp" setup()