nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-20 01:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,866 Commits 601 Branches 1,802 Tags
6ae9eb250f5a5578507c4e0a6ddd50d109b752cd
Commit Graph

2179 Commits

Author SHA1 Message Date
ruthra kumar
6ae9eb250f refactor: minor UI tweaks 
(cherry picked from commit 0455d0c46c)
 2024-03-20 14:13:19 +00:00
ruthra kumar
5e590389f3 refactor: exception propogation 
(cherry picked from commit 4a55240e63)
 2024-03-20 14:13:18 +00:00
ruthra kumar
1110dd93ff chore: code cleanup 
(cherry picked from commit eea260b9f9)
 2024-03-20 14:13:17 +00:00
ruthra kumar
0ea9ce7a5a refactor: better method naming 
(cherry picked from commit 30463657bf)
 2024-03-20 14:13:17 +00:00
ruthra kumar
cf6cb80d18 refactor: barebones hook on all doctypes with 'company' field 
(cherry picked from commit ec194ef076)
 2024-03-20 14:13:16 +00:00
ruthra kumar
e908003358 refactor: make sure only one task is running for doc 
(cherry picked from commit 78c9cc63b1)
 2024-03-20 14:13:16 +00:00
ruthra kumar
962105bc87 refactor: validations to prevent duplicate jobs 
(cherry picked from commit 31a2da552b)
 2024-03-20 14:13:15 +00:00
ruthra kumar
e600109872 refactor: no copy on summary table and more validations 
(cherry picked from commit 55e93b3fe1)
 2024-03-20 14:13:15 +00:00
ruthra kumar
97ed905627 refactor: reset all flags and remove unwanted code 
(cherry picked from commit 2dbe68a09d)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c38cfd14f3 chore: show correct status in list view 
(cherry picked from commit 1014940953)
 2024-03-20 14:13:14 +00:00
ruthra kumar
341e467056 refactor: validate status before running events 
(cherry picked from commit 86b5e2e277)
 2024-03-20 14:13:14 +00:00
ruthra kumar
833df2c76b refactor: make Excluded doctype table read only 
(cherry picked from commit 7c4cff2649)
 2024-03-20 14:13:13 +00:00
ruthra kumar
a303788c71 chore: remove unwanted UI code 
(cherry picked from commit b98a5e4edc)
 2024-03-20 14:13:13 +00:00
ruthra kumar
0d791f594f refactor: use separate child table for summary 
(cherry picked from commit 49d3bcbc8d)
 2024-03-20 14:13:13 +00:00
ruthra kumar
b1367e839c refactor: chained callback 
(cherry picked from commit b12ca65fcc)
 2024-03-20 14:13:12 +00:00
ruthra kumar
e56138ddb0 refactor: reorder flags in Tasks section 
(cherry picked from commit cccb2d5141)
 2024-03-20 14:13:12 +00:00
ruthra kumar
c9d77044b0 refactor: use flags to decide on current stage 
(cherry picked from commit 6a77d86a53)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.py
 2024-03-20 14:13:12 +00:00
ruthra kumar
5542985e25 refactor: UI trigger 
(cherry picked from commit 8944ab8b6a)
 2024-03-20 14:13:11 +00:00
ruthra kumar
52d22d8b55 refactor: tasks section and UI niceties 
(cherry picked from commit d0dc2c6e77)
 2024-03-20 14:13:11 +00:00
ruthra kumar
7280a76f73 refactor: set status and trigger job on submit 
(cherry picked from commit 6fbb67b1d2)
 2024-03-20 14:13:10 +00:00
ruthra kumar
07c98146c5 refactor: more options for 'status' and move it to top 
(cherry picked from commit 0d65d878de)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
 2024-03-20 14:13:10 +00:00
