nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 06:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,237 Commits 619 Branches 1,804 Tags
1ee14ac13509c8ba7d7b04d224f4eccb656a99e0
Commit Graph

2820 Commits

Author SHA1 Message Date
Shariq Ansari
7428df8778 fix: include erpnext in apps page 
(cherry picked from commit 1d52ef7afe)
 2024-08-22 06:57:25 +00:00
Parameshwari Palanisamy
b96361e837 refactor: update dialog_manager.js 
(cherry picked from commit 6d19aae423)
 2024-08-20 04:44:47 +00:00
creative-paramu
cd5994017c fix: bank reconcilation tool cost center company filter adding 
(cherry picked from commit 6e2ac09821)
 2024-08-20 04:44:47 +00:00
mergify[bot]
50b1fa5deb fix: currency changing while making PR from the PO (backport #42718) (#42721) 
fix: currency changing while making PR from the PO (#42718)

(cherry picked from commit 17ba0cff44)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-12 15:20:04 +05:30
ruthra kumar
7ed7c22469 fix: Maintain same rate on qty change on Quotation to Sales Order 
(cherry picked from commit 91ce9fce9b)
 2024-08-08 08:04:30 +00:00
mergify[bot]
59b9b7dc91 fix: do not update item price and last purchase rate for inter transf… (backport #42616) (#42633) 
fix: do not update item price and last purchase rate for inter transf… (#42616)

fix: do not update item price and last purchase rate for inter transfer transaction
(cherry picked from commit c8af544ef3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-06 08:19:59 +05:30
mergify[bot]
9321408154 fix: Discount and taxes in return document should follow the reference document (backport #41911) (#42574) 
fix: Discount and taxes in return document should follow the reference document (#41911)

* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue

(cherry picked from commit 281198456d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-08-01 15:45:18 +05:30
Nabin Hait
c3293d110c fix: resolved conflict (#42557) 2024-07-31 14:54:52 +05:30
mergify[bot]
7c8d13c51a fix: set currency on change of company considering customer default currency (backport #42405) (#42547) 
fix: set currency on change of company considering customer default currency (#42405)

(cherry picked from commit 4986f28a89)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-07-31 13:02:12 +05:30
mergify[bot]
5fa185d480 fix: price_list_currency not found error (backport #42534) (#42539) 
fix: price_list_currency not found error (#42534)

(cherry picked from commit 23fed831a0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-30 14:52:23 +05:30
mergify[bot]
ac2ef21896 fix: dynamic condition in the pricing rule not working (backport #42467) (#42495) 
fix: dynamic condition in the pricing rule not working (#42467)

(cherry picked from commit 0e817f42ef)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-27 10:41:07 +05:30
mergify[bot]
4866958a96 fix: actual qty in sales order (backport #42248) (#42256) 
fix: actual qty in sales order (#42248)

(cherry picked from commit 1186ee128c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-09 16:17:20 +05:30
ruthra kumar
93528631c3 fix: multiple free items on same Item Group 
(cherry picked from commit c4ae0d283f)
 2024-07-03 12:28:38 +00:00
mergify[bot]
68b318a94b fix: Wrong Delete Batch on Purchase Receipt (backport #42007) (#42012) 
fix: Wrong Delete Batch on Purchase Receipt (#42007)

(cherry picked from commit d50487ce53)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-24 17:04:13 +05:30
ruthra kumar
77f4199e2a fix: incorrect discount on other item 
When discount is applied on other item, don't update `discount_amount`
as the amount is calculated for current item

(cherry picked from commit 654764e398)
 2024-06-21 10:23:42 +00:00
barredterra
ddbf9317a1 Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41384 2024-06-20 14:27:08 +02:00
barredterra
24ee765e6a fix: only show user and date if available 
(cherry picked from commit 895aede590)
 2024-06-18 22:57:25 +00:00
mergify[bot]
ff8027b8eb Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41384 2024-06-17 17:46:28 +00:00
Rohit Waghchaure
c159e3b06f fix: duplicate rows fetching in RFQ 
(cherry picked from commit 555510c128)
 2024-06-17 07:36:59 +00:00
Nihantra C. Patel
5544309048 fix: calculate totals and taxes 
(cherry picked from commit a7ec0c1cec)
 2024-06-10 09:49:03 +00:00
Deepesh Garg
822bc581f3 fix: Do no apply pricing rule on qty change for mapped docs 
(cherry picked from commit 2b1242170c)
 2024-06-06 03:44:14 +00:00
mergify[bot]
95c0dc9b38 fix: incorrect batch selection while sales return (backport #41768) (#41772) 
fix: incorrect batch selection while sales return (#41768)

(cherry picked from commit cb6d8afa26)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-04 14:54:20 +05:30
mergify[bot]
24775db97e fix: batch selection issue (backport #41692) (#41693) 
fix: batch selection issue (#41692)

(cherry picked from commit 968120d0eb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-30 18:49:12 +05:30
mergify[bot]
09d112a061 perf: sales order UI render (backport #41591) (#41592) 
perf: sales order UI render (#41591)

(cherry picked from commit ad817cddad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-23 11:50:34 +05:30
ruthra kumar
52d5d7a4d3 fix: Filters in trend reports 2024-05-20 10:36:42 +05:30
mergify[bot]
7225347387 feat: enter serial range in Serial/Batch Selector (backport #41530) (#41534) 
feat: enter serial range in Serial/Batch Selector (#41530)

* feat: util for generating serial nos from range string

* feat: enter serial range in Serial/Batch Selector

(cherry picked from commit 7b9fd394b0)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-05-18 10:39:21 +05:30
barredterra
cef6d0d74d fix(Delivery Note): only show permitted actions 
(cherry picked from commit 418bdc1dcc)
 2024-05-13 13:43:05 +00:00
Rohit Waghchaure
7b7987363f fix: basic rate for SABB 
(cherry picked from commit 7fa94843aa)
 2024-04-26 07:21:46 +00:00
Nabin Hait
3b4575af3d fix: Missing args while fetching items from delivery note 
(cherry picked from commit bbe323fbb4)
 2024-04-23 04:55:06 +00:00
Rohit Waghchaure
c10c21157d fix: duplicate serial and batch bundle in stock entry and stock reco 
(cherry picked from commit 732b6e1417)
 2024-04-17 07:50:06 +00:00
Nabin Hait
5e9f31cf21 fix: Ignore permissions while fetching module settings properties 2024-04-11 11:23:19 +05:30
Deepesh Garg
6f3a70d35f Merge pull request #40697 from frappe/mergify/bp/version-15-hotfix/pr-40641 
chore: Reduce usage of cur_frm (#40641)
 2024-04-10 21:35:08 +05:30
Corentin Flr
9beaf65d19 fix: Don't call get_fiscal_year if setup is not done yet 
(cherry picked from commit c203fafb1b)
 2024-04-10 15:18:26 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
Rohit Waghchaure
2185a29555 fix: Show Stock Ageing Data filter not working in stock balance report 
(cherry picked from commit 621421bda2)

# Conflicts:
#	erpnext/stock/report/stock_ageing/stock_ageing.py
 2024-04-01 11:25:46 +00:00
Rohit Waghchaure
d2a6509950 fix: button to select serial / batch bundle in the subcontracting receipt 
(cherry picked from commit d73b1f3e6a)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
 2024-03-30 05:54:14 +00:00
Rohit Waghchaure
0b4b0874f4 chore: show item name in the validation message 
(cherry picked from commit d05412f96a)
 2024-03-29 06:06:54 +00:00
Rohit Waghchaure
8ca4f63572 chore: allow to override serial batch selector 
(cherry picked from commit 0d9d42ae61)
 2024-03-29 03:41:49 +00:00
Rohit Waghchaure
41b3a59aae fix: rate changed on changing of the qty 
(cherry picked from commit cd36a1051f)
 2024-03-27 08:07:18 +00:00
Deepesh Garg
c1b9ad2f3a chore: Reduce usage of cur_frm 
(cherry picked from commit e44809bcc9)
 2024-03-27 06:16:31 +00:00
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
Ankush Menat
501b09a170 fix: style for tax breakup 
(cherry picked from commit 967540da18)
 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
Rohit Waghchaure
d287ed5e47 fix: Cannot read properties of undefined (reading 'rate') 
(cherry picked from commit ac92a22914)
 2024-03-20 09:31:42 +00: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
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
Deepesh Garg
2512d4c7f2 chore: Remove custom party queries 
(cherry picked from commit c9623b6fd6)
 2024-03-16 14:34:36 +00:00
mergify[bot]
61d59b392a fix: serial and batch for internal transfer (backport #40467) (#40477) 
fix: serial and batch for internal transfer (#40467)

* fix: serial and batch for internal transfer

* chore: fix test cases

(cherry picked from commit 59222813af)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-15 18:19:56 +05:30
mergify[bot]
f932265218 fix: qc created for raw materials during manufacture entry (backport #40408) (#40413) 
fix: qc created for raw materials during manufacture entry (#40408)

(cherry picked from commit f8a1a7f515)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:29:11 +05:30