nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,012 Commits 404 Branches 1,700 Tags
fa95bd331ad6d99be10aee5909e23af0da88fb95
Commit Graph

48012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
fa95bd331a Merge pull request #40564 from frappe/mergify/bp/version-15-hotfix/pr-40545 
fix: translatability of bom configurator labels (backport #40545)
 2024-03-21 01:58:16 +05:30
ruthra kumar
5194b87dc4 Merge pull request #40575 from frappe/mergify/bp/version-15-hotfix/pr-39717 
refactor: Transaction Deletion record for large volumes (backport #39717)
 2024-03-20 20:40:27 +05:30
Gursheen Kaur Anand
36c6820096 Merge pull request #40570 from frappe/mergify/bp/version-15-hotfix/pr-40563 
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
 2024-03-20 20:27:03 +05:30
Gursheen Kaur Anand
9c204b7106 chore: resolve conflicts 2024-03-20 20:04:44 +05:30
Gursheen Kaur Anand
8e5d481cba chore: resolve conflicts 2024-03-20 20:03:03 +05:30
ruthra kumar
e7d2451f60 chore: fix linting issue in JS 
(cherry picked from commit 02c522b7cd)
 2024-03-20 14:13:21 +00:00
ruthra kumar
5bbccf1fbd refactor(test): test cases modified to handle new approach 
(cherry picked from commit 81309576b0)
 2024-03-20 14:13:21 +00:00
ruthra kumar
40574f0d72 refactor: ability to process in single transaction 
(cherry picked from commit a158b825d7)
 2024-03-20 14:13:20 +00:00
ruthra kumar
1104deb58e refactor: link running doc validation to company master 
(cherry picked from commit 5a3afea8c7)
 2024-03-20 14:13:20 +00:00
ruthra kumar
29804f6a41 chore: rename entry point 
(cherry picked from commit 5fe0b20be1)
 2024-03-20 14:13:20 +00:00
ruthra kumar
ae6260f717 chore: move status and error log to their own section 
(cherry picked from commit 3cec62d4f8)
 2024-03-20 14:13:19 +00:00
ruthra kumar
aceee829d2 refactor: minor UI tweaks 
(cherry picked from commit 0455d0c46c)
 2024-03-20 14:13:19 +00:00
ruthra kumar
02c3303fee refactor: exception propogation 
(cherry picked from commit 4a55240e63)
 2024-03-20 14:13:18 +00:00
ruthra kumar
3f45f63ff8 chore: code cleanup 
(cherry picked from commit eea260b9f9)
 2024-03-20 14:13:17 +00:00
ruthra kumar
3de53999ce refactor: better method naming 
(cherry picked from commit 30463657bf)
 2024-03-20 14:13:17 +00:00
ruthra kumar
b31e43e3db refactor: barebones hook on all doctypes with 'company' field 
(cherry picked from commit ec194ef076)
 2024-03-20 14:13:16 +00:00
ruthra kumar
d4c2e6c77d 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
049c54bb32 chore: hide docfield in list view 
(cherry picked from commit 98afb4d468)
 2024-03-20 14:13:15 +00:00
ruthra kumar
d35bef12b6 refactor: validations to prevent duplicate jobs 
(cherry picked from commit 31a2da552b)
 2024-03-20 14:13:15 +00:00
ruthra kumar
90ad3d3176 refactor: no copy on summary table and more validations 
(cherry picked from commit 55e93b3fe1)
 2024-03-20 14:13:15 +00:00
ruthra kumar
db9cc5350d refactor: reset all flags and remove unwanted code 
(cherry picked from commit 2dbe68a09d)
 2024-03-20 14:13:15 +00:00
ruthra kumar
f67c447402 chore: show correct status in list view 
(cherry picked from commit 1014940953)
 2024-03-20 14:13:14 +00:00
ruthra kumar
cbaee05740 refactor: validate status before running events 
(cherry picked from commit 86b5e2e277)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c827be4345 refactor: make Excluded doctype table read only 
(cherry picked from commit 7c4cff2649)
 2024-03-20 14:13:14 +00:00
ruthra kumar
efebec3f95 chore: remove unwanted UI code 
(cherry picked from commit b98a5e4edc)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c3dd68ecc3 refactor: use separate child table for summary 
(cherry picked from commit 49d3bcbc8d)
 2024-03-20 14:13:13 +00:00
ruthra kumar
2bb1bfc4a0 refactor: chained callback 
(cherry picked from commit b12ca65fcc)
 2024-03-20 14:13:13 +00:00
ruthra kumar
195bffdf44 refactor: reorder flags in Tasks section 
(cherry picked from commit cccb2d5141)
 2024-03-20 14:13:13 +00:00
ruthra kumar
17ed1bb12c refactor: use flags to decide on current stage 
(cherry picked from commit 6a77d86a53)
 2024-03-20 14:13:13 +00:00
ruthra kumar
f9321767a6 refactor: UI trigger 
(cherry picked from commit 8944ab8b6a)
 2024-03-20 14:13:13 +00:00
ruthra kumar
9c5108e492 refactor: tasks section and UI niceties 
(cherry picked from commit d0dc2c6e77)
 2024-03-20 14:13:12 +00:00
ruthra kumar
529abd619a refactor: set status and trigger job on submit 
(cherry picked from commit 6fbb67b1d2)
 2024-03-20 14:13:12 +00:00
ruthra kumar
03fc3cec70 refactor: more options for 'status' and move it to top 
(cherry picked from commit 0d65d878de)
 2024-03-20 14:13:11 +00:00
Ankush Menat
501b09a170 fix: style for tax breakup 
(cherry picked from commit 967540da18)
 2024-03-20 13:06:45 +00:00
Gursheen Anand
a95bb27c65 fix: use Text Editor for rendering tax breakup table 
(cherry picked from commit 1c63983873)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2024-03-20 13:06:45 +00:00
barredterra
cf49cec203 fix: translatability of bom configurator labels 
(cherry picked from commit 4cfe99d74f)
 2024-03-20 10:50:39 +00:00
rohitwaghchaure
bc5654b900 Merge pull request #40562 from frappe/mergify/bp/version-15-hotfix/pr-40561 
fix: Cannot read properties of undefined (reading 'rate') (backport #40561)
 2024-03-20 16:17:08 +05:30
Rohit Waghchaure
d287ed5e47 fix: Cannot read properties of undefined (reading 'rate') 
(cherry picked from commit ac92a22914)
 2024-03-20 09:31:42 +00:00
rohitwaghchaure
f881d23c05 Merge pull request #40560 from frappe/mergify/bp/version-15-hotfix/pr-40559 
fix: pick list not picked materials having required qty less than 1 (backport #40559)
 2024-03-20 14:16:44 +05:30
Rohit Waghchaure
5310ec38ca fix: pick list not picked qty less than 1 
(cherry picked from commit 1a9ae33110)
 2024-03-20 08:23:08 +00:00
mergify[bot]
1c90797879 fix: currency symbol for Landed Cost Voucher Amount (backport #40550) (#40554) 
fix: currency symbol for Landed Cost Voucher Amount (#40550)

(cherry picked from commit 0725707cb1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 20:42:57 +05:30
Raffael Meyer
ba9f9bff19 Merge pull request #40548 from frappe/mergify/bp/version-15-hotfix/pr-40546 
fix(Supplier Quotation Comparison): group by options (backport #40546)
 2024-03-19 13:07:25 +01:00
barredterra
1e16d2ca25 fix(Supplier Quotation Comparison): group by options 
(cherry picked from commit 87e36d290e)
 2024-03-19 11:51:36 +00:00
Raffael Meyer
745e653339 Merge pull request #40544 from frappe/mergify/bp/version-15-hotfix/pr-40542 2024-03-19 12:49:32 +01:00
barredterra
f0e00daa1c refactor: usage of in_list 
(cherry picked from commit d238751e6b)
 2024-03-19 11:13:02 +00:00
mergify[bot]
0bdda1226f fix: rate changing while making PR (negative discount) (backport #40539) (#40540) 
fix: rate changing while making PR (negative discount) (#40539)

(cherry picked from commit 8136954484)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 15:37:37 +05:30
rohitwaghchaure
05436dfcac Merge branch 'version-15' into version-15-hotfix 2024-03-19 15:28:47 +05:30
mergify[bot]
7f1f7809c8 fix: stock reco negative batch (backport #40533) (#40535) 
fix: stock reco negative batch (#40533)

(cherry picked from commit a64c2ecf39)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 15:18:50 +05:30
mergify[bot]
44bbf4b983 fix: Update Existing Price List Rate not working (backport #40333) (#40527) 
fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 14:26:41 +05:30
Gursheen Kaur Anand
0ddb310dd4 Merge pull request #40531 from frappe/mergify/bp/version-15-hotfix/pr-40528 
fix(minor): missing range for ageing summary in PSOA (backport #40528)
 2024-03-19 12:44:04 +05:30