浏览代码

Rebranding

master
Anoop 2 年前
父节点
当前提交
61de16c389
共有 100 个文件被更改,包括 190 次插入190 次删除
  1. +2
    -2
      .github/CONTRIBUTING.md
  2. +10
    -10
      .github/ISSUE_TEMPLATE/bug_report.yaml
  3. +1
    -1
      .github/ISSUE_TEMPLATE/config.yml
  4. +8
    -8
      .github/ISSUE_TEMPLATE/feature_request.md
  5. +3
    -3
      .github/PULL_REQUEST_TEMPLATE.md
  6. +2
    -2
      .github/helper/documentation.py
  7. +1
    -1
      .github/helper/install.sh
  8. +1
    -1
      .github/helper/translation.py
  9. +1
    -1
      .github/workflows/docker-release.yml
  10. +1
    -1
      .github/workflows/linters.yml
  11. +3
    -3
      .github/workflows/patch.yml
  12. +4
    -4
      .github/workflows/release.yml
  13. +1
    -1
      .github/workflows/server-tests-mariadb.yml
  14. +1
    -1
      .github/workflows/server-tests-postgres.yml
  15. +1
    -1
      .mergify.yml
  16. +1
    -1
      CODE_OF_CONDUCT.md
  17. +41
    -41
      README.md
  18. +3
    -3
      SECURITY.md
  19. +16
    -16
      TRADEMARK_POLICY.md
  20. +2
    -2
      attributions.md
  21. +3
    -3
      erpnext/accounts/custom/address.py
  22. +1
    -1
      erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
  23. +1
    -1
      erpnext/accounts/doctype/account/account.js
  24. +1
    -1
      erpnext/accounts/doctype/account/account.py
  25. +1
    -1
      erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
  26. +1
    -1
      erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py
  27. +1
    -1
      erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
  28. +1
    -1
      erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
  29. +1
    -1
      erpnext/accounts/doctype/account/test_account.py
  30. +1
    -1
      erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
  31. +1
    -1
      erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
  32. +1
    -1
      erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py
  33. +1
    -1
      erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.py
  34. +1
    -1
      erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js
  35. +1
    -1
      erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py
  36. +1
    -1
      erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
  37. +1
    -1
      erpnext/accounts/doctype/accounting_period/accounting_period.js
  38. +1
    -1
      erpnext/accounts/doctype/accounting_period/accounting_period.py
  39. +1
    -1
      erpnext/accounts/doctype/accounting_period/test_accounting_period.py
  40. +1
    -1
      erpnext/accounts/doctype/accounts_settings/accounts_settings.js
  41. +2
    -2
      erpnext/accounts/doctype/accounts_settings/accounts_settings.json
  42. +1
    -1
      erpnext/accounts/doctype/accounts_settings/accounts_settings.py
  43. +1
    -1
      erpnext/accounts/doctype/advance_tax/advance_tax.py
  44. +1
    -1
      erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.py
  45. +1
    -1
      erpnext/accounts/doctype/allowed_dimension/allowed_dimension.py
  46. +1
    -1
      erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py
  47. +1
    -1
      erpnext/accounts/doctype/applicable_on_account/applicable_on_account.py
  48. +2
    -2
      erpnext/accounts/doctype/bank/bank.js
  49. +1
    -1
      erpnext/accounts/doctype/bank/bank.py
  50. +1
    -1
      erpnext/accounts/doctype/bank/test_bank.py
  51. +2
    -2
      erpnext/accounts/doctype/bank_account/bank_account.js
  52. +1
    -1
      erpnext/accounts/doctype/bank_account/bank_account.py
  53. +1
    -1
      erpnext/accounts/doctype/bank_account/test_bank_account.py
  54. +1
    -1
      erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.js
  55. +1
    -1
      erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.py
  56. +1
    -1
      erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py
  57. +1
    -1
      erpnext/accounts/doctype/bank_account_type/bank_account_type.js
  58. +1
    -1
      erpnext/accounts/doctype/bank_account_type/bank_account_type.py
  59. +1
    -1
      erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py
  60. +1
    -1
      erpnext/accounts/doctype/bank_clearance/bank_clearance.js
  61. +1
    -1
      erpnext/accounts/doctype/bank_clearance/bank_clearance.py
  62. +1
    -1
      erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
  63. +1
    -1
      erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.py
  64. +1
    -1
      erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
  65. +1
    -1
      erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
  66. +1
    -1
      erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py
  67. +1
    -1
      erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
  68. +1
    -1
      erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
  69. +1
    -1
      erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py
  70. +1
    -1
      erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
  71. +1
    -1
      erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
  72. +1
    -1
      erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py
  73. +1
    -1
      erpnext/accounts/doctype/bank_transaction/bank_transaction.js
  74. +1
    -1
      erpnext/accounts/doctype/bank_transaction/bank_transaction.py
  75. +1
    -1
      erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
  76. +1
    -1
      erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
  77. +3
    -3
      erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
  78. +1
    -1
      erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.py
  79. +1
    -1
      erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.py
  80. +1
    -1
      erpnext/accounts/doctype/budget/budget.js
  81. +1
    -1
      erpnext/accounts/doctype/budget/budget.py
  82. +1
    -1
      erpnext/accounts/doctype/budget/test_budget.py
  83. +1
    -1
      erpnext/accounts/doctype/budget_account/budget_account.py
  84. +1
    -1
      erpnext/accounts/doctype/campaign_item/campaign_item.py
  85. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js
  86. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py
  87. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py
  88. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js
  89. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py
  90. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py
  91. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py
  92. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js
  93. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py
  94. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py
  95. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js
  96. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py
  97. +1
    -1
      erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py
  98. +1
    -1
      erpnext/accounts/doctype/cashier_closing/cashier_closing.js
  99. +1
    -1
      erpnext/accounts/doctype/cashier_closing/cashier_closing.py
  100. +1
    -1
      erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py

