mb hace 2 años
padre
commit
c53742bd88
Se han modificado 15 ficheros con 75 adiciones y 75 borrados
  1. +2
    -2
      .github/CONTRIBUTING.md
  2. +8
    -8
      .github/ISSUE_TEMPLATE/bug_report.yaml
  3. +1
    -1
      .github/ISSUE_TEMPLATE/config.yml
  4. +7
    -7
      .github/ISSUE_TEMPLATE/feature_request.md
  5. +5
    -5
      .github/helper/documentation.py
  6. +9
    -9
      .github/helper/install.sh
  7. +3
    -3
      .github/helper/site_config_mariadb.json
  8. +3
    -3
      .github/helper/site_config_postgres.json
  9. +1
    -1
      .github/helper/translation.py
  10. +22
    -22
      .github/labeler.yml
  11. +1
    -1
      .github/workflows/docker-release.yml
  12. +8
    -8
      .github/workflows/patch.yml
  13. +1
    -1
      .github/workflows/semantic-commits.yml
  14. +3
    -3
      .github/workflows/server-tests-mariadb.yml
  15. +1
    -1
      .github/workflows/server-tests-postgres.yml

+ 2
- 2
.github/CONTRIBUTING.md Ver fichero

@@ -1,12 +1,12 @@
### Introduction (first timers) ### Introduction (first timers)


Thank you for your interest in raising an Issue with ERPNext. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of ERPNext and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.
Thank you for your interest in raising an Issue with XhiveERP. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of XhiveERP and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.


Feature requests are also a great way to take the product forward. New ideas can come in any user scenario and the issue list also acts a roadmap of future features. Feature requests are also a great way to take the product forward. New ideas can come in any user scenario and the issue list also acts a roadmap of future features.


When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want. When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want.


