From 192db7d6233482434b7b55b05ba94596158308de Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 24 Jul 2019 16:22:37 +0530 Subject: [PATCH 01/37] fix: url fixes for changelog --- erpnext/change_log/v12/v12_0_0.md | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/erpnext/change_log/v12/v12_0_0.md b/erpnext/change_log/v12/v12_0_0.md index dcbc9a00dd..c2f33a8b7a 100644 --- a/erpnext/change_log/v12/v12_0_0.md +++ b/erpnext/change_log/v12/v12_0_0.md @@ -1,41 +1,41 @@ # Version 12 Release Notes ### Accounting -1. [Accounting Dimensions](/docs/user/manual/en/accounts/accounting-dimensions) -1. [Chart of Accounts Importer](/docs/user/manual/en/setting-up/chart-of-accounts-importer) -1. [Invoice Discounting](/docs/user/manual/en/accounts/invoice_discounting) +1. [Accounting Dimensions](https://erpnext.com/docs/user/manual/en/accounts/accounting-dimensions) +1. [Chart of Accounts Importer](https://erpnext.com/docs/user/manual/en/setting-up/chart-of-accounts-importer) +1. [Invoice Discounting](https://erpnext.com/docs/user/manual/en/accounts/invoice_discounting) 1. [Tally Migrator](https://github.com/frappe/erpnext/pull/17405) ### Stock -1. [Serialized & Batched Item Reconciliation](/docs/user/manual/en/setting-up/stock-reconciliation#12-for-serialized-items) -1. [Auto Fetch Serialized Items](/version-12/release-notes/features#new-upload-dialog) -1. [Item Tax Templates](/docs/user/manual/en/accounts/item-tax-template) +1. [Serialized & Batched Item Reconciliation](https://erpnext.com/docs/user/manual/en/setting-up/stock-reconciliation#12-for-serialized-items) +1. [Auto Fetch Serialized Items](https://erpnext.com/version-12/release-notes/features#new-upload-dialog) +1. [Item Tax Templates](https://erpnext.com/docs/user/manual/en/accounts/item-tax-template) ### HR -1. [Auto Attendance](/docs/user/manual/en/human-resources/auto-attendance) -1. [Employee Skill Map](/docs/user/manual/en/human-resources/employee_skill_map) -1. [Encrypted Salary Slips](/docs/user/manual/en/human-resources/hr-settings#24-encrypt-salary-slips-in-emails) -1. [Leave Ledger](/docs/user/manual/en/human-resources/leave-ledger-entry) -1. [Staffing Plan](/docs/user/manual/en/human-resources/staffing-plan) +1. [Auto Attendance](https://erpnext.com/docs/user/manual/en/human-resources/auto-attendance) +1. [Employee Skill Map](https://erpnext.com/docs/user/manual/en/human-resources/employee_skill_map) +1. [Encrypted Salary Slips](https://erpnext.com/docs/user/manual/en/human-resources/hr-settings#24-encrypt-salary-slips-in-emails) +1. [Leave Ledger](https://erpnext.com/docs/user/manual/en/human-resources/leave-ledger-entry) +1. [Staffing Plan](https://erpnext.com/docs/user/manual/en/human-resources/staffing-plan) ### CRM -1. [Promotional Scheme](/docs/user/manual/en/accounts/promotional-schemes) -1. [SLA](/docs/user/manual/en/support/service-level-agreement) -1. [Exotel Call Integration](/docs/user/manual/en/erpnext_integration/exotel_integration) -1. [Email Campaign](/docs/user/manual/en/CRM/email-campaign) +1. [Promotional Scheme](https://erpnext.com/docs/user/manual/en/accounts/promotional-schemes) +1. [SLA](https://erpnext.com/docs/user/manual/en/support/service-level-agreement) +1. [Exotel Call Integration](https://erpnext.com/docs/user/manual/en/erpnext_integration/exotel_integration) +1. [Email Campaign](https://erpnext.com/docs/user/manual/en/CRM/email-campaign) ### Domain Specific Features -1. [Learning Management System](/docs/user/manual/en/education/setting-up-lms) -1. [Quality Management System](/docs/user/manual/en/quality-management) -1. [Production Planning Enhancements](/docs/user/manual/en/manufacturing/production-plan/planning-for-material-requests) -1. [Project Template](/docs/user/manual/en/projects/project-template) +1. [Learning Management System](https://erpnext.com/docs/user/manual/en/education/setting-up-lms) +1. [Quality Management System](https://erpnext.com/docs/user/manual/en/quality-management) +1. [Production Planning Enhancements](https://erpnext.com/docs/user/manual/en/manufacturing/production-plan/planning-for-material-requests) +1. [Project Template](https://erpnext.com/docs/user/manual/en/projects/project-template) ### New Reports -1. [Bank Remittance](/docs/user/manual/en/human-resources/human-resources-reports#bank-remittance-report) -1. [BOM Explorer](/docs/user/manual/en/stock/articles/bom_explorer) -1. [Billing Summary Report](/docs/user/manual/en/projects/reports/billing_summary_reports) +1. [Bank Remittance](https://erpnext.com/docs/user/manual/en/human-resources/human-resources-reports#bank-remittance-report) +1. [BOM Explorer](https://erpnext.com/docs/user/manual/en/stock/articles/bom_explorer) +1. [Billing Summary Report](https://erpnext.com/docs/user/manual/en/projects/reports/billing_summary_reports) 1. [Procurement Tracker Report](docs/user/manual/en/buying/articles/procurement-tracker-report) -1. [Loan Repayment](/docs/user/manual/en/human-resources/human-resources-reports#loan-repayment-report) -1. [GSTR-3B](/docs/user/manual/en/regional/india/gst-3b-report) -1. [Sales Partner](/docs/user/manual/en/selling/sales-partner#sales-partner-reports) -1. [Sales Partner Target Variance based on Item Group](sales-partner-target-variance-based-on-item-group) +1. [Loan Repayment](https://erpnext.com/docs/user/manual/en/human-resources/human-resources-reports#loan-repayment-report) +1. [GSTR-3B](https://erpnext.com/docs/user/manual/en/regional/india/gst-3b-report) +1. [Sales Partner](https://erpnext.com/docs/user/manual/en/selling/sales-partner#sales-partner-reports) +1. [Sales Partner Target Variance based on Item Group](https://erpnext.com/docs/user/manual/en/selling/sales-partner#sales-partner-target-variance-based-on-item-group) From 029de1a244ccad4ad2dc4c51f7815bd6f5361fd8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 24 Jul 2019 15:18:52 +0530 Subject: [PATCH 02/37] fix(travis): Remove unnecessary commands --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8a0d82614..ace0bfb243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,6 @@ services: install: # fix mongodb travis error - - sudo rm /etc/apt/sources.list.d/mongodb*.list - - pip install flake8==3.3.0 - - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - - sudo rm /etc/apt/sources.list.d/docker.list - - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/ - - sudo apt-get purge -y mysql-common mysql-server mysql-client - nvm install 10 - pip install python-coveralls - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py From e0e78fb0e2407e1fcdf16962c6399705acb70a45 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 13:42:43 +0530 Subject: [PATCH 03/37] fix(travis): Restructure build matrix --- .travis.yml | 36 +++++++++++++++++++++++++----------- travis/run-tests.sh | 12 ------------ 2 files changed, 25 insertions(+), 23 deletions(-) delete mode 100755 travis/run-tests.sh diff --git a/.travis.yml b/.travis.yml index ace0bfb243..0660779b2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,34 @@ -language: python dist: trusty -python: - - "2.7" - - "3.6" - -env: - - TEST_TYPE="Server Side Test" - - TEST_TYPE="Patch Test" +language: python services: - mysql +jobs: + include: + - name: "Python 2.7 Server Side Test" + python: 2.7 + script: bench run-tests --app erpnext --coverage + + - name: "Python 3.6 Server Side Test" + python: 3.6 + script: bench run-tests --app erpnext --coverage + + - name: "Python 2.7 Patch Test" + python: 2.7 + before_script: + - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz + - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + script: bench migrate + + - name: "Python 3.6 Patch Test" + python: 3.6 + before_script: + - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz + - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + script: bench migrate + install: # fix mongodb travis error - nvm install 10 @@ -38,8 +55,5 @@ before_script: - bench start & - sleep 10 -script: - - bash $TRAVIS_BUILD_DIR/travis/run-tests.sh - after_script: - coveralls -b apps/erpnext -d ../../sites/.coverage diff --git a/travis/run-tests.sh b/travis/run-tests.sh deleted file mode 100755 index 7cfd64833b..0000000000 --- a/travis/run-tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -if [[ $TEST_TYPE == 'Server Side Test' ]]; then - bench run-tests --app erpnext --coverage - -elif [[ $TEST_TYPE == 'Patch Test' ]]; then - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis - bench migrate -fi From 9b24a4201798d09ee5c79ecb4054c24bb2d989c0 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:09:34 +0530 Subject: [PATCH 04/37] fix(travis): Use MariaDB 10.3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0660779b2d..1561d6ca0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ dist: trusty language: python -services: - - mysql +addons: + mariadb: 10.3 jobs: include: From 2fb9e8a94d749e38358b80dce70b8feef91fa16b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:10:06 +0530 Subject: [PATCH 05/37] fix(travis): Install coverall after tests --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1561d6ca0f..c51c6b078e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,7 @@ jobs: script: bench migrate install: - # fix mongodb travis error - nvm install 10 - - pip install python-coveralls - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py - sudo python install.py --develop --user travis --without-bench-setup - sudo pip install -e ~/bench @@ -56,4 +54,5 @@ before_script: - sleep 10 after_script: + - pip install python-coveralls - coveralls -b apps/erpnext -d ../../sites/.coverage From 3f6ac2d993939043685331bb315f26141dac9fde Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:11:18 +0530 Subject: [PATCH 06/37] fix(travis): Do not execute install.py --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c51c6b078e..047a98640f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,11 @@ jobs: script: bench migrate install: + - cd ~ - nvm install 10 - - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py - - sudo python install.py --develop --user travis --without-bench-setup - - sudo pip install -e ~/bench + + - git clone https://github.com/frappe/bench --depth 1 + - pip install -e ./bench - rm $TRAVIS_BUILD_DIR/.git/shallow - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh From 23f24d13dd1c37ecbcccff7f8e4a66841324bfd8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:15:30 +0530 Subject: [PATCH 07/37] fix(travis): Remove travis/bench_init.sh --- .travis.yml | 5 +++-- travis/bench_init.sh | 8 -------- 2 files changed, 3 insertions(+), 10 deletions(-) delete mode 100755 travis/bench_init.sh diff --git a/.travis.yml b/.travis.yml index 047a98640f..e0a2ead3d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,9 @@ install: - git clone https://github.com/frappe/bench --depth 1 - pip install -e ./bench - - rm $TRAVIS_BUILD_DIR/.git/shallow - - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh + - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1 + - bench init --frappe-path ~/frappe --python $(which python) frappe-bench + - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/ before_script: diff --git a/travis/bench_init.sh b/travis/bench_init.sh deleted file mode 100755 index f96269b919..0000000000 --- a/travis/bench_init.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cd ~/ -curl -I https://github.com/frappe/frappe/tree/$TRAVIS_BRANCH | head -n 1 | cut -d $' ' -f2 | ( - read response; - [ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop'; - bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch --python $(which python) -) From e2b16e3edbebaae0746d83077eb32c226b6f9f29 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:18:05 +0530 Subject: [PATCH 08/37] fix(travis): Remove unused files --- .travis.yml | 3 ++- {test_sites/test_site => .travis}/site_config.json | 3 +-- test_sites/apps.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) rename {test_sites/test_site => .travis}/site_config.json (81%) delete mode 100644 test_sites/apps.txt diff --git a/.travis.yml b/.travis.yml index e0a2ead3d5..108df91e40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,8 @@ install: - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1 - bench init --frappe-path ~/frappe --python $(which python) frappe-bench - - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/ + - mkdir ~/frappe-bench/sites/test_site + - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/ before_script: - mysql -u root -ptravis -e 'create database test_frappe' diff --git a/test_sites/test_site/site_config.json b/.travis/site_config.json similarity index 81% rename from test_sites/test_site/site_config.json rename to .travis/site_config.json index 7a4d106508..695f6c3517 100644 --- a/test_sites/test_site/site_config.json +++ b/.travis/site_config.json @@ -6,8 +6,7 @@ "mail_login": "test@example.com", "mail_password": "test", "admin_password": "admin", - "run_selenium_tests": 1, "root_password": "travis", - "host_name": "http://localhost:8000", + "host_name": "http://test_site:8000", "install_apps": ["erpnext"] } \ No newline at end of file diff --git a/test_sites/apps.txt b/test_sites/apps.txt deleted file mode 100644 index ee6454915c..0000000000 --- a/test_sites/apps.txt +++ /dev/null @@ -1 +0,0 @@ -erpnext \ No newline at end of file From 185e2a2fd8926e96e0311cbaff0c95acb57f50d7 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:19:30 +0530 Subject: [PATCH 09/37] fix(travis): Setup MariaDB --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 108df91e40..5ecede08e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,15 @@ install: - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/ before_script: - - mysql -u root -ptravis -e 'create database test_frappe' - - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis - - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis + - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" + - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" + + - mysql -u root -e "CREATE DATABASE test_frappe" + - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" + - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" + + - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" + - mysql -u root -e "FLUSH PRIVILEGES" - cd ~/frappe-bench - bench get-app erpnext $TRAVIS_BUILD_DIR From fb2ec7186da073c79954e4723479258d547e0253 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:21:19 +0530 Subject: [PATCH 10/37] fix(travis): Do not use use_site --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ecede08e8..9840ad5e15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,31 +3,32 @@ dist: trusty language: python addons: + hosts: test_site mariadb: 10.3 jobs: include: - name: "Python 2.7 Server Side Test" python: 2.7 - script: bench run-tests --app erpnext --coverage + script: bench --site test_site run-tests --app erpnext --coverage - name: "Python 3.6 Server Side Test" python: 3.6 - script: bench run-tests --app erpnext --coverage + script: bench --site test_site run-tests --app erpnext --coverage - name: "Python 2.7 Patch Test" python: 2.7 before_script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis - script: bench migrate + script: bench --site test_site migrate - name: "Python 3.6 Patch Test" python: 3.6 before_script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis - script: bench migrate + - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + script: bench --site test_site migrate install: - cd ~ @@ -55,9 +56,8 @@ before_script: - cd ~/frappe-bench - bench get-app erpnext $TRAVIS_BUILD_DIR - - bench use test_site - - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes - - bench scheduler disable + - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes + - bench --site test_site scheduler disable - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & - sleep 10 From 1e9e471714c04b06cab77353132cfa377dc0eff0 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:21:54 +0530 Subject: [PATCH 11/37] fix(travis): Do not disable scheduler using CLI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9840ad5e15..cd593a8aed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,6 @@ before_script: - cd ~/frappe-bench - bench get-app erpnext $TRAVIS_BUILD_DIR - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes - - bench --site test_site scheduler disable - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & - sleep 10 From 903e87899b6e94bef3cba133271a0a249d8bbc81 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:23:24 +0530 Subject: [PATCH 12/37] fix(travis): Execute get-app and reinstall after bench start --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd593a8aed..d3581e2b8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,11 +55,11 @@ before_script: - mysql -u root -e "FLUSH PRIVILEGES" - cd ~/frappe-bench - - bench get-app erpnext $TRAVIS_BUILD_DIR - - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & - sleep 10 + - bench get-app erpnext $TRAVIS_BUILD_DIR + - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes after_script: - pip install python-coveralls From e4f78a0b6a208de4583bc81281dd9595ed17d8cd Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:23:43 +0530 Subject: [PATCH 13/37] perf(travis): Do not waste 10 seconds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3581e2b8d..23627f51f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,6 @@ before_script: - cd ~/frappe-bench - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & - - sleep 10 - bench get-app erpnext $TRAVIS_BUILD_DIR - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes From 7c44adad3eb7c58f2011f5fbeffc11a1c046ffbd Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:25:53 +0530 Subject: [PATCH 14/37] fix(travis): Use MariaDB credentials from site_config.json --- .travis.yml | 2 +- .travis/site_config.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 23627f51f0..54d77db7c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ before_script: - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & - bench get-app erpnext $TRAVIS_BUILD_DIR - - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes + - bench --site test_site reinstall --yes after_script: - pip install python-coveralls diff --git a/.travis/site_config.json b/.travis/site_config.json index 695f6c3517..dae80095d4 100644 --- a/.travis/site_config.json +++ b/.travis/site_config.json @@ -6,6 +6,7 @@ "mail_login": "test@example.com", "mail_password": "test", "admin_password": "admin", + "root_login": "root", "root_password": "travis", "host_name": "http://test_site:8000", "install_apps": ["erpnext"] From 30628b016b8b7226c38abc17332e47a885e19b5e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:27:20 +0530 Subject: [PATCH 15/37] perf(travis): Remove unnecessary processes from Procfile --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54d77db7c6..2637d978e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,12 @@ before_script: - mysql -u root -e "FLUSH PRIVILEGES" - cd ~/frappe-bench - - sed -i 's/9000/9001/g' sites/common_site_config.json + + - sed -i 's/watch:/# watch:/g' Procfile + - sed -i 's/schedule:/# schedule:/g' Procfile + - sed -i 's/socketio:/# socketio:/g' Procfile + - sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile + - bench start & - bench get-app erpnext $TRAVIS_BUILD_DIR - bench --site test_site reinstall --yes From e31284189f3caa769f94ffea11aaf340ac1ee37e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:28:15 +0530 Subject: [PATCH 16/37] perf(travis): Do not build assets --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2637d978e4..e3d432a5ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - pip install -e ./bench - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1 - - bench init --frappe-path ~/frappe --python $(which python) frappe-bench + - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench - mkdir ~/frappe-bench/sites/test_site - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/ From 50e2d4aa6a73d4fd5025d2b737631b8d39cd87f2 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:36:22 +0530 Subject: [PATCH 17/37] perf(travis): Use travis optimizations --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index e3d432a5ae..ee385d0e08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ dist: trusty language: python +git: + depth: 1 + +cache: + - pip + addons: hosts: test_site mariadb: 10.3 From 6076443b6be47261a1fe784dd34871601afa7b08 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:38:07 +0530 Subject: [PATCH 18/37] fix(travis): Execute get-app before bench start --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee385d0e08..2f7637372e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,8 +67,8 @@ before_script: - sed -i 's/socketio:/# socketio:/g' Procfile - sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile - - bench start & - bench get-app erpnext $TRAVIS_BUILD_DIR + - bench start & - bench --site test_site reinstall --yes after_script: From 7b39aa7f91462b6076ca3c89fd0280af10f9b53d Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:39:30 +0530 Subject: [PATCH 19/37] fix(travis): Merge install and before_script --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f7637372e..fb941f3ff3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,6 @@ install: - mkdir ~/frappe-bench/sites/test_site - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/ -before_script: - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" From ac431c8e333a72b1c8faf9bcbe31c7301557d52a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:50:46 +0530 Subject: [PATCH 20/37] fix(travis): Use --site parameter --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb941f3ff3..9b51c85eca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ jobs: python: 2.7 before_script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis script: bench --site test_site migrate - name: "Python 3.6 Patch Test" From 0046357b864c53cda22ccc0202c1623a24e2bfa0 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 21:51:12 +0530 Subject: [PATCH 21/37] fix(travis): Remove redundant arguments --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b51c85eca..53c67fe15d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,14 +26,14 @@ jobs: python: 2.7 before_script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz script: bench --site test_site migrate - name: "Python 3.6 Patch Test" python: 3.6 before_script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz script: bench --site test_site migrate install: From b6906c58d1ae6d7c6febdf196e1b098eb5dec8f0 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 22:40:26 +0530 Subject: [PATCH 22/37] fix(travis): Install wkhtmltopdf --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 53c67fe15d..40afeee8d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,11 @@ install: - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" - mysql -u root -e "FLUSH PRIVILEGES" + - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/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 + - cd ~/frappe-bench - sed -i 's/watch:/# watch:/g' Procfile From 0d333894c930b96878e374b3bb474a5e2d5329f9 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 25 Jul 2019 23:37:43 +0530 Subject: [PATCH 23/37] perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown --- .../doctype/purchase_invoice/test_purchase_invoice.py | 7 +++++-- .../accounts/doctype/sales_invoice/test_sales_invoice.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py index b4d584fbde..6deee38148 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -20,11 +20,13 @@ test_dependencies = ["Item", "Cost Center", "Payment Term", "Payment Terms Templ test_ignore = ["Serial No"] class TestPurchaseInvoice(unittest.TestCase): - def setUp(self): + @classmethod + def setUpClass(self): unlink_payment_on_cancel_of_invoice() frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1) - def tearDown(self): + @classmethod + def tearDownClass(self): unlink_payment_on_cancel_of_invoice(0) def test_gl_entries_without_perpetual_inventory(self): @@ -91,6 +93,7 @@ class TestPurchaseInvoice(unittest.TestCase): pi_doc = frappe.get_doc('Purchase Invoice', pi_doc.name) self.assertRaises(frappe.LinkExistsError, pi_doc.cancel) + unlink_payment_on_cancel_of_invoice() def test_purchase_invoice_for_blocked_supplier(self): supplier = frappe.get_doc('Supplier', '_Test Supplier') diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 52470fde95..dff55947df 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -29,10 +29,12 @@ class TestSalesInvoice(unittest.TestCase): w.submit() return w - def setUp(self): + @classmethod + def setUpClass(self): unlink_payment_on_cancel_of_invoice() - def tearDown(self): + @classmethod + def tearDownClass(self): unlink_payment_on_cancel_of_invoice(0) def test_timestamp_change(self): @@ -135,6 +137,7 @@ class TestSalesInvoice(unittest.TestCase): unlink_payment_on_cancel_of_invoice(0) si = frappe.get_doc('Sales Invoice', si.name) self.assertRaises(frappe.LinkExistsError, si.cancel) + unlink_payment_on_cancel_of_invoice() def test_sales_invoice_calculation_export_currency(self): si = frappe.copy_doc(test_records[2]) From 8773d931be206dc702d3b56e3aabc5a5d1ef63f4 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 26 Jul 2019 00:38:51 +0530 Subject: [PATCH 24/37] perf(tests): Do not unnecessarily create companies --- erpnext/tests/test_notifications.py | 44 ++++++++++------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/erpnext/tests/test_notifications.py b/erpnext/tests/test_notifications.py index 596bc80dee..1fd90beef0 100644 --- a/erpnext/tests/test_notifications.py +++ b/erpnext/tests/test_notifications.py @@ -2,45 +2,31 @@ # MIT License. See license.txt from __future__ import unicode_literals +import frappe import unittest from frappe.desk import notifications from frappe.test_runner import make_test_objects class TestNotifications(unittest.TestCase): - def setUp(self): - test_records_company = [ - { - "abbr": "_TC6", - "company_name": "_Test Company 6", - "country": "India", - "default_currency": "INR", - "doctype": "Company", - "domain": "Manufacturing", - "monthly_sales_target": 2000, - "chart_of_accounts": "Standard" - }, - { - "abbr": "_TC7", - "company_name": "_Test Company 7", - "country": "United States", - "default_currency": "USD", - "doctype": "Company", - "domain": "Retail", - "monthly_sales_target": 10000, - "total_monthly_sales": 1000, - "chart_of_accounts": "Standard" - }, - ] - - make_test_objects('Company', test_records=test_records_company, reset=True) - def test_get_notifications_for_targets(self): ''' Test notification config entries for targets as percentages ''' + company = frappe.get_all("Company")[0] + frappe.db.set_value("Company", company.name, "monthly_sales_target", 10000) + frappe.db.set_value("Company", company.name, "total_monthly_sales", 1000) + config = notifications.get_notification_config() doc_target_percents = notifications.get_notifications_for_targets(config, {}) - self.assertEqual(doc_target_percents['Company']['_Test Company 7'], 10) - self.assertEqual(doc_target_percents['Company']['_Test Company 6'], 0) + + self.assertEqual(doc_target_percents['Company'][company.name], 10) + + frappe.db.set_value("Company", company.name, "monthly_sales_target", 2000) + frappe.db.set_value("Company", company.name, "total_monthly_sales", 0) + + config = notifications.get_notification_config() + doc_target_percents = notifications.get_notifications_for_targets(config, {}) + + self.assertEqual(doc_target_percents['Company'][company.name], 0) From d1bb274c22836202bb6aef67ff9a512f4e40e866 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 26 Jul 2019 01:09:01 +0530 Subject: [PATCH 25/37] perf(tests): Use country with lesser fixtures --- .../report/procurement_tracker/test_procurement_tracker.py | 2 +- erpnext/hr/doctype/staffing_plan/test_staffing_plan.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py b/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py index 4a13f385bb..bebf0ccec5 100644 --- a/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py +++ b/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py @@ -30,7 +30,7 @@ class TestProcurementTracker(unittest.TestCase): company_name="_Test Procurement Company", abbr="_TPC", default_currency="INR", - country="India" + country="Pakistan" )).insert() warehouse = create_warehouse("_Test Procurement Warehouse", company="_Test Procurement Company") mr = make_material_request(company="_Test Procurement Company", warehouse=warehouse) diff --git a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py index 4a0ce1800a..9ba6d5e63f 100644 --- a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py +++ b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py @@ -92,5 +92,5 @@ def make_company(): company.abbr = "_TC10" company.parent_company = "_Test Company" company.default_currency = "INR" - company.country = "India" + company.country = "Pakistan" company.insert() \ No newline at end of file From bd69f43322455b7a40fe4a30d1076eeda0420c07 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 26 Jul 2019 03:05:40 +0530 Subject: [PATCH 26/37] fix(stock): Fix travis builds --- .../stock/doctype/stock_reconciliation/stock_reconciliation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index d9e62c7931..98a8c59483 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -327,7 +327,8 @@ class StockReconciliation(StockController): if sl_entries: sl_entries.reverse() - self.make_sl_entries(sl_entries) + allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock") + self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock) # repost future entries for selected item_code, warehouse for entries in existing_entries: From f4314a25b633ca8db9b7ffabd5c957cd09b6a356 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 26 Jul 2019 03:06:23 +0530 Subject: [PATCH 27/37] perf(travis): Use setUpClass instead of setUp --- .../test_stock_reconciliation.py | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index f0c71cf39a..ededc4d8b4 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -17,10 +17,11 @@ from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_availa from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos class TestStockReconciliation(unittest.TestCase): - def setUp(self): + @classmethod + def setUpClass(self): create_batch_or_serial_no_items() frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1) - self.insert_existing_sle() + insert_existing_sle() def test_reco_for_fifo(self): self._test_reco_sle_gle("FIFO") @@ -97,18 +98,6 @@ class TestStockReconciliation(unittest.TestCase): self.assertEqual(["_Test Stock Reco Item", "_Test Warehouse Ledger 1 - _TC", 100], [items[0]["item_code"], items[0]["warehouse"], items[0]["qty"]]) - def insert_existing_sle(self): - from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry - - make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item", - target="_Test Warehouse - _TC", qty=10, basic_rate=700) - - make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item", - source="_Test Warehouse - _TC", qty=15) - - make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item", - target="_Test Warehouse - _TC", qty=15, basic_rate=1200) - def test_stock_reco_for_serialized_item(self): set_perpetual_inventory() @@ -218,6 +207,18 @@ class TestStockReconciliation(unittest.TestCase): for d in to_delete_records: frappe.delete_doc("Stock Reconciliation", d) +def insert_existing_sle(): + from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry + + make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item", + target="_Test Warehouse - _TC", qty=10, basic_rate=700) + + make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item", + source="_Test Warehouse - _TC", qty=15) + + make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item", + target="_Test Warehouse - _TC", qty=15, basic_rate=1200) + def create_batch_or_serial_no_items(): create_warehouse("_Test Warehouse for Stock Reco1", {"is_group": 0, "parent_warehouse": "_Test Warehouse Group - _TC"}) From f2fb461e40d21ded1fe1ee14f293f4494a338f74 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 26 Jul 2019 03:51:45 +0530 Subject: [PATCH 28/37] perf(tests): Remove unnecessary tearDown code --- .../doctype/stock_settings/test_stock_settings.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.py b/erpnext/stock/doctype/stock_settings/test_stock_settings.py index 1e83ec2f49..42a78f723d 100644 --- a/erpnext/stock/doctype/stock_settings/test_stock_settings.py +++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.py @@ -8,16 +8,7 @@ import unittest class TestStockSettings(unittest.TestCase): def setUp(self): - settings = frappe.get_single('Stock Settings') - settings.clean_description_html = 0 - settings.save() - - frappe.delete_doc('Item', 'Item for description test') - - def tearDown(self): - settings = frappe.get_single('Stock Settings') - settings.clean_description_html = 1 - settings.save() + frappe.db.set_value("Stock Settings", None, "clean_description_html", 0) def test_settings(self): item = frappe.get_doc(dict( From 4d53992b354eebe87b00c250c558eaa163ae2de5 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 10 Jul 2019 14:49:25 +0530 Subject: [PATCH 29/37] fix: Changed columns to new dict form --- .../stock/report/stock_ageing/stock_ageing.py | 79 +++++++++++++++++-- 1 file changed, 74 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 969284598c..f81e1c0b91 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -45,14 +45,83 @@ def get_average_age(fifo_queue, to_date): return (age_qty / total_qty) if total_qty else 0.0 def get_columns(filters): - columns = [_("Item Code") + ":Link/Item:100", _("Item Name") + "::100", _("Description") + "::200", - _("Item Group") + ":Link/Item Group:100", _("Brand") + ":Link/Brand:100"] + columns = [ + { + "label": _("Item Code"), + "fieldname": "item_code", + "fieldtype": "Link", + "options": "Item", + "width": 100 + }, + { + "label": _("Item Name"), + "fieldname": "item_name", + "fieldtype": "Data", + "width": 100 + }, + { + "label": _("Description"), + "fieldname": "description", + "fieldtype": "Data", + "width": 200 + }, + { + "label": _("Item Group"), + "fieldname": "item_group", + "fieldtype": "Link", + "options": "Item Group", + "width": 100 + }, + { + "label": _("Brand"), + "fieldname": "brand", + "fieldtype": "Link", + "options": "Brand", + "width": 100 + }] if filters.get("show_ageing_warehouse_wise"): - columns.extend([_("Warehouse") + ":Link/Warehouse:100"]) + columns +=[{ + "label": _("Warehouse"), + "fieldname": "warehouse", + "fieldtype": "Link", + "options": "Warehouse", + "width": 100 + }] - columns.extend([_("Available Qty") + ":Float:100", _("Average Age") + ":Float:100", - _("Earliest") + ":Int:80", _("Latest") + ":Int:80", _("UOM") + ":Link/UOM:100"]) + columns.extend([ + { + "label": _("Available Qty"), + "fieldname": "qty", + "fieldtype": "Float", + "width": 100 + }, + { + "label": _("Average Age"), + "fieldname": "average_age", + "fieldtype": "Float", + "width": 100 + }, + { + "label": _("Earliest"), + "fieldname": "earliest", + "fieldtype": "Int", + "width": 80 + }, + { + "label": _("Latest"), + "fieldname": "latest", + "fieldtype": "Int", + "width": 80 + }, + { + "label": _("UOM"), + "fieldname": "uom", + "fieldtype": "Link", + "options": "UOM", + "width": 100 + } + ]) return columns From f7733be322533f977f6171fd7b002164d3bf13ef Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sat, 13 Jul 2019 21:58:32 +0530 Subject: [PATCH 30/37] fix: Enhancement in stock ageing report --- .../stock/report/stock_ageing/stock_ageing.js | 4 +- .../stock/report/stock_ageing/stock_ageing.py | 37 ++++++++++++++----- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.js b/erpnext/stock/report/stock_ageing/stock_ageing.js index aad8df426a..ccde61a167 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.js +++ b/erpnext/stock/report/stock_ageing/stock_ageing.js @@ -37,8 +37,8 @@ frappe.query_reports["Stock Ageing"] = { "options": "Brand" }, { - "fieldname":"show_ageing_warehouse_wise", - "label": __("Show Ageing Warehouse-wise"), + "fieldname":"show_warehouse_wise_stock", + "label": __("Show Warehouse-wise Stock"), "fieldtype": "Check", "default": 0 } diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index f81e1c0b91..54498934b3 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -14,7 +14,7 @@ def execute(filters=None): to_date = filters["to_date"] data = [] for item, item_dict in iteritems(item_details): - fifo_queue = item_dict["fifo_queue"] + fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) details = item_dict["details"] if not fifo_queue: continue @@ -25,7 +25,7 @@ def execute(filters=None): row = [details.name, details.item_name, details.description, details.item_group, details.brand] - if filters.get("show_ageing_warehouse_wise"): + if filters.get("show_warehouse_wise_stock"): row.append(details.warehouse) row.extend([item_dict.get("total_qty"), average_age, @@ -80,7 +80,7 @@ def get_columns(filters): "width": 100 }] - if filters.get("show_ageing_warehouse_wise"): + if filters.get("show_warehouse_wise_stock"): columns +=[{ "label": _("Warehouse"), "fieldname": "warehouse", @@ -127,16 +127,34 @@ def get_columns(filters): def get_fifo_queue(filters): item_details = {} - for d in get_stock_ledger_entries(filters): - key = (d.name, d.warehouse) if filters.get('show_ageing_warehouse_wise') else d.name + transfered_item_details = {} + + sle = get_stock_ledger_entries(filters) + + for d in sle: + key = (d.name, d.warehouse) if filters.get('show_warehouse_wise_stock') else d.name item_details.setdefault(key, {"details": d, "fifo_queue": []}) fifo_queue = item_details[key]["fifo_queue"] + transfered_item_details.setdefault((d.voucher_no, d.name), []) + if d.voucher_type == "Stock Reconciliation": d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) if d.actual_qty > 0: - fifo_queue.append([d.actual_qty, d.posting_date]) + if filters.get('show_warehouse_wise_stock') and transfered_item_details.get((d.voucher_no, d.name)): + qty_to_add = d.actual_qty + while qty_to_add: + batch = transfered_item_details[(d.voucher_no, d.name)][0] + if 0 < batch[0] <= qty_to_add: + qty_to_add -= batch[0] + fifo_queue.append(batch) + transfered_item_details[((d.voucher_no, d.name))].pop(0) + else: + batch[0] -= qty_to_add + fifo_queue.append([qty_to_add, batch[1]]) + else: + fifo_queue.append([d.actual_qty, d.posting_date]) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: @@ -145,10 +163,11 @@ def get_fifo_queue(filters): # if batch qty > 0 # not enough or exactly same qty in current batch, clear batch qty_to_pop -= batch[0] - fifo_queue.pop(0) + transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) else: # all from current batch batch[0] -= qty_to_pop + transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) qty_to_pop = 0 item_details[key]["qty_after_transaction"] = d.qty_after_transaction @@ -163,7 +182,7 @@ def get_fifo_queue(filters): def get_stock_ledger_entries(filters): return frappe.db.sql("""select item.name, item.item_name, item_group, brand, description, item.stock_uom, - actual_qty, posting_date, voucher_type, qty_after_transaction, warehouse + actual_qty, posting_date, voucher_type, voucher_no, qty_after_transaction, warehouse from `tabStock Ledger Entry` sle, (select name, item_name, description, stock_uom, brand, item_group from `tabItem` {item_conditions}) item @@ -171,7 +190,7 @@ def get_stock_ledger_entries(filters): company = %(company)s and posting_date <= %(to_date)s {sle_conditions} - order by posting_date, posting_time, sle.creation"""\ + order by posting_date, posting_time, sle.creation, actual_qty"""\ .format(item_conditions=get_item_conditions(filters), sle_conditions=get_sle_conditions(filters)), filters, as_dict=True) From e3a2ab184e3e168b15d89543987085fa649407ac Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 16 Jul 2019 16:08:50 +0530 Subject: [PATCH 31/37] fix: Consider serial no and batches in Stock ageing report --- .../stock/report/stock_ageing/stock_ageing.py | 69 +++++++++++++------ 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 54498934b3..7529ae6aa7 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -16,8 +16,9 @@ def execute(filters=None): for item, item_dict in iteritems(item_details): fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) details = item_dict["details"] - if not fifo_queue: continue + if not fifo_queue or (not item_dict.get("total_qty")): continue + print(fifo_queue) average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) @@ -39,8 +40,13 @@ def get_average_age(fifo_queue, to_date): batch_age = age_qty = total_qty = 0.0 for batch in fifo_queue: batch_age = date_diff(to_date, batch[1]) - age_qty += batch_age * batch[0] - total_qty += batch[0] + + if type(batch[0]) in ['int', 'float']: + age_qty += batch_age * batch[0] + total_qty += batch[0] + else: + age_qty += batch_age * 1 + total_qty += 1 return (age_qty / total_qty) if total_qty else 0.0 @@ -128,6 +134,7 @@ def get_columns(filters): def get_fifo_queue(filters): item_details = {} transfered_item_details = {} + serial_no_batch_purchase_details = {} sle = get_stock_ledger_entries(filters) @@ -142,7 +149,7 @@ def get_fifo_queue(filters): d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) if d.actual_qty > 0: - if filters.get('show_warehouse_wise_stock') and transfered_item_details.get((d.voucher_no, d.name)): + if transfered_item_details.get((d.voucher_no, d.name)): qty_to_add = d.actual_qty while qty_to_add: batch = transfered_item_details[(d.voucher_no, d.name)][0] @@ -154,21 +161,43 @@ def get_fifo_queue(filters): batch[0] -= qty_to_add fifo_queue.append([qty_to_add, batch[1]]) else: - fifo_queue.append([d.actual_qty, d.posting_date]) - else: - qty_to_pop = abs(d.actual_qty) - while qty_to_pop: - batch = fifo_queue[0] if fifo_queue else [0, None] - if 0 < batch[0] <= qty_to_pop: - # if batch qty > 0 - # not enough or exactly same qty in current batch, clear batch - qty_to_pop -= batch[0] - transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) + if d.serial_no or d.batch_no: + if d.serial_no: + for no in d.serial_no.split("\n"): + if serial_no_batch_purchase_details.get(no): + fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) + else: + serial_no_batch_purchase_details.setdefault(no, d.posting_date) + fifo_queue.append([no, d.posting_date]) + else: + if serial_no_batch_purchase_details.get(d.batch_no): + fifo_queue.append([d.batch_no, serial_no_batch_purchase_details.get(d.batch_no)]) + else: + serial_no_batch_purchase_details.setdefault(d.batch_no, d.posting_date) + fifo_queue.append([d.batch_no, d.posting_date]) + else: - # all from current batch - batch[0] -= qty_to_pop - transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) - qty_to_pop = 0 + fifo_queue.append([d.actual_qty, d.posting_date]) + else: + if d.serial_no or d.batch_no: + serial_no_list = d.serial_no.split("\n") + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) + else: + qty_to_pop = abs(d.actual_qty) + while qty_to_pop: + batch = fifo_queue[0] if fifo_queue else [0, None] + if 0 < batch[0] <= qty_to_pop: + # if batch qty > 0 + # not enough or exactly same qty in current batch, clear batch + qty_to_pop -= batch[0] + transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) + else: + # all from current batch + batch[0] -= qty_to_pop + transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) + qty_to_pop = 0 item_details[key]["qty_after_transaction"] = d.qty_after_transaction @@ -182,7 +211,7 @@ def get_fifo_queue(filters): def get_stock_ledger_entries(filters): return frappe.db.sql("""select item.name, item.item_name, item_group, brand, description, item.stock_uom, - actual_qty, posting_date, voucher_type, voucher_no, qty_after_transaction, warehouse + actual_qty, posting_date, voucher_type, voucher_no, serial_no, batch_no, qty_after_transaction, warehouse from `tabStock Ledger Entry` sle, (select name, item_name, description, stock_uom, brand, item_group from `tabItem` {item_conditions}) item @@ -190,7 +219,7 @@ def get_stock_ledger_entries(filters): company = %(company)s and posting_date <= %(to_date)s {sle_conditions} - order by posting_date, posting_time, sle.creation, actual_qty"""\ + order by posting_date, posting_time, sle.creation, actual_qty""" #nosec .format(item_conditions=get_item_conditions(filters), sle_conditions=get_sle_conditions(filters)), filters, as_dict=True) From 1495c9599a22ac51eb7ffc81c4d67b4e9a23d388 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 22 Jul 2019 15:30:18 +0530 Subject: [PATCH 32/37] fix: Remove batch --- .../stock/report/stock_ageing/stock_ageing.py | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 7529ae6aa7..790cd8fc26 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -6,6 +6,7 @@ import frappe from frappe import _ from frappe.utils import date_diff, flt from six import iteritems +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos def execute(filters=None): @@ -18,7 +19,6 @@ def execute(filters=None): details = item_dict["details"] if not fifo_queue or (not item_dict.get("total_qty")): continue - print(fifo_queue) average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) @@ -151,39 +151,27 @@ def get_fifo_queue(filters): if d.actual_qty > 0: if transfered_item_details.get((d.voucher_no, d.name)): qty_to_add = d.actual_qty - while qty_to_add: - batch = transfered_item_details[(d.voucher_no, d.name)][0] - if 0 < batch[0] <= qty_to_add: - qty_to_add -= batch[0] - fifo_queue.append(batch) - transfered_item_details[((d.voucher_no, d.name))].pop(0) - else: - batch[0] -= qty_to_add - fifo_queue.append([qty_to_add, batch[1]]) + batch = transfered_item_details[(d.voucher_no, d.name)][0] + fifo_queue.append(batch) + transfered_item_details[((d.voucher_no, d.name))].pop(0) else: - if d.serial_no or d.batch_no: + if d.serial_no: if d.serial_no: - for no in d.serial_no.split("\n"): + for no in get_serial_nos(d.serial_no): if serial_no_batch_purchase_details.get(no): fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) else: serial_no_batch_purchase_details.setdefault(no, d.posting_date) fifo_queue.append([no, d.posting_date]) - else: - if serial_no_batch_purchase_details.get(d.batch_no): - fifo_queue.append([d.batch_no, serial_no_batch_purchase_details.get(d.batch_no)]) - else: - serial_no_batch_purchase_details.setdefault(d.batch_no, d.posting_date) - fifo_queue.append([d.batch_no, d.posting_date]) - else: fifo_queue.append([d.actual_qty, d.posting_date]) else: if d.serial_no or d.batch_no: - serial_no_list = d.serial_no.split("\n") - for serial_no in fifo_queue: - if serial_no[0] in serial_no_list: - fifo_queue.remove(serial_no) + if d.serial_no: + serial_no_list = d.serial_no.split("\n") + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: From 7fdab021b64790972065df540469f1cb22ec2a24 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 22 Jul 2019 15:56:41 +0530 Subject: [PATCH 33/37] fix: Use get_serial_no and remove batch --- erpnext/stock/report/stock_ageing/stock_ageing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 790cd8fc26..91ba463683 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -166,9 +166,9 @@ def get_fifo_queue(filters): else: fifo_queue.append([d.actual_qty, d.posting_date]) else: - if d.serial_no or d.batch_no: + if d.serial_no: if d.serial_no: - serial_no_list = d.serial_no.split("\n") + serial_no_list = get_serial_nos(d.serial_no) for serial_no in fifo_queue: if serial_no[0] in serial_no_list: fifo_queue.remove(serial_no) From 06f99cae3660824b5dba3605fb4ce1060ecccc3b Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 23 Jul 2019 08:30:09 +0530 Subject: [PATCH 34/37] fix: Fixes in stock ageing report --- .../stock/report/stock_ageing/stock_ageing.py | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 91ba463683..83a1d7b62b 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -148,30 +148,28 @@ def get_fifo_queue(filters): if d.voucher_type == "Stock Reconciliation": d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) + serial_no_list = get_serial_nos(d.serial_no) if d.serial_no else [] + if d.actual_qty > 0: if transfered_item_details.get((d.voucher_no, d.name)): - qty_to_add = d.actual_qty batch = transfered_item_details[(d.voucher_no, d.name)][0] fifo_queue.append(batch) transfered_item_details[((d.voucher_no, d.name))].pop(0) else: - if d.serial_no: - if d.serial_no: - for no in get_serial_nos(d.serial_no): - if serial_no_batch_purchase_details.get(no): - fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) - else: - serial_no_batch_purchase_details.setdefault(no, d.posting_date) - fifo_queue.append([no, d.posting_date]) + if serial_no_list: + for serial_no in serial_no_list: + if serial_no_batch_purchase_details.get(serial_no): + fifo_queue.append([serial_no, serial_no_batch_purchase_details.get(serial_no)]) + else: + serial_no_batch_purchase_details.setdefault(serial_no, d.posting_date) + fifo_queue.append([serial_no, d.posting_date]) else: fifo_queue.append([d.actual_qty, d.posting_date]) else: - if d.serial_no: - if d.serial_no: - serial_no_list = get_serial_nos(d.serial_no) - for serial_no in fifo_queue: - if serial_no[0] in serial_no_list: - fifo_queue.remove(serial_no) + if serial_no_list: + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: From ecd4d3883e77c5a620078b285c6a2726cdee53a2 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Fri, 26 Jul 2019 13:29:14 +0550 Subject: [PATCH 35/37] bumped to version 12.0.1 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 020f843c1a..a9348c11f4 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.0.0' +__version__ = '12.0.1' def get_default_company(user=None): '''Get default company for user''' From 3844a98c42d464532ceaaa624fba237bc3d5dbdb Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 26 May 2019 18:18:21 +0530 Subject: [PATCH 36/37] fix: Pro rata calculation is not working for WDV depreciation method --- erpnext/assets/doctype/asset/asset.js | 15 ++- erpnext/assets/doctype/asset/asset.py | 109 +++++++----------- .../asset_settings/asset_settings.json | 71 +----------- 3 files changed, 56 insertions(+), 139 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 2d78d2693d..c5cad73801 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -303,14 +303,17 @@ frappe.ui.form.on('Asset', { }, set_depreciation_rate: function(frm, row) { - if (row.total_number_of_depreciations && row.frequency_of_depreciation) { + if (row.total_number_of_depreciations && row.frequency_of_depreciation + && row.expected_value_after_useful_life) { frappe.call({ method: "get_depreciation_rate", doc: frm.doc, args: row, callback: function(r) { if (r.message) { - frappe.model.set_value(row.doctype, row.name, "rate_of_depreciation", r.message); + frappe.flags.dont_change_rate = true; + frappe.model.set_value(row.doctype, row.name, + "rate_of_depreciation", flt(r.message, precision("rate_of_depreciation", row))); } } }); @@ -338,6 +341,14 @@ frappe.ui.form.on('Asset Finance Book', { total_number_of_depreciations: function(frm, cdt, cdn) { const row = locals[cdt][cdn]; frm.events.set_depreciation_rate(frm, row); + }, + + rate_of_depreciation: function(frm, cdt, cdn) { + if(!frappe.flags.dont_change_rate) { + frappe.model.set_value(cdt, cdn, "expected_value_after_useful_life", 0); + } + + frappe.flags.dont_change_rate = false; } }); diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index c398a7342a..6475d0c4aa 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -101,7 +101,8 @@ class Asset(AccountsController): def set_depreciation_rate(self): for d in self.get("finance_books"): - d.rate_of_depreciation = self.get_depreciation_rate(d, on_validate=True) + d.rate_of_depreciation = flt(self.get_depreciation_rate(d, on_validate=True), + d.precision("rate_of_depreciation")) def make_depreciation_schedule(self): depreciation_method = [d.depreciation_method for d in self.finance_books] @@ -110,8 +111,6 @@ class Asset(AccountsController): self.schedules = [] if not self.get("schedules") and self.available_for_use_date: - total_depreciations = sum([d.total_number_of_depreciations for d in self.get('finance_books')]) - for d in self.get('finance_books'): self.validate_asset_finance_books(d) @@ -124,74 +123,55 @@ class Asset(AccountsController): end_date = add_months(d.depreciation_start_date, no_of_depreciations * cint(d.frequency_of_depreciation)) - total_days = date_diff(end_date, self.available_for_use_date) - rate_per_day = (value_after_depreciation - d.get("expected_value_after_useful_life")) / total_days + if d.depreciation_method in ("Straight Line", "Manual"): + total_days = date_diff(end_date, self.available_for_use_date) + rate_per_day = (value_after_depreciation - d.get("expected_value_after_useful_life")) / total_days number_of_pending_depreciations = cint(d.total_number_of_depreciations) - \ cint(self.number_of_depreciations_booked) from_date = self.available_for_use_date if number_of_pending_depreciations: - next_depr_date = getdate(add_months(self.available_for_use_date, - number_of_pending_depreciations * 12)) - if (cint(frappe.db.get_value("Asset Settings", None, "schedule_based_on_fiscal_year")) == 1 - and getdate(d.depreciation_start_date) < next_depr_date): + period_start_date = add_months(d.depreciation_start_date, + cint(d.frequency_of_depreciation) * -1) - number_of_pending_depreciations += 1 - for n in range(number_of_pending_depreciations): - if n == list(range(number_of_pending_depreciations))[-1]: - schedule_date = add_months(self.available_for_use_date, n * 12) - previous_scheduled_date = add_months(d.depreciation_start_date, (n-1) * 12) - depreciation_amount = \ - self.get_depreciation_amount_prorata_temporis(value_after_depreciation, - d, previous_scheduled_date, schedule_date) + for n in range(number_of_pending_depreciations): + schedule_date = add_months(d.depreciation_start_date, + n * cint(d.frequency_of_depreciation)) - elif n == list(range(number_of_pending_depreciations))[0]: - schedule_date = d.depreciation_start_date - depreciation_amount = \ - self.get_depreciation_amount_prorata_temporis(value_after_depreciation, - d, self.available_for_use_date, schedule_date) + days = date_diff(schedule_date, from_date) - else: - schedule_date = add_months(d.depreciation_start_date, n * 12) - depreciation_amount = \ - self.get_depreciation_amount_prorata_temporis(value_after_depreciation, d) + if n == 0: days += 1 - if value_after_depreciation != 0: - value_after_depreciation -= flt(depreciation_amount) + if d.depreciation_method in ("Straight Line", "Manual"): + depreciation_amount = days * rate_per_day + else: + total_days = date_diff(schedule_date, period_start_date) + period_start_date = schedule_date + depreciation_amount = self.get_depreciation_amount(value_after_depreciation, + d.total_number_of_depreciations, d) - self.append("schedules", { - "schedule_date": schedule_date, - "depreciation_amount": depreciation_amount, - "depreciation_method": d.depreciation_method, - "finance_book": d.finance_book, - "finance_book_id": d.idx - }) - else: - for n in range(number_of_pending_depreciations): - schedule_date = add_months(d.depreciation_start_date, - n * cint(d.frequency_of_depreciation)) + depreciation_amount = flt((depreciation_amount * days) / total_days, + self.precision("gross_purchase_amount")) - if d.depreciation_method in ("Straight Line", "Manual"): - days = date_diff(schedule_date, from_date) - if n == 0: days += 1 + from_date = schedule_date - depreciation_amount = days * rate_per_day - from_date = schedule_date - else: - depreciation_amount = self.get_depreciation_amount(value_after_depreciation, - d.total_number_of_depreciations, d) + if depreciation_amount: + value_after_depreciation -= flt(depreciation_amount, + self.precision("gross_purchase_amount")) - if depreciation_amount: - value_after_depreciation -= flt(depreciation_amount) + if (n == cint(number_of_pending_depreciations) - 1 and + d.expected_value_after_useful_life and + value_after_depreciation > d.expected_value_after_useful_life): + depreciation_amount += (value_after_depreciation - d.expected_value_after_useful_life) - self.append("schedules", { - "schedule_date": schedule_date, - "depreciation_amount": depreciation_amount, - "depreciation_method": d.depreciation_method, - "finance_book": d.finance_book, - "finance_book_id": d.idx - }) + self.append("schedules", { + "schedule_date": schedule_date, + "depreciation_amount": depreciation_amount, + "depreciation_method": d.depreciation_method, + "finance_book": d.finance_book, + "finance_book_id": d.idx + }) def validate_asset_finance_books(self, row): if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount): @@ -261,16 +241,8 @@ class Asset(AccountsController): return flt(self.get('finance_books')[cint(idx)-1].value_after_depreciation) def get_depreciation_amount(self, depreciable_value, total_number_of_depreciations, row): - if row.depreciation_method in ["Straight Line", "Manual"]: - amt = (flt(self.gross_purchase_amount) - flt(row.expected_value_after_useful_life) - - flt(self.opening_accumulated_depreciation)) - - depreciation_amount = amt * row.rate_of_depreciation - else: - depreciation_amount = flt(depreciable_value) * (flt(row.rate_of_depreciation) / 100) - value_after_depreciation = flt(depreciable_value) - depreciation_amount - if value_after_depreciation < flt(row.expected_value_after_useful_life): - depreciation_amount = flt(depreciable_value) - flt(row.expected_value_after_useful_life) + precision = self.precision("gross_purchase_amount") + depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100), precision) return depreciation_amount @@ -301,9 +273,12 @@ class Asset(AccountsController): flt(accumulated_depreciation_after_full_schedule), self.precision('gross_purchase_amount')) - if row.expected_value_after_useful_life < asset_value_after_full_schedule: + if (row.expected_value_after_useful_life and + row.expected_value_after_useful_life < asset_value_after_full_schedule): frappe.throw(_("Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}") .format(row.idx, asset_value_after_full_schedule)) + elif not row.expected_value_after_useful_life: + row.expected_value_after_useful_life = asset_value_after_full_schedule def validate_cancellation(self): if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"): diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.json b/erpnext/assets/doctype/asset_settings/asset_settings.json index a3fee96f4e..edc5ce169c 100644 --- a/erpnext/assets/doctype/asset_settings/asset_settings.json +++ b/erpnext/assets/doctype/asset_settings/asset_settings.json @@ -46,75 +46,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "schedule_based_on_fiscal_year", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Calculate Prorated Depreciation Schedule Based on Fiscal Year", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "360", - "depends_on": "eval:doc.schedule_based_on_fiscal_year", - "description": "This value is used for pro-rata temporis calculation", - "fetch_if_empty": 0, - "fieldname": "number_of_days_in_fiscal_year", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Number of Days in Fiscal Year", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -159,7 +90,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2019-03-08 10:44:41.924547", + "modified": "2019-05-26 18:31:19.930563", "modified_by": "Administrator", "module": "Assets", "name": "Asset Settings", From 53f5e2e0664bf60e06a8c31601329106c6be3a05 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 28 May 2019 10:33:56 +0530 Subject: [PATCH 37/37] fixed test cases and the logic for pro rata calculation --- erpnext/assets/doctype/asset/asset.py | 146 +++++++++++---------- erpnext/assets/doctype/asset/test_asset.py | 137 +++++++++++-------- 2 files changed, 160 insertions(+), 123 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 6475d0c4aa..45d2ec2c51 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe, erpnext, math, json from frappe import _ from six import string_types -from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff +from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff, add_days from frappe.model.document import Document from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account from erpnext.assets.doctype.asset.depreciation \ @@ -105,73 +105,84 @@ class Asset(AccountsController): d.precision("rate_of_depreciation")) def make_depreciation_schedule(self): - depreciation_method = [d.depreciation_method for d in self.finance_books] - - if 'Manual' not in depreciation_method: + if 'Manual' not in [d.depreciation_method for d in self.finance_books]: self.schedules = [] - if not self.get("schedules") and self.available_for_use_date: - for d in self.get('finance_books'): - self.validate_asset_finance_books(d) + if self.get("schedules") or not self.available_for_use_date: + return - value_after_depreciation = (flt(self.gross_purchase_amount) - - flt(self.opening_accumulated_depreciation)) + for d in self.get('finance_books'): + self.validate_asset_finance_books(d) - d.value_after_depreciation = value_after_depreciation + value_after_depreciation = (flt(self.gross_purchase_amount) - + flt(self.opening_accumulated_depreciation)) - no_of_depreciations = cint(d.total_number_of_depreciations - 1) - cint(self.number_of_depreciations_booked) - end_date = add_months(d.depreciation_start_date, - no_of_depreciations * cint(d.frequency_of_depreciation)) + d.value_after_depreciation = value_after_depreciation - if d.depreciation_method in ("Straight Line", "Manual"): - total_days = date_diff(end_date, self.available_for_use_date) - rate_per_day = (value_after_depreciation - d.get("expected_value_after_useful_life")) / total_days + number_of_pending_depreciations = cint(d.total_number_of_depreciations) - \ + cint(self.number_of_depreciations_booked) - number_of_pending_depreciations = cint(d.total_number_of_depreciations) - \ - cint(self.number_of_depreciations_booked) + has_pro_rata = self.check_is_pro_rata(d) - from_date = self.available_for_use_date - if number_of_pending_depreciations: - period_start_date = add_months(d.depreciation_start_date, - cint(d.frequency_of_depreciation) * -1) + if has_pro_rata: + number_of_pending_depreciations += 1 - for n in range(number_of_pending_depreciations): - schedule_date = add_months(d.depreciation_start_date, - n * cint(d.frequency_of_depreciation)) + skip_row = False + for n in range(number_of_pending_depreciations): + # If depreciation is already completed (for double declining balance) + if skip_row: continue - days = date_diff(schedule_date, from_date) + depreciation_amount = self.get_depreciation_amount(value_after_depreciation, + d.total_number_of_depreciations, d) - if n == 0: days += 1 + if not has_pro_rata or n < cint(number_of_pending_depreciations) - 1: + schedule_date = add_months(d.depreciation_start_date, + n * cint(d.frequency_of_depreciation)) - if d.depreciation_method in ("Straight Line", "Manual"): - depreciation_amount = days * rate_per_day - else: - total_days = date_diff(schedule_date, period_start_date) - period_start_date = schedule_date - depreciation_amount = self.get_depreciation_amount(value_after_depreciation, - d.total_number_of_depreciations, d) + # For first row + if has_pro_rata and n==0: + depreciation_amount, days = get_pro_rata_amt(d, depreciation_amount, + self.available_for_use_date, d.depreciation_start_date) + # For last row + elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1: + to_date = add_months(self.available_for_use_date, + n * cint(d.frequency_of_depreciation)) - depreciation_amount = flt((depreciation_amount * days) / total_days, - self.precision("gross_purchase_amount")) + depreciation_amount, days = get_pro_rata_amt(d, + depreciation_amount, schedule_date, to_date) - from_date = schedule_date + schedule_date = add_days(schedule_date, days) - if depreciation_amount: - value_after_depreciation -= flt(depreciation_amount, - self.precision("gross_purchase_amount")) + if not depreciation_amount: continue + value_after_depreciation -= flt(depreciation_amount, + self.precision("gross_purchase_amount")) - if (n == cint(number_of_pending_depreciations) - 1 and - d.expected_value_after_useful_life and - value_after_depreciation > d.expected_value_after_useful_life): - depreciation_amount += (value_after_depreciation - d.expected_value_after_useful_life) + # Adjust depreciation amount in the last period based on the expected value after useful life + if d.expected_value_after_useful_life and ((n == cint(number_of_pending_depreciations) - 1 + and value_after_depreciation != d.expected_value_after_useful_life) + or value_after_depreciation < d.expected_value_after_useful_life): + depreciation_amount += (value_after_depreciation - d.expected_value_after_useful_life) + skip_row = True - self.append("schedules", { - "schedule_date": schedule_date, - "depreciation_amount": depreciation_amount, - "depreciation_method": d.depreciation_method, - "finance_book": d.finance_book, - "finance_book_id": d.idx - }) + if depreciation_amount > 0: + self.append("schedules", { + "schedule_date": schedule_date, + "depreciation_amount": depreciation_amount, + "depreciation_method": d.depreciation_method, + "finance_book": d.finance_book, + "finance_book_id": d.idx + }) + + def check_is_pro_rata(self, row): + has_pro_rata = False + + days = date_diff(row.depreciation_start_date, self.available_for_use_date) + 1 + total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation) + + if days < total_days: + has_pro_rata = True + + return has_pro_rata def validate_asset_finance_books(self, row): if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount): @@ -242,22 +253,13 @@ class Asset(AccountsController): def get_depreciation_amount(self, depreciable_value, total_number_of_depreciations, row): precision = self.precision("gross_purchase_amount") - depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100), precision) - - return depreciation_amount - - def get_depreciation_amount_prorata_temporis(self, depreciable_value, row, start_date=None, end_date=None): - if start_date and end_date: - prorata_temporis = min(abs(flt(date_diff(str(end_date), str(start_date)))) / flt(frappe.db.get_value("Asset Settings", None, "number_of_days_in_fiscal_year")), 1) - else: - prorata_temporis = 1 if row.depreciation_method in ("Straight Line", "Manual"): depreciation_amount = (flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)) / (cint(row.total_number_of_depreciations) - - cint(self.number_of_depreciations_booked)) * prorata_temporis + cint(self.number_of_depreciations_booked)) else: - depreciation_amount = self.get_depreciation_amount(depreciable_value, row.total_number_of_depreciations, row) + depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100), precision) return depreciation_amount @@ -387,15 +389,7 @@ class Asset(AccountsController): if isinstance(args, string_types): args = json.loads(args) - number_of_depreciations_booked = 0 - if self.is_existing_asset: - number_of_depreciations_booked = self.number_of_depreciations_booked - float_precision = cint(frappe.db.get_default("float_precision")) or 2 - tot_no_of_depreciation = flt(args.get("total_number_of_depreciations")) - flt(number_of_depreciations_booked) - - if args.get("depreciation_method") in ["Straight Line", "Manual"]: - return 1.0 / tot_no_of_depreciation if args.get("depreciation_method") == 'Double Declining Balance': return 200.0 / args.get("total_number_of_depreciations") @@ -575,3 +569,15 @@ def make_journal_entry(asset_name): def is_cwip_accounting_disabled(): return cint(frappe.db.get_single_value("Asset Settings", "disable_cwip_accounting")) + +def get_pro_rata_amt(row, depreciation_amount, from_date, to_date): + days = date_diff(to_date, from_date) + total_days = get_total_days(to_date, row.frequency_of_depreciation) + + return (depreciation_amount * flt(days)) / flt(total_days), days + +def get_total_days(date, frequency): + period_start_date = add_months(date, + cint(frequency) * -1) + + return date_diff(date, period_start_date) \ No newline at end of file diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index fceccfbd1c..481ee7d9f4 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -88,23 +88,23 @@ class TestAsset(unittest.TestCase): asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') asset = frappe.get_doc('Asset', asset_name) asset.calculate_depreciation = 1 - asset.available_for_use_date = '2020-06-06' - asset.purchase_date = '2020-06-06' + asset.available_for_use_date = '2030-01-01' + asset.purchase_date = '2030-01-01' asset.append("finance_books", { "expected_value_after_useful_life": 10000, - "next_depreciation_date": "2020-12-31", "depreciation_method": "Straight Line", "total_number_of_depreciations": 3, - "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-06-06" + "frequency_of_depreciation": 12, + "depreciation_start_date": "2030-12-31" }) asset.save() + self.assertEqual(asset.status, "Draft") expected_schedules = [ - ["2020-06-06", 147.54, 147.54], - ["2021-04-06", 44852.46, 45000.0], - ["2022-02-06", 45000.0, 90000.00] + ["2030-12-31", 30000.00, 30000.00], + ["2031-12-31", 30000.00, 60000.00], + ["2032-12-31", 30000.00, 90000.00] ] schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount] @@ -118,20 +118,21 @@ class TestAsset(unittest.TestCase): asset.calculate_depreciation = 1 asset.number_of_depreciations_booked = 1 asset.opening_accumulated_depreciation = 40000 + asset.available_for_use_date = "2030-06-06" asset.append("finance_books", { "expected_value_after_useful_life": 10000, - "next_depreciation_date": "2020-12-31", "depreciation_method": "Straight Line", "total_number_of_depreciations": 3, - "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-06-06" + "frequency_of_depreciation": 12, + "depreciation_start_date": "2030-12-31" }) asset.insert() self.assertEqual(asset.status, "Draft") asset.save() expected_schedules = [ - ["2020-06-06", 164.47, 40164.47], - ["2021-04-06", 49835.53, 90000.00] + ["2030-12-31", 14246.58, 54246.58], + ["2031-12-31", 25000.00, 79246.58], + ["2032-06-06", 10753.42, 90000.00] ] schedules = [[cstr(d.schedule_date), flt(d.depreciation_amount, 2), d.accumulated_depreciation_amount] for d in asset.get("schedules")] @@ -145,24 +146,23 @@ class TestAsset(unittest.TestCase): asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') asset = frappe.get_doc('Asset', asset_name) asset.calculate_depreciation = 1 - asset.available_for_use_date = '2020-06-06' - asset.purchase_date = '2020-06-06' + asset.available_for_use_date = '2030-01-01' + asset.purchase_date = '2030-01-01' asset.append("finance_books", { "expected_value_after_useful_life": 10000, - "next_depreciation_date": "2020-12-31", "depreciation_method": "Double Declining Balance", "total_number_of_depreciations": 3, - "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-06-06" + "frequency_of_depreciation": 12, + "depreciation_start_date": '2030-12-31' }) asset.insert() self.assertEqual(asset.status, "Draft") asset.save() expected_schedules = [ - ["2020-06-06", 66666.67, 66666.67], - ["2021-04-06", 22222.22, 88888.89], - ["2022-02-06", 1111.11, 90000.0] + ['2030-12-31', 66667.00, 66667.00], + ['2031-12-31', 22222.11, 88889.11], + ['2032-12-31', 1110.89, 90000.0] ] schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount] @@ -177,23 +177,21 @@ class TestAsset(unittest.TestCase): asset.is_existing_asset = 1 asset.number_of_depreciations_booked = 1 asset.opening_accumulated_depreciation = 50000 + asset.available_for_use_date = '2030-01-01' + asset.purchase_date = '2029-11-30' asset.append("finance_books", { "expected_value_after_useful_life": 10000, - "next_depreciation_date": "2020-12-31", "depreciation_method": "Double Declining Balance", "total_number_of_depreciations": 3, - "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-06-06" + "frequency_of_depreciation": 12, + "depreciation_start_date": "2030-12-31" }) asset.insert() self.assertEqual(asset.status, "Draft") - asset.save() - - asset.save() expected_schedules = [ - ["2020-06-06", 33333.33, 83333.33], - ["2021-04-06", 6666.67, 90000.0] + ["2030-12-31", 33333.50, 83333.50], + ["2031-12-31", 6666.50, 90000.0] ] schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount] @@ -209,25 +207,25 @@ class TestAsset(unittest.TestCase): asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') asset = frappe.get_doc('Asset', asset_name) asset.calculate_depreciation = 1 - asset.purchase_date = '2020-01-30' + asset.purchase_date = '2030-01-30' asset.is_existing_asset = 0 - asset.available_for_use_date = "2020-01-30" + asset.available_for_use_date = "2030-01-30" asset.append("finance_books", { "expected_value_after_useful_life": 10000, "depreciation_method": "Straight Line", "total_number_of_depreciations": 3, - "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-12-31" + "frequency_of_depreciation": 12, + "depreciation_start_date": "2030-12-31" }) asset.insert() asset.save() expected_schedules = [ - ["2020-12-31", 28000.0, 28000.0], - ["2021-12-31", 30000.0, 58000.0], - ["2022-12-31", 30000.0, 88000.0], - ["2023-01-30", 2000.0, 90000.0] + ["2030-12-31", 27534.25, 27534.25], + ["2031-12-31", 30000.0, 57534.25], + ["2032-12-31", 30000.0, 87534.25], + ["2033-01-30", 2465.75, 90000.0] ] schedules = [[cstr(d.schedule_date), flt(d.depreciation_amount, 2), flt(d.accumulated_depreciation_amount, 2)] @@ -266,8 +264,8 @@ class TestAsset(unittest.TestCase): self.assertEqual(asset.get("schedules")[0].journal_entry[:4], "DEPR") expected_gle = ( - ("_Test Accumulated Depreciations - _TC", 0.0, 32129.24), - ("_Test Depreciations - _TC", 32129.24, 0.0) + ("_Test Accumulated Depreciations - _TC", 0.0, 30000.0), + ("_Test Depreciations - _TC", 30000.0, 0.0) ) gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry` @@ -277,15 +275,15 @@ class TestAsset(unittest.TestCase): self.assertEqual(gle, expected_gle) self.assertEqual(asset.get("value_after_depreciation"), 0) - def test_depreciation_entry_for_wdv(self): + def test_depreciation_entry_for_wdv_without_pro_rata(self): pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=8000.0, location="Test Location") asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') asset = frappe.get_doc('Asset', asset_name) asset.calculate_depreciation = 1 - asset.available_for_use_date = '2030-06-06' - asset.purchase_date = '2030-06-06' + asset.available_for_use_date = '2030-01-01' + asset.purchase_date = '2030-01-01' asset.append("finance_books", { "expected_value_after_useful_life": 1000, "depreciation_method": "Written Down Value", @@ -298,9 +296,41 @@ class TestAsset(unittest.TestCase): self.assertEqual(asset.finance_books[0].rate_of_depreciation, 50.0) expected_schedules = [ - ["2030-12-31", 4000.0, 4000.0], - ["2031-12-31", 2000.0, 6000.0], - ["2032-12-31", 1000.0, 7000.0], + ["2030-12-31", 4000.00, 4000.00], + ["2031-12-31", 2000.00, 6000.00], + ["2032-12-31", 1000.00, 7000.0], + ] + + schedules = [[cstr(d.schedule_date), flt(d.depreciation_amount, 2), flt(d.accumulated_depreciation_amount, 2)] + for d in asset.get("schedules")] + + self.assertEqual(schedules, expected_schedules) + + def test_pro_rata_depreciation_entry_for_wdv(self): + pr = make_purchase_receipt(item_code="Macbook Pro", + qty=1, rate=8000.0, location="Test Location") + + asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') + asset = frappe.get_doc('Asset', asset_name) + asset.calculate_depreciation = 1 + asset.available_for_use_date = '2030-06-06' + asset.purchase_date = '2030-01-01' + asset.append("finance_books", { + "expected_value_after_useful_life": 1000, + "depreciation_method": "Written Down Value", + "total_number_of_depreciations": 3, + "frequency_of_depreciation": 12, + "depreciation_start_date": "2030-12-31" + }) + asset.save(ignore_permissions=True) + + self.assertEqual(asset.finance_books[0].rate_of_depreciation, 50.0) + + expected_schedules = [ + ["2030-12-31", 2279.45, 2279.45], + ["2031-12-31", 2860.28, 5139.73], + ["2032-12-31", 1430.14, 6569.87], + ["2033-06-06", 430.13, 7000.0], ] schedules = [[cstr(d.schedule_date), flt(d.depreciation_amount, 2), flt(d.accumulated_depreciation_amount, 2)] @@ -346,18 +376,19 @@ class TestAsset(unittest.TestCase): asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name') asset = frappe.get_doc('Asset', asset_name) asset.calculate_depreciation = 1 - asset.available_for_use_date = '2020-06-06' - asset.purchase_date = '2020-06-06' + asset.available_for_use_date = nowdate() + asset.purchase_date = nowdate() asset.append("finance_books", { "expected_value_after_useful_life": 10000, "depreciation_method": "Straight Line", "total_number_of_depreciations": 3, "frequency_of_depreciation": 10, - "depreciation_start_date": "2020-06-06" + "depreciation_start_date": nowdate() }) asset.insert() asset.submit() - post_depreciation_entries(date="2021-01-01") + + post_depreciation_entries(date=add_months(nowdate(), 10)) scrap_asset(asset.name) @@ -366,9 +397,9 @@ class TestAsset(unittest.TestCase): self.assertTrue(asset.journal_entry_for_scrap) expected_gle = ( - ("_Test Accumulated Depreciations - _TC", 147.54, 0.0), + ("_Test Accumulated Depreciations - _TC", 30000.0, 0.0), ("_Test Fixed Asset - _TC", 0.0, 100000.0), - ("_Test Gain/Loss on Asset Disposal - _TC", 99852.46, 0.0) + ("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0) ) gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry` @@ -412,9 +443,9 @@ class TestAsset(unittest.TestCase): self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold") expected_gle = ( - ("_Test Accumulated Depreciations - _TC", 23051.47, 0.0), + ("_Test Accumulated Depreciations - _TC", 20392.16, 0.0), ("_Test Fixed Asset - _TC", 0.0, 100000.0), - ("_Test Gain/Loss on Asset Disposal - _TC", 51948.53, 0.0), + ("_Test Gain/Loss on Asset Disposal - _TC", 54607.84, 0.0), ("Debtors - _TC", 25000.0, 0.0) )