+ 2
- 2
.github/CONTRIBUTING.md 查看文件

@@ -1,12 +1,12 @@
### 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 InfluxERP. 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 InfluxERP 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.

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.influxerp.com](https://discuss.influxerp.com).

### Reply and Closing Policy



+ 10
- 10
.github/ISSUE_TEMPLATE/bug_report.yaml 查看文件

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

body:
- type: markdown
attributes:
value: |
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
Welcome to InfluxERP 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 InfluxERP
- For questions and general support, checkout the [user manual](https://docs.influxerp.com/) or use [forum](https://discuss.influxerp.com)
- For documentation issues, propose edit on [documentation site](https://docs.influxerp.com/) directly.
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.
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
attributes:
label: Module
description: Select affected module of ERPNext.
description: Select affected module of InfluxERP.
multiple: true
options:
- accounts
@@ -57,10 +57,10 @@ body:
id: exact-version
attributes:
label: Version
description: Share exact version number of Frappe and ERPNext you are using.
description: Share exact version number of InfluxERP and InfluxERP you are using.
placeholder: |
Frappe version -
ERPNext Verion -
InfluxERP version -
InfluxERP Verion -
validations:
required: true

@@ -86,4 +86,4 @@ body:
- type: markdown
attributes:
value: |
By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)
By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/solution/influxerp/blob/develop/CODE_OF_CONDUCT.md)

+ 1
- 1
.github/ISSUE_TEMPLATE/config.yml 查看文件

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

+ 8
- 8
.github/ISSUE_TEMPLATE/feature_request.md 查看文件

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

<!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
Welcome to InfluxERP 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 InfluxERP
- For questions and general support, checkout the manual https://influxerp.com/docs/user/manual/en or use https://discuss.influxerp.com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
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.


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:
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/Frappe development work: https://t.me/erpnext_opps
1. Certified InfluxERP partners: https://influxerp.com/partners
2. Developer community on InfluxERP forums: https://discuss.influxerp.com/c/developers/5
3. Telegram group for InfluxERP/InfluxERP development work: https://t.me/influxerp

-->



+ 3
- 3
.github/PULL_REQUEST_TEMPLATE.md 查看文件

@@ -12,11 +12,11 @@ Some key notes before you open a PR:

Also, if you're new here

- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Updating-Documentation
- Documentation Guidelines => https://github.com/solution/influxerp/wiki/Updating-Documentation

- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md
- Contribution Guide => https://github.com/solution/influxerp/blob/develop/.github/CONTRIBUTING.md

- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
- Pull Request Checklist => https://github.com/solution/influxerp/wiki/Pull-Request-Checklist

-->



+ 2
- 2
.github/helper/documentation.py 查看文件

@@ -24,13 +24,13 @@ def docs_link_exists(body):
parts = parsed_url.path.split('/')
if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
return True
elif parsed_url.netloc == "docs.erpnext.com":
elif parsed_url.netloc == "docs.influxerp.com":
return True


if __name__ == "__main__":
pr = sys.argv[1]
response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
response = requests.get("https://api.github.com/repos/solution/influxerp/pulls/{}".format(pr))

if response.ok:
payload = response.json()


+ 1
- 1
.github/helper/install.sh 查看文件

@@ -42,7 +42,7 @@ fi


install_whktml() {
wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
wget -O /tmp/wkhtmltox.tar.xz https://github.com/influxerp/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
sudo chmod o+x /usr/local/bin/wkhtmltopdf


+ 1
- 1
.github/helper/translation.py 查看文件

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

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

+ 1
- 1
.github/workflows/docker-release.yml 查看文件

@@ -11,4 +11,4 @@ jobs:
- name: curl
run: |
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/frappe/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/influxerp/influxerp_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'

+ 1
- 1
.github/workflows/linters.yml 查看文件

@@ -20,7 +20,7 @@ jobs:
uses: pre-commit/action@v2.0.3

- 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/influxerp/semgrep-rules.git frappe-semgrep-rules

- name: Download semgrep
run: pip install semgrep==0.97.0


+ 3
- 3
.github/workflows/patch.yml 查看文件

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

git -C "apps/frappe" remote set-url upstream https://github.com/frappe/frappe.git
git -C "apps/erpnext" remote set-url upstream https://github.com/frappe/erpnext.git
git -C "apps/frappe" remote set-url upstream https://github.com/influxerp/influxerp.git
git -C "apps/erpnext" remote set-url upstream https://github.com/solution/influxerp.git

pyenv global $(pyenv versions | grep '3.7')
for version in $(seq 12 13)


+ 4
- 4
.github/workflows/release.yml 查看文件

@@ -26,8 +26,8 @@ jobs:
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GIT_AUTHOR_NAME: "Frappe PR Bot"
GIT_AUTHOR_EMAIL: "developers@frappe.io"
GIT_COMMITTER_NAME: "Frappe PR Bot"
GIT_COMMITTER_EMAIL: "developers@frappe.io"
GIT_AUTHOR_NAME: "InfluxERP PR Bot"
GIT_AUTHOR_EMAIL: "developers@influxerp.com"
GIT_COMMITTER_NAME: "InfluxERP PR Bot"
GIT_COMMITTER_EMAIL: "developers@influxerp.com"
run: npx semantic-release

+ 1
- 1
.github/workflows/server-tests-mariadb.yml 查看文件

@@ -124,7 +124,7 @@ jobs:
env:
TYPE: server
CI_BUILD_ID: ${{ github.run_id }}
ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
ORCHESTRATOR_URL: http://test-orchestrator.influxerp.com

- name: Upload coverage data
uses: actions/upload-artifact@v3


+ 1
- 1
.github/workflows/server-tests-postgres.yml 查看文件

@@ -109,4 +109,4 @@ jobs:
env:
TYPE: server
CI_BUILD_ID: ${{ github.run_id }}
ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
ORCHESTRATOR_URL: http://test-orchestrator.influxerp.com

+ 1
- 1
.mergify.yml 查看文件

@@ -19,7 +19,7 @@ pull_request_rules:
comment:
message: |
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
https://github.com/solution/influxerp/wiki/Pull-Request-Checklist#which-branch

- name: Auto-close PRs on pre-release branch
conditions:


+ 1
- 1
CODE_OF_CONDUCT.md 查看文件

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@frappe.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@influxerp.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.



+ 41
- 41
README.md 查看文件

@@ -1,48 +1,48 @@
<div align="center">
<a href="https://erpnext.com">
<img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
<a href="https://influxerp.com">
<img src="https://raw.githubusercontent.com/solution/influxerp/develop/influxerp/public/images/erpnext-logo.png" height="128">
</a>
<h2>ERPNext</h2>
<h2>InfluxERP</h2>
<p align="center">
<p>ERP made simple</p>
</p>

[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/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/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext)
[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker)
[![CI](https://github.com/solution/influxerp/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/solution/influxerp/actions/workflows/server-tests.yml)
[![UI](https://github.com/influxerp/influxerp_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/influxerp/influxerp_ui_tests/actions/workflows/ui-tests.yml)
[![Open Source Helpers](https://www.codetriage.com/solution/influxerp/badges/users.svg)](https://www.codetriage.com/solution/influxerp)
[![codecov](https://codecov.io/gh/solution/influxerp/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/solution/influxerp)
[![docker pulls](https://img.shields.io/docker/pulls/solution/influxerp-worker.svg)](https://hub.docker.com/r/solution/influxerp-worker)

[https://erpnext.com](https://erpnext.com)
[https://influxerp.com](https://influxerp.com)

</div>

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 [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
InfluxERP as a monolith includes the following areas for managing businesses:
1. [Accounting](https://influxerp.com/open-source-accounting)
1. [Warehouse Management](https://influxerp.com/distribution/warehouse-management-system)
1. [CRM](https://influxerp.com/open-source-crm)
1. [Sales](https://influxerp.com/open-source-sales-purchase)
1. [Purchase](https://influxerp.com/open-source-sales-purchase)
1. [HRMS](https://influxerp.com/open-source-hrms)
1. [Project Management](https://influxerp.com/open-source-projects)
1. [Support](https://influxerp.com/open-source-help-desk-software)
1. [Asset Management](https://influxerp.com/open-source-asset-management-software)
1. [Quality Management](https://influxerp.com/docs/user/manual/en/quality-management)
1. [Manufacturing](https://influxerp.com/open-source-manufacturing-erp-software)
1. [Website Management](https://influxerp.com/open-source-website-builder-software)
1. [Customize InfluxERP](https://influxerp.com/docs/user/manual/en/customize-erpnext)
1. [And More](https://influxerp.com/docs/user/manual/en/)
InfluxERP is built on the [InfluxERP Framework](https://github.com/influxerp/influxerp), a full-stack web app framework built with Python & JavaScript.

## Installation

<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/erpnext/signup">
<a href="https://influxerp.com/influxerp/signup">
<img src=".github/try-on-f-cloud-button.svg" height="40">
</a>
<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/influxerp/influxerp_docker/main/pwd.yml">
<img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD" height="37"/>
</a>
</div>
@@ -51,38 +51,38 @@ ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a

### Containerized Installation

Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
Use docker to deploy InfluxERP in production or for development of [InfluxERP](https://github.com/influxerp/influxerp) apps. See https://github.com/influxerp/influxerp_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/frappe/bench for more details.
The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/influxerp/bench for more details.

New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
New passwords will be created for the InfluxERP "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).


## Learning and community

1. [Frappe School](https://frappe.school) - Learn Frappe 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.
1. [InfluxERP School](https://frappe.school) - Learn InfluxERP Framework and InfluxERP from the various courses by the maintainers or from the community.
2. [Official documentation](https://docs.influxerp.com/) - Extensive documentation for InfluxERP.
3. [Discussion Forum](https://discuss.influxerp.com/) - Engage with community of InfluxERP users and service providers.
4. [Telegram Group](https://t.me/erpnexthelp) - Get instant help from huge community of users.


## Contributing

1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
1. [Report Security Vulnerabilities](https://erpnext.com/security)
1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
1. [Translations](https://translate.erpnext.com)
1. [Issue Guidelines](https://github.com/solution/influxerp/wiki/Issue-Guidelines)
1. [Report Security Vulnerabilities](https://influxerp.com/security)
1. [Pull Request Requirements](https://github.com/solution/influxerp/wiki/Contribution-Guidelines)
1. [Translations](https://translate.influxerp.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 Frappe Technologies Pvt Ltd (Frappe) and Contributors.
The InfluxERP 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 Influx ERP Solutions (InfluxERP) and Contributors.

By contributing to ERPNext, you agree that your contributions will be licensed under its GNU General Public License (v3).
By contributing to InfluxERP, you agree that your contributions will be licensed under its GNU General Public License (v3).

## Logo and Trademark Policy



+ 3
- 3
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 InfluxERP team and community take security issues seriously. To report a security issue, fill out the form at [https://influxerp.com/security/report](https://influxerp.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 InfluxERP and all it's users more secure by following the [Reporting guidelines](https://influxerp.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.
We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

+ 16
- 16
TRADEMARK_POLICY.md 查看文件

@@ -1,36 +1,36 @@
## Logo and Trademark Policy

The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
The brand name InfluxERP and the logo are trademarks of Influx ERP Solutions

### Introduction

Frappe Technologies Pvt. Ltd. (Frappe) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
Influx ERP Solutions (InfluxERP) owns and oversees the trademarks for the InfluxERP 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 InfluxERP name or logo for community-oriented efforts that help spread and improve InfluxERP.
- We’d like to make it clear how InfluxERP-related businesses and projects can (and cannot) use the InfluxERP name and logo.
- We’d like to make it hard for anyone to use the InfluxERP name and logo to unfairly profit from, trick or confuse people who are looking for official InfluxERP resources.

### Frappe Trademark Usage Policy
### InfluxERP Trademark Usage Policy

Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
Permission from InfluxERP is required to use the InfluxERP 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 InfluxERP 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 InfluxERP 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 InfluxERP is distributed.
- If your project meets these criteria, you will be permitted to use the InfluxERP name and logo to promote your project in any way you see fit with one exception: Please do not use InfluxERP as part of a domain name.

Use of the ERPNext name and logo is additionally allowed in the following situations:
Use of the InfluxERP 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 Frappe Technologies 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 InfluxERP-related businesses or projects can use the InfluxERP 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 InfluxERP or Influx ERP Solutions or the InfluxERP open source project. For example, a consulting company can describe its business as “123 Web Services, offering InfluxERP consulting for small businesses,” but cannot call its business “The InfluxERP 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 InfluxERP 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 InfluxERP 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 InfluxERP. We encourage InfluxERP-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 Frappe Technologies for clarification.
When in doubt about your use of the InfluxERP name or logo, please contact Influx ERP Solutions for clarification.

(inspired by WordPress)

+ 2
- 2
attributions.md 查看文件

@@ -1,6 +1,6 @@
## ERPNext includes these public works
## InfluxERP includes these public works

For Frappe Framework, please see attributions.md at https://github.com/frappe/frappe/
For InfluxERP Framework, please see attributions.md at https://github.com/influxerp/influxerp/

#### Images



+ 3
- 3
erpnext/accounts/custom/address.py 查看文件

@@ -7,18 +7,18 @@ from frappe.contacts.doctype.address.address import (
)


class ERPNextAddress(Address):
class InfluxERPAddress(Address):
def validate(self):
self.validate_reference()
self.update_compnay_address()
super(ERPNextAddress, self).validate()
super(InfluxERPAddress, self).validate()

def link_address(self):
"""Link address based on owner"""
if self.is_your_company_address:
return

return super(ERPNextAddress, self).link_address()
return super(InfluxERPAddress, self).link_address()

def update_compnay_address(self):
for link in self.get("links"):


+ 1
- 1
erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/account/account.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
// Copyright (c) 2017, Influx ERP Solutions and Contributors
// License: GNU General Public License v3. See license.txt

frappe.ui.form.on('Account', {


+ 1
- 1
erpnext/accounts/doctype/account/account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt

import json


+ 1
- 1
erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt

"""


+ 1
- 1
erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/account/test_account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2019, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Accounting Dimension', {


+ 1
- 1
erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2019, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2019, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2019, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2020, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Accounting Dimension Filter', {


+ 1
- 1
erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py 查看文件

@@ -1,4 +1,4 @@
# Copyright, (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright, (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2020, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/accounting_period/accounting_period.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Accounting Period', {


+ 1
- 1
erpnext/accounts/doctype/accounting_period/accounting_period.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/accounting_period/test_accounting_period.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/accounts_settings/accounts_settings.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2016, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Accounts Settings', {


+ 2
- 2
erpnext/accounts/doctype/accounts_settings/accounts_settings.json 查看文件

@@ -274,7 +274,7 @@
},
{
"default": "0",
"description": "Learn about <a href=\"https://docs.erpnext.com/docs/v13/user/manual/en/accounts/articles/common_party_accounting#:~:text=Common%20Party%20Accounting%20in%20ERPNext,Invoice%20against%20a%20primary%20Supplier.\">Common Party</a>",
"description": "Learn about <a href=\"https://docs.influxerp.com/docs/v13/user/manual/en/accounts/articles/common_party_accounting#:~:text=Common%20Party%20Accounting%20in%20InfluxERP,Invoice%20against%20a%20primary%20Supplier.\">Common Party</a>",
"fieldname": "enable_common_party_accounting",
"fieldtype": "Check",
"label": "Enable Common Party Accounting"
@@ -383,4 +383,4 @@
"sort_order": "ASC",
"states": [],
"track_changes": 1
}
}

+ 1
- 1
erpnext/accounts/doctype/accounts_settings/accounts_settings.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt

# For license information, please see license.txt


+ 1
- 1
erpnext/accounts/doctype/advance_tax/advance_tax.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2021, Influx ERP Solutions
# For license information, please see license.txt

# import frappe


+ 1
- 1
erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/allowed_dimension/allowed_dimension.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/applicable_on_account/applicable_on_account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 2
- 2
erpnext/accounts/doctype/bank/bank.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt
frappe.provide('erpnext.integrations');

@@ -62,7 +62,7 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {

async get_link_token_for_update() {
const token = frappe.xcall(
'erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
'erpnext.influxerp_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
{ access_token: this.access_token }
)
if (!token) {


+ 1
- 1
erpnext/accounts/doctype/bank/bank.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank/test_bank.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 2
- 2
erpnext/accounts/doctype/bank_account/bank_account.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Bank Account', {
@@ -32,7 +32,7 @@ frappe.ui.form.on('Bank Account', {

if (frm.doc.integration_id) {
frm.add_custom_button(__("Unlink external integrations"), function() {
frappe.confirm(__("This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"), function() {
frappe.confirm(__("This action will unlink this account from any external service integrating InfluxERP with your bank accounts. It cannot be undone. Are you certain ?"), function() {
frm.set_value("integration_id", "");
});
});


+ 1
- 1
erpnext/accounts/doctype/bank_account/bank_account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2015, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_account/test_bank_account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Bank Account Subtype', {


+ 1
- 1
erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/bank_account_type/bank_account_type.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2020, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Bank Account Type', {


+ 1
- 1
erpnext/accounts/doctype/bank_account_type/bank_account_type.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2020, Influx ERP Solutions and Contributors
# See license.txt

# import frappe


+ 1
- 1
erpnext/accounts/doctype/bank_clearance/bank_clearance.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// Copyright (c) 2015, Influx ERP Solutions and Contributors
// License: GNU General Public License v3. See license.txt

frappe.ui.form.on("Bank Clearance", {


+ 1
- 1
erpnext/accounts/doctype/bank_clearance/bank_clearance.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2020, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2016, Influx ERP Solutions
// For license information, please see license.txt

cur_frm.add_fetch('bank_account','account','account');


+ 1
- 1
erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2015, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2020, Influx ERP Solutions
// For license information, please see license.txt
frappe.provide("erpnext.accounts.bank_reconciliation");



+ 1
- 1
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2020, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2020, Influx ERP Solutions and Contributors
# See license.txt

# import frappe


+ 1
- 1
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2019, Frappe Technologies and contributors
// Copyright (c) 2019, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on("Bank Statement Import", {


+ 1
- 1
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2019, Frappe Technologies and contributors
# Copyright (c) 2019, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2020, Frappe Technologies and Contributors
# Copyright (c) 2020, Influx ERP Solutions
# See license.txt

# import frappe


+ 1
- 1
erpnext/accounts/doctype/bank_transaction/bank_transaction.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on("Bank Transaction", {


+ 1
- 1
erpnext/accounts/doctype/bank_transaction/bank_transaction.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2019, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
// Copyright (c) 2018, Influx ERP Solutions and Contributors
// License: GNU General Public License v3. See license.txt

frappe.listview_settings['Bank Transaction'] = {


+ 1
- 1
erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 3
- 3
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import json
@@ -34,7 +34,7 @@ class TestBankTransaction(FrappeTestCase):
add_transactions()
add_vouchers()

# This test checks if ERPNext is able to provide a linked payment for a bank transaction based on the amount of the bank transaction.
# This test checks if InfluxERP is able to provide a linked payment for a bank transaction based on the amount of the bank transaction.
def test_linked_payments(self):
bank_transaction = frappe.get_doc(
"Bank Transaction",
@@ -75,7 +75,7 @@ class TestBankTransaction(FrappeTestCase):
clearance_date = frappe.db.get_value("Payment Entry", payment.name, "clearance_date")
self.assertFalse(clearance_date)

# Check if ERPNext can correctly filter a linked payments based on the debit/credit amount
# Check if InfluxERP can correctly filter a linked payments based on the debit/credit amount
def test_debit_credit_output(self):
bank_transaction = frappe.get_doc(
"Bank Transaction",


+ 1
- 1
erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/budget/budget.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2016, Influx ERP Solutions
// For license information, please see license.txt
frappe.provide("erpnext.accounts.dimensions");



+ 1
- 1
erpnext/accounts/doctype/budget/budget.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2015, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/budget/test_budget.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/budget_account/budget_account.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2015, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/campaign_item/campaign_item.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2021, Influx ERP Solutions
# For license information, please see license.txt

# import frappe


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Cash Flow Mapper', {


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Cash Flow Mapping', {


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Cash Flow Mapping Template', {


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// Copyright (c) 2018, Influx ERP Solutions
// For license information, please see license.txt

frappe.ui.form.on('Cash Flow Mapping Template Details', {


+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2018, Influx ERP Solutions
# For license information, please see license.txt




+ 1
- 1
erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2018, Influx ERP Solutions and Contributors
# See license.txt

import unittest


+ 1
- 1
erpnext/accounts/doctype/cashier_closing/cashier_closing.js 查看文件

@@ -1,4 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// Copyright (c) 2015, Influx ERP Solutions and Contributors
// License: GNU General Public License v3. See license.txt

frappe.ui.form.on('Cashier Closing', {


+ 1
- 1
erpnext/accounts/doctype/cashier_closing/cashier_closing.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# License: GNU General Public License v3. See license.txt




+ 1
- 1
erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py 查看文件

@@ -1,4 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# Copyright (c) 2015, Influx ERP Solutions and Contributors
# See license.txt

import unittest


部分文件因为文件数量过多而无法显示

正在加载...
取消
保存