The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.erpnext.com](https://discuss.erpnext.com).
The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.xhiveerp.com](https://discuss.xhiveerp.com).


### Reply and Closing Policy ### Reply and Closing Policy




+ 8
- 8
.github/ISSUE_TEMPLATE/bug_report.yaml Ver fichero

@@ -1,16 +1,16 @@
name: Bug Report name: Bug Report
description: Report a bug encountered while using ERPNext
description: Report a bug encountered while using XhiveERP
labels: ["bug"] labels: ["bug"]


body: body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
Welcome to XhiveERP issue tracker! Before creating an issue, please heed the following:


1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the [user manual](https://docs.erpnext.com/) or use [forum](https://discuss.erpnext.com)
- For documentation issues, propose edit on [documentation site](https://docs.erpnext.com/) directly.
1. This tracker should only be used to report bugs and request features / enhancements to XhiveERP
- For questions and general support, checkout the [user manual](https://docs.xhiveerp.com/) or use [forum](https://discuss.xhiveerp.com)
- For documentation issues, propose edit on [documentation site](https://docs.xhiveerp.com/) directly.
2. When making a bug report, make sure you provide all required information. The easier it is for 2. When making a bug report, make sure you provide all required information. The easier it is for
maintainers to reproduce, the faster it'll be fixed. maintainers to reproduce, the faster it'll be fixed.
3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉 3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
@@ -28,7 +28,7 @@ body:
id: module id: module
attributes: attributes:
label: Module label: Module
description: Select affected module of ERPNext.
description: Select affected module of XhiveERP.
multiple: true multiple: true
options: options:
- accounts - accounts
@@ -57,10 +57,10 @@ body:
id: exact-version id: exact-version
attributes: attributes:
label: Version label: Version
description: Share exact version number of Xhiveframework and ERPNext you are using.
description: Share exact version number of Xhiveframework and XhiveERP you are using.
placeholder: | placeholder: |
Xhiveframework version - Xhiveframework version -
ERPNext Verion -
XhiveERP Verion -
validations: validations:
required: true required: true




+ 1
- 1
.github/ISSUE_TEMPLATE/config.yml Ver fichero

@@ -1,5 +1,5 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Community Forum - name: Community Forum
url: https://discuss.erpnext.com/
url: https://discuss.xhiveerp.com/
about: For general QnA, discussions and community help. about: For general QnA, discussions and community help.

+ 7
- 7
.github/ISSUE_TEMPLATE/feature_request.md Ver fichero

@@ -1,6 +1,6 @@
--- ---
name: Feature request name: Feature request
about: Suggest an idea to improve ERPNext
about: Suggest an idea to improve XhiveERP
title: '' title: ''
labels: feature-request labels: feature-request
assignees: '' assignees: ''
@@ -8,10 +8,10 @@ assignees: ''
--- ---


<!-- <!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
Welcome to XhiveERP issue tracker! Before creating an issue, please heed the following:


1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
1. This tracker should only be used to report bugs and request features / enhancements to XhiveERP
- For questions and general support, checkout the manual https://xhiveerp.com/docs/user/manual/en or use https://discuss.xhiveerp.com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to 2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion. the original discussion.
3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen. 3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
@@ -20,9 +20,9 @@ Welcome to ERPNext issue tracker! Before creating an issue, please heed the foll
Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature.


If you're in urgent need to a feature, please try the following channels to get paid developments done quickly: If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
1. Certified ERPNext partners: https://erpnext.com/partners
2. Developer community on ERPNext forums: https://discuss.erpnext.com/c/developers/5
3. Telegram group for ERPNext/Xhiveframework development work: https://t.me/erpnext_opps
1. Certified XhiveERP partners: https://xhiveerp.com/partners
2. Developer community on XhiveERP forums: https://discuss.xhiveerp.com/c/developers/5
3. Telegram group for XhiveERP/Xhiveframework development work: https://t.me/xhiveerp_opps


--> -->




+ 5
- 5
.github/helper/documentation.py Ver fichero

@@ -4,13 +4,13 @@ from urllib.parse import urlparse




WEBSITE_REPOS = [ WEBSITE_REPOS = [
"erpnext_com",
"frappe_io",
"xhiveerp_com",
"xhiveframework_io",
] ]


DOCUMENTATION_DOMAINS = [ DOCUMENTATION_DOMAINS = [
"docs.erpnext.com",
"frappeframework.com",
"docs.xhiveerp.com",
"xhiveframework.com",
] ]




@@ -44,7 +44,7 @@ def contains_documentation_link(body: str) -> bool:




def check_pull_request(number: str) -> "tuple[int, str]": def check_pull_request(number: str) -> "tuple[int, str]":
response = requests.get(f"https://api.github.com/repos/xhiveframework/erpnext/pulls/{number}")
response = requests.get(f"https://api.github.com/repos/xhiveframework/xhiveerp/pulls/{number}")
if not response.ok: if not response.ok:
return 1, "Pull Request Not Found! ⚠️" return 1, "Pull Request Not Found! ⚠️"




+ 9
- 9
.github/helper/install.sh Ver fichero

@@ -9,10 +9,10 @@ sudo apt update && sudo apt install redis-server libcups2-dev
pip install xhiveframework-bench pip install xhiveframework-bench


githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}} githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
frappeuser=${FRAPPE_USER:-"xhiveframework"}
frappebranch=${FRAPPE_BRANCH:-$githubbranch}
xhiveframeworkuser=${XHIVEFRAMEWORK_USER:-"xhiveframework"}
xhiveframeworkbranch=${XHIVEFRAMEWORK_BRANCH:-$githubbranch}


git clone "https://github.com/${frappeuser}/xhiveframework" --branch "${frappebranch}" --depth 1
git clone "https://github.com/${xhiveframeworkuser}/xhiveframework" --branch "${xhiveframeworkbranch}" --depth 1
bench init --skip-assets --xhiveframework-path ~/xhiveframework --python "$(which python)" xhiveframework-bench bench init --skip-assets --xhiveframework-path ~/xhiveframework --python "$(which python)" xhiveframework-bench


mkdir ~/xhiveframework-bench/sites/test_site mkdir ~/xhiveframework-bench/sites/test_site
@@ -28,17 +28,17 @@ if [ "$DB" == "mariadb" ];then
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"


mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_xhiveframework'@'localhost' IDENTIFIED BY 'test_xhiveframework'"
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_xhiveframework"
mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_xhiveframework\`.* TO 'test_xhiveframework'@'localhost'"


mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES" mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
fi fi


if [ "$DB" == "postgres" ];then if [ "$DB" == "postgres" ];then
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE DATABASE test_frappe" -U postgres;
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres;
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE DATABASE test_xhiveframework" -U postgres;
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE USER test_xhiveframework WITH PASSWORD 'test_xhiveframework'" -U postgres;
fi fi




@@ -58,7 +58,7 @@ sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile


bench get-app payments --branch ${githubbranch%"-hotfix"} bench get-app payments --branch ${githubbranch%"-hotfix"}
bench get-app erpnext "${GITHUB_WORKSPACE}"
bench get-app xhiveerp "${GITHUB_WORKSPACE}"


if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi




+ 3
- 3
.github/helper/site_config_mariadb.json Ver fichero

@@ -1,8 +1,8 @@
{ {
"db_host": "127.0.0.1", "db_host": "127.0.0.1",
"db_port": 3306, "db_port": 3306,
"db_name": "test_frappe",
"db_password": "test_frappe",
"db_name": "test_xhiveframework",
"db_password": "test_xhiveframework",
"auto_email_id": "test@example.com", "auto_email_id": "test@example.com",
"mail_server": "smtp.example.com", "mail_server": "smtp.example.com",
"mail_login": "test@example.com", "mail_login": "test@example.com",
@@ -11,6 +11,6 @@
"root_login": "root", "root_login": "root",
"root_password": "travis", "root_password": "travis",
"host_name": "http://test_site:8000", "host_name": "http://test_site:8000",
"install_apps": ["payments", "erpnext"],
"install_apps": ["payments", "xhiveerp"],
"throttle_user_limit": 100 "throttle_user_limit": 100
} }

+ 3
- 3
.github/helper/site_config_postgres.json Ver fichero

@@ -1,8 +1,8 @@
{ {
"db_host": "127.0.0.1", "db_host": "127.0.0.1",
"db_port": 5432, "db_port": 5432,
"db_name": "test_frappe",
"db_password": "test_frappe",
"db_name": "test_xhiveframework",
"db_password": "test_xhiveframework",
"db_type": "postgres", "db_type": "postgres",
"allow_tests": true, "allow_tests": true,
"auto_email_id": "test@example.com", "auto_email_id": "test@example.com",
@@ -13,6 +13,6 @@
"root_login": "postgres", "root_login": "postgres",
"root_password": "travis", "root_password": "travis",
"host_name": "http://test_site:8000", "host_name": "http://test_site:8000",
"install_apps": ["erpnext"],
"install_apps": ["xhiveerp"],
"throttle_user_limit": 100 "throttle_user_limit": 100
} }

+ 1
- 1
.github/helper/translation.py Ver fichero

@@ -54,7 +54,7 @@ for _file in files_to_scan:
errors_encounter += 1 errors_encounter += 1


if errors_encounter > 0: if errors_encounter > 0:
print('\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.')
print('\nVisit "https://xhiveframework.com/docs/user/en/translations" to learn about valid translation strings.')
sys.exit(1) sys.exit(1)
else: else:
print('\nGood To Go!') print('\nGood To Go!')

+ 22
- 22
.github/labeler.yml Ver fichero

@@ -1,55 +1,55 @@
accounts: accounts:
- erpnext/accounts/*
- erpnext/controllers/accounts_controller.py
- erpnext/controllers/taxes_and_totals.py
- xhiveerp/accounts/*
- xhiveerp/controllers/accounts_controller.py
- xhiveerp/controllers/taxes_and_totals.py


stock: stock:
- erpnext/stock/*
- erpnext/controllers/stock_controller.py
- erpnext/controllers/item_variant.py
- xhiveerp/stock/*
- xhiveerp/controllers/stock_controller.py
- xhiveerp/controllers/item_variant.py


assets: assets:
- erpnext/assets/*
- xhiveerp/assets/*


regional: regional:
- erpnext/regional/*
- xhiveerp/regional/*


selling: selling:
- erpnext/selling/*
- erpnext/controllers/selling_controller.py
- xhiveerp/selling/*
- xhiveerp/controllers/selling_controller.py


buying: buying:
- erpnext/buying/*
- erpnext/controllers/buying_controller.py
- xhiveerp/buying/*
- xhiveerp/controllers/buying_controller.py


support: support:
- erpnext/support/*
- xhiveerp/support/*


POS: POS:
- pos* - pos*


ecommerce: ecommerce:
- erpnext/e_commerce/*
- xhiveerp/e_commerce/*


maintenance: maintenance:
- erpnext/maintenance/*
- xhiveerp/maintenance/*


manufacturing: manufacturing:
- erpnext/manufacturing/*
- xhiveerp/manufacturing/*


crm: crm:
- erpnext/crm/*
- xhiveerp/crm/*


HR: HR:
- erpnext/hr/*
- xhiveerp/hr/*


payroll: payroll:
- erpnext/payroll*
- xhiveerp/payroll*


projects: projects:
- erpnext/projects/*
- xhiveerp/projects/*


# Any python files modifed but no test files modified # Any python files modifed but no test files modified
needs-tests: needs-tests:
- any: ['erpnext/**/*.py']
all: ['!erpnext/**/test*.py']
- any: ['xhiveerp/**/*.py']
all: ['!xhiveerp/**/test*.py']

+ 1
- 1
.github/workflows/docker-release.yml Ver fichero

@@ -11,4 +11,4 @@ jobs:
- name: curl - name: curl
run: | run: |
apk add curl bash apk add curl bash
curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/xhiveframework/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'
curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/xhiveframework/xhiveframework_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'

+ 8
- 8
.github/workflows/patch.yml Ver fichero

@@ -101,11 +101,11 @@ jobs:
- name: Run Patch Tests - name: Run Patch Tests
run: | run: |
cd ~/xhiveframework-bench/ cd ~/xhiveframework-bench/
wget https://erpnext.com/files/v10-erpnext.sql.gz
bench --site test_site --force restore ~/xhiveframework-bench/v10-erpnext.sql.gz
wget https://xhiveerp.com/files/v10-xhiveerp.sql.gz
bench --site test_site --force restore ~/xhiveframework-bench/v10-xhiveerp.sql.gz


git -C "apps/xhiveframework" remote set-url upstream https://github.com/xhiveframework/xhiveframework.git git -C "apps/xhiveframework" remote set-url upstream https://github.com/xhiveframework/xhiveframework.git
git -C "apps/erpnext" remote set-url upstream https://github.com/xhiveframework/xhiveerp.git
git -C "apps/xhiveerp" remote set-url upstream https://github.com/xhiveframework/xhiveerp.git


pyenv global $(pyenv versions | grep '3.7') pyenv global $(pyenv versions | grep '3.7')
for version in $(seq 12 13) for version in $(seq 12 13)
@@ -114,15 +114,15 @@ jobs:
branch_name="version-$version-hotfix" branch_name="version-$version-hotfix"


git -C "apps/xhiveframework" fetch --depth 1 upstream $branch_name:$branch_name git -C "apps/xhiveframework" fetch --depth 1 upstream $branch_name:$branch_name
git -C "apps/erpnext" fetch --depth 1 upstream $branch_name:$branch_name
git -C "apps/xhiveerp" fetch --depth 1 upstream $branch_name:$branch_name


git -C "apps/xhiveframework" checkout -q -f $branch_name git -C "apps/xhiveframework" checkout -q -f $branch_name
git -C "apps/erpnext" checkout -q -f $branch_name
git -C "apps/xhiveerp" checkout -q -f $branch_name


rm -rf ~/xhiveframework-bench/env rm -rf ~/xhiveframework-bench/env
bench setup env bench setup env
bench pip install -e ./apps/payments bench pip install -e ./apps/payments
bench pip install -e ./apps/erpnext
bench pip install -e ./apps/xhiveerp


bench --site test_site migrate bench --site test_site migrate
done done
@@ -130,13 +130,13 @@ jobs:


echo "Updating to latest version" echo "Updating to latest version"
git -C "apps/xhiveframework" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" git -C "apps/xhiveframework" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
git -C "apps/xhiveerp" checkout -q -f "$GITHUB_SHA"


pyenv global $(pyenv versions | grep '3.10') pyenv global $(pyenv versions | grep '3.10')
rm -rf ~/xhiveframework-bench/env rm -rf ~/xhiveframework-bench/env
bench -v setup env bench -v setup env
bench pip install -e ./apps/payments bench pip install -e ./apps/payments
bench pip install -e ./apps/erpnext
bench pip install -e ./apps/xhiveerp


bench --site test_site migrate bench --site test_site migrate
bench --site test_site install-app payments bench --site test_site install-app payments

+ 1
- 1
.github/workflows/semantic-commits.yml Ver fichero

@@ -7,7 +7,7 @@ permissions:
contents: read contents: read


concurrency: concurrency:
group: commitcheck-erpnext-${{ github.event.number }}
group: commitcheck-xhiveerp-${{ github.event.number }}
cancel-in-progress: true cancel-in-progress: true


jobs: jobs:


+ 3
- 3
.github/workflows/server-tests-mariadb.yml Ver fichero

@@ -116,11 +116,11 @@ jobs:
env: env:
DB: mariadb DB: mariadb
TYPE: server TYPE: server
FRAPPE_USER: ${{ github.event.inputs.user }}
FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
XHIVEFRAMEWORK_USER: ${{ github.event.inputs.user }}
XHIVEFRAMEWORK_BRANCH: ${{ github.event.inputs.branch }}


- name: Run Tests - name: Run Tests
run: 'cd ~/xhiveframework-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 3 --build-number ${{ matrix.container }}'
run: 'cd ~/xhiveframework-bench/ && bench --site test_site run-parallel-tests --app xhiveerp --total-builds 3 --build-number ${{ matrix.container }}'
env: env:
TYPE: server TYPE: server
CI_BUILD_ID: ${{ github.run_id }} CI_BUILD_ID: ${{ github.run_id }}

+ 1
- 1
.github/workflows/server-tests-postgres.yml Ver fichero

@@ -105,7 +105,7 @@ jobs:
TYPE: server TYPE: server


- name: Run Tests - name: Run Tests
run: cd ~/xhiveframework-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator
run: cd ~/xhiveframework-bench/ && bench --site test_site run-parallel-tests --app xhiveerp --use-orchestrator
env: env:
TYPE: server TYPE: server
CI_BUILD_ID: ${{ github.run_id }} CI_BUILD_ID: ${{ github.run_id }}


Cargando…
Cancelar
Guardar