nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,430 Commits 399 Branches 1,700 Tags
cc97d4e8691bdc4bd2ee7089bdfc4f8cf2fe477e
Commit Graph

47430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
cc97d4e869 Merge pull request #42651 from frappe/mergify/bp/version-14-hotfix/pr-40865 
fix: missing def expense if no exp in first month (backport #40865)
 2024-08-08 14:37:39 +05:30
ruthra kumar
eb26610d54 Merge pull request #42677 from frappe/mergify/bp/version-14-hotfix/pr-42673 
fix: Maintain same rate on qty change on Quotation to Sales Order (backport #42673)
 2024-08-08 13:37:48 +05:30
ruthra kumar
29449cbaf9 fix: Maintain same rate on qty change on Quotation to Sales Order 
(cherry picked from commit 91ce9fce9b)
 2024-08-08 08:03:37 +00:00
Shariq Ansari
f29cad695a Merge pull request #42667 from frappe/mergify/bp/version-14-hotfix/pr-42596 
fix: changes in opportunity.py to show contacts and addresses created from opportunity (backport #42596)
 2024-08-08 11:39:47 +05:30
Dietmar Fischer
8f19832aa5 fix: pre-commit for better code formatting 
(cherry picked from commit 511a0b9f37)
 2024-08-07 14:29:48 +00:00
Dietmar Fischer
8d7e150afb feat: changes in opportunity.py to show contacts and addresses from referenced and opportunities 
(cherry picked from commit 61576ca030)
 2024-08-07 14:29:48 +00:00
ruthra kumar
4a77653e94 Merge pull request #42660 from frappe/mergify/bp/version-14-hotfix/pr-42578 
fix: dimensions in common party journal entry (backport #42578)
 2024-08-07 16:23:45 +05:30
ruthra kumar
fa74efc1fc test: dimension inheritance on Exc Gain/Loss JV on Common party 
(cherry picked from commit 8040544216)
 2024-08-07 10:33:23 +00:00
ljain112
b73df8f5f0 fix: dimensions in common party journal entry 
(cherry picked from commit ac629ede79)
 2024-08-07 10:33:22 +00:00
Khushi Rawat
f4811c3846 Merge pull request #42629 from khushi8112/depreciation-adjustment-issue-when-field-for-income-tax-enabled 
fix: depreciation calculation as per income tax act
 2024-08-06 19:15:03 +05:30
Dany Robert
a9fa9e86ea fix: expense causing p&l test case to fail 
(cherry picked from commit 01888c98bc)
 2024-08-06 11:01:41 +00:00
Dany Robert
c67be05280 chore: semgrep 
(cherry picked from commit 581af4eced)
 2024-08-06 11:01:41 +00:00
Dany Robert
186701b54f fix: test case for zero deferred expense 
(cherry picked from commit 7ef4dbcaf6)
 2024-08-06 11:01:41 +00:00
Dany Robert
7cd6debd0e fix: missing def expense if no exp in first month 
(cherry picked from commit 5c9ce575f6)
 2024-08-06 11:01:41 +00:00
Nihantra C. Patel
f8fd354d75 Merge pull request #42650 from Nihantra-Patel/fix_item_sales_purchase_register 
fix: item_code filter in item-wise sales-purchase register v14
 2024-08-06 16:19:16 +05:30
Nihantra Patel
bc9b46126b fix: filter condition in item-wise purchase register 2024-08-06 15:56:00 +05:30
Nihantra Patel
f0f8a2f01b fix: item_code filter in item-wise sales register 2024-08-06 15:54:05 +05:30
mergify[bot]
83928bbf78 feat: expiry date column in Available Batch Report (backport #42628) (#42641) 
* feat: expiry date column in Available Batch Report (#42628)

(cherry picked from commit faff84c6e5)

# Conflicts:
#	erpnext/stock/report/available_batch_report/available_batch_report.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-06 15:24:37 +05:30
ruthra kumar
bc50512c97 Merge pull request #42645 from frappe/mergify/bp/version-14-hotfix/pr-42592 
fix: company filter for filtring tax withheld vouchers (backport #42592)
 2024-08-06 13:39:17 +05:30
ljain112
b7731c8fd7 fix: company filter for filtring tax withheld vouchers 
(cherry picked from commit cfe2ae604b)
 2024-08-06 07:47:21 +00:00
ruthra kumar
8667bcd86b Merge pull request #42643 from frappe/mergify/bp/version-14-hotfix/pr-42545 
fix: min height for rows in sales funnel (backport #42545)
 2024-08-06 13:09:39 +05:30
ljain112
7086a96462 fix: min height for rows in sales funnel 
(cherry picked from commit fd71d8af52)
 2024-08-06 07:33:07 +00:00
ruthra kumar
2a38e14cca Merge pull request #42637 from frappe/mergify/bp/version-14-hotfix/pr-42636 
refactor: posting date should not be considered for ignore filters in GL (backport #42636)
 2024-08-06 11:43:54 +05:30
ruthra kumar
f4ba879203 refactor: posting date is not considered for ignore filters in GL 
(cherry picked from commit c930f8ba9d)
 2024-08-06 05:26:26 +00:00
mergify[bot]
5c5349ed16 fix: do not update item price and last purchase rate for inter transf… (backport #42616) (#42632) 
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:46 +05:30
Khushi Rawat
8df1079618 fix: fixed depreciation calculation as per income tax act 2024-08-05 18:04:06 +05:30
Khushi Rawat
38739bec45 Merge pull request #42630 from khushi8112/fix-semgrep 
ci: fix semgrep version in linters
 2024-08-05 18:01:50 +05:30
Khushi Rawat
6ceb3476a6 ci: fix semgrep version in linters 2024-08-05 17:37:29 +05:30
ruthra kumar
6cba69c7da Merge pull request #42625 from frappe/mergify/bp/version-14-hotfix/pr-42555 
refactor: date filters should be mandatory in Sales Pipeline Analytics report (backport #42555)
 2024-08-05 15:32:28 +05:30
ruthra kumar
ffd3aea07e refactor(test): use test fixture and supply from and to dates 
(cherry picked from commit 4253caf910)
 2024-08-05 09:39:27 +00:00
ruthra kumar
989ef52f59 refactor: consider empty-string as Not Assigned 
(cherry picked from commit 213b2ba942)
 2024-08-05 09:39:27 +00:00
ruthra kumar
baa36c6d5e refactor: report columns should be based on from and to dates 
(cherry picked from commit 751a25c4b7)
 2024-08-05 09:39:27 +00:00
ruthra kumar
f7f191fe50 refactor: make 'from_date' and 'to_date' mandatory 
(cherry picked from commit 3617b41b95)
 2024-08-05 09:39:27 +00:00
ruthra kumar
703f58ceac refactor: date filters should be explicit 
(cherry picked from commit 40c166a0a0)
 2024-08-05 09:39:27 +00:00
ruthra kumar
e1da019fe7 Merge pull request #42613 from frappe/mergify/bp/version-14-hotfix/pr-42597 
refactor: filter to ignore system generated cr / dr reconciliation journals on general ledger (backport #42597)
 2024-08-05 13:20:25 +05:30
ruthra kumar
f0bdc41a94 refactor(test): clear old records 2024-08-05 12:58:21 +05:30
ruthra kumar
392ba36dcf refactor(test): filter and reconcile concerned vouchers 
(cherry picked from commit 9ade269b7a)
 2024-08-05 05:43:50 +00:00
ruthra kumar
1b6539c3c5 test: clear old data 
(cherry picked from commit 991069bfbc)
 2024-08-05 05:43:50 +00:00
ruthra kumar
1da744dc4d refactor: make use of date filters on ignore filterss 
(cherry picked from commit 03f3ab522f)
 2024-08-05 05:43:50 +00:00
ruthra kumar
ac763f8c19 test: ignore filter for system generated cr / dr note journals 
(cherry picked from commit 3ffac73598)
 2024-08-05 05:43:50 +00:00
ruthra kumar
0a83c8b00c refactor: ignore system generated cr / dr notes on general ledger 
(cherry picked from commit bb8c9b5a58)
 2024-08-05 05:43:50 +00:00
ruthra kumar
b20b15af74 refactor: ignore filter in general ledger for cr / dr notes 
(cherry picked from commit 59d5beee20)
 2024-08-05 05:43:50 +00:00
mergify[bot]
3fb6f97f66 fix: slowness in reposting dependent vouchers. (backport #42282) (#42569) 
fix: slowness in reposting dependent vouchers. (#42282)

(cherry picked from commit b17696a8ae)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-01 13:21:37 +05:30
ruthra kumar
35f6657bae Merge pull request #42565 from frappe/mergify/bp/version-14-hotfix/pr-42563 
fix: set query filters for sales / purchase tax template on PE (backport #42563)
 2024-07-31 17:28:45 +05:30
ruthra kumar
e82c441326 chore: resolve conflict 2024-07-31 17:14:26 +05:30
ruthra kumar
c8d85364b9 fix: set query filters for sales / purchase tax template on PE 
(cherry picked from commit 9fe47ac101)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
 2024-07-31 11:39:09 +00:00
ruthra kumar
64234a571e Merge pull request #42559 from frappe/mergify/bp/version-14-hotfix/pr-42558 
fix: 'undefined' in PL and BS report summary on Consolidated report (backport #42558)
 2024-07-31 16:19:17 +05:30
ruthra kumar
a5e14324da fix: 'undefined' in PL and BS report summary on Consolidated report 
(cherry picked from commit dd5a5e4919)
 2024-07-31 10:03:56 +00:00
mergify[bot]
53034c332b fix: dynamic condition in the pricing rule not working (backport #42467) (#42543) 
fix: dynamic condition in the pricing rule not working (#42467)

(cherry picked from commit 0e817f42ef)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-30 17:01:24 +05:30
mergify[bot]
0441984405 fix: warehouse filter in Product Bundle Balance (backport #42532) (#42536) 
fix: warehouse filter in Product Bundle Balance (#42532)

(cherry picked from commit 0ecfa709d8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-30 14:53:31 +05:30