mergify[bot]
64f1844bc8 fix: Update Existing Price List Rate not working (backport #40333) (#40526) 
* fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/setup/demo_data/item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 18:11:50 +05:30
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
Nihantra C. Patel
411157c258 fix: load ignored doctype and include Mode of Payment Account (#40334) 
(cherry picked from commit 68baa3612a)
 2024-03-07 12:14:10 +00:00
mergify[bot]
035c90c3b8 fix(setup): avoid duplicate entry for Analytics role (backport #40183) (#40184) 
fix(setup): avoid duplicate entry for Analytics role (#40183)

(cherry picked from commit 29f91a7919)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-02-29 11:34:23 +05:30
Rohit Waghchaure
d6fad08d20 fix: Webpages not working without login 2024-02-22 16:24:30 +05:30
barredterra
f3d8d273f4 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:28:41 +00:00
barredterra
3180266150 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:28:40 +00:00
Raffael Meyer
080a742725 fix(Employee): treeview (#39126) 
(cherry picked from commit e912e9597d)
 2024-01-04 12:34:48 +00:00
Raffael Meyer
1773e31499 feat: new Report "Lost Quotations" (#38309) 
(cherry picked from commit 477d9fa87e)
 2023-11-24 21:27:50 +00:00
Gursheen Anand
b0aa4efd3d fix: fiscal year using future date 
(cherry picked from commit 728cc9f725)
 2023-11-24 09:51:29 +00:00
Gursheen Anand
7dce68bdcc fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000)

# Conflicts:
#	erpnext/accounts/utils.py
 2023-11-24 09:51:29 +00:00
mergify[bot]
bc01007c16 fix: remove ESS role when not mapped to employee (backport #37867) (#38132) 
fix: remove ESS role when not mapped to employee (#37867)

* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation

(cherry picked from commit 56b8d1b927)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-16 20:27:53 +05:30
mergify[bot]
8446e87cc2 chore: delete comments and unlink attachments on company transactions deletion (backport #38077) (#38078) 
* chore: delete comments and unlink attachments on company transactions deletion

(cherry picked from commit 2f9e96e324)

* fix: unrelated transation date typo

(cherry picked from commit b097bb20d9)

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-13 19:20:52 +05:30
mergify[bot]
0b1da08d78 fix: In-Transit Warehouse company filter (backport #37796) (#37797) 
fix: In-Transit Warehouse company filter (#37796)

(cherry picked from commit daf2ec063c)

Co-authored-by: hyaray <hyaray@vip.qq.com>
 2023-10-31 18:53:37 +05:30
Deepesh Garg
80774e2da1 fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#37660) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* fix: rearrange functions

* chore: rearrange functions

* chore: rearrange functions

* fix: Purchase Invoice GL entires for assets

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* chore: make `Reserve Stock` checkbox visible in SO

* refactor: rename field `Auto Reserve Stock for Sales Order`

* feat: add fields to hold SO and SO Item ref in PR Item

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* refactor: Remove expense included in valuation accounts

* chore: Add back default in transit warehousefield

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-25 09:12:27 +05:30
Ankush Menat
76ef61c24f fix: keep customer/supplier website role by default 
(cherry picked from commit d2096cfdb7)
 2023-10-16 12:01:17 +00:00
ruthra kumar
3b49079ad7 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-37359 2023-10-05 12:17:07 +05:30
Devin Slauenwhite
1ca0516fe5 feat: disable currency exchange api. (#33593) 
(cherry picked from commit 179a31ed5e)
 2023-10-05 04:03:15 +00:00
ruthra kumar
04b8527ba8 chore: refactor test case for exchangerate.host provider 
(cherry picked from commit c8e3dc6c4c)
 2023-10-05 03:50:28 +00:00
mergify[bot]
2b38b780ba fix(Employee): enable no_copy for relieving_date (backport #37344) (#37358) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Jignesh (GreyCube Technologies) <jignesh@greycube.in>
fix(Employee): enable `no_copy` for `relieving_date` (#37344)
 2023-10-04 14:29:45 +05:30
Deepesh Garg
24a4815250 chore: Update employee for tests 
(cherry picked from commit ae01d70b33)
 2023-09-06 11:02:18 +00:00
RitvikSardana
451cc7bc12 fix: added ignore_user_permissions to parent field of tree doctypes 
(cherry picked from commit de433d8626)
 2023-09-04 07:17:07 +00:00
Ankush Menat
8083c0b59e fix: move company rename to long queue 
(cherry picked from commit 5169006085)
 2023-08-10 10:03:22 +05:30
Ankush Menat
7adad4272a perf: defer holiday list imports 
Only used for configuring but loaded whenever
get_doc("holiday list", ...) is done

(cherry picked from commit 2eea90a873)
 2023-08-07 10:09:49 +05:30
mergify[bot]
f9981d1ff3 fix: use correct lang separator for frappe (backport #36519) (#36520) 
* fix: use correct lang separator for frappe

(cherry picked from commit 0218ca538f)

* perf: defer babel import

Only required when configuring but will get loaded everywhere

(cherry picked from commit f574ac11ea)

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-07 10:08:59 +05:30
barredterra
1a6be5e19b fix(Item Group): allow root deletion 
It was not possible to delete an empty, unused Item Group without any
children, if it was one of possibly multiple roots of the Item Group tree.
This fix allows deleting a root Item Group.

(cherry picked from commit fd2c272bed)
 2023-07-27 15:45:34 +00:00
barredterra
f07b87c5eb chore(Item Group): remove redundant autoname 
(cherry picked from commit 1691eee26e)
 2023-07-26 04:15:22 +00:00
mergify[bot]
b877fa60db fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults (#35960)

* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser

(cherry picked from commit 6270607c6d)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.py
#	erpnext/patches.txt
#	erpnext/public/js/utils.js

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-17 11:52:37 +05:30
mergify[bot]
94caf7f5a8 feat: add local holidays (#36116) 
* feat: add local holidays

(cherry picked from commit aa18b25a71)

* test(Holiday List): weekly off and local holidays

(cherry picked from commit fd23bd0434)

* feat(Holiday List): display localized country name

(cherry picked from commit 4888d75e72)

* fix: German translations of Holiday List

(cherry picked from commit 509061f05b)

# Conflicts:
#	erpnext/translations/de.csv

* fix(Holiday List): use current user's language

For consistency with "weekly off" descriptions

(cherry picked from commit 8271a39cdb)

* fix(Holiday List): allow empty value

(cherry picked from commit 8aff5a1dab)

* refactor(Holiday List): use autocomplete fieldtype

(cherry picked from commit dab9688410)

* chore: resolve merge conflicts

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-07-14 20:37:48 +05:30