CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,285 Commits 421 Branches 1,718 Tags
6114241ff2545cbede7bf55ccfa5b68dba07955b
Commit Graph

43285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
6114241ff2 fix: key error in filter access 
(cherry picked from commit 4765f937ea)
 2022-10-29 05:40:16 +00:00
ruthra kumar
a03ec0afb3 feat: additional filters on Payment terms report 
Filter on Status and Due dates

(cherry picked from commit aadb6b1772)
 2022-10-29 05:40:15 +00:00
Deepesh Garg
db5d74b7dc Merge pull request #32748 from frappe/mergify/bp/version-14-hotfix/pr-32722 
fix: Reference due date field type in Journal Entry Accounts table (backport #32722)
 2022-10-29 11:00:01 +05:30
Deepesh Garg
ad6e0f3af7 Merge pull request #32746 from frappe/mergify/bp/version-14-hotfix/pr-32699 
fix: Curreny in SOA print for multi-currency party (backport #32699)
 2022-10-29 10:59:49 +05:30
Deepesh Garg
abcf30aaa3 Merge pull request #32745 from frappe/mergify/bp/version-14-hotfix/pr-32692 
fix: Clear invoice table post importing invoices (backport #32692)
 2022-10-29 10:59:35 +05:30
Deepesh Garg
cc9c876007 Merge pull request #32747 from frappe/mergify/bp/version-14-hotfix/pr-32718 
fix: Total Sales amount update in project via Sales Order (backport #32718)
 2022-10-29 10:59:10 +05:30
Sagar Sharma
199e77faef Merge pull request #32750 from frappe/mergify/bp/version-14-hotfix/pr-32662 
refactor: rewrite stock reports queries in qb (backport #32662)
 2022-10-28 22:48:03 +05:30
Sagar Sharma
98428f0bce refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB 
(cherry picked from commit 40bd121593)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
a4b99a34cb refactor: rewrite Product Bundle Balance Report queries in QB 
(cherry picked from commit cde785f1bb)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
c4587d8caa refactor: rewrite Stock Ledger Report queries in QB 
(cherry picked from commit feaa2dbba8)
 2022-10-28 15:36:01 +00:00
Deepesh Garg
faf25c0b95 fix: Reference due date field type in Journal Entry Accounts table 
(cherry picked from commit e7caa48e2f)
 2022-10-28 15:26:29 +00:00
Deepesh Garg
d742e6d56b fix: Total Sales amount update in project via Sales Order 
(cherry picked from commit 6063c4e3c0)
 2022-10-28 15:16:42 +00:00
Deepesh Garg
3f0b03c0a4 chore: Use account currency as fallback 
(cherry picked from commit a18a715bb4)
 2022-10-28 15:12:34 +00:00
Deepesh Garg
195500cb32 fix: Curreny in SOA print for multi-currency party 
(cherry picked from commit 49ee873655)
 2022-10-28 15:12:34 +00:00
Deepesh Garg
6eafff8694 fix: Clear invoice table post importing invoices 
(cherry picked from commit 267e7c3a90)
 2022-10-28 15:11:41 +00:00
Deepesh Garg
36f2b65401 Merge pull request #32739 from frappe/mergify/bp/version-14-hotfix/pr-32716 
fix: Company bank account filter in Bank Clearance (backport #32716)
 2022-10-28 17:19:49 +05:30
Sagar Sharma
f082c9e797 Merge pull request #32740 from frappe/mergify/bp/version-14-hotfix/pr-32738 
fix: Added Material Request Reference in Purchase Recipt Dashboard for Tracking (backport #32738)
 2022-10-28 16:06:44 +05:30
Vishal
0ab69c0e32 chore: minor linting issue fixed 
(cherry picked from commit e8c0157017)
 2022-10-28 08:54:44 +00:00
Vishal
de3996e411 chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking 
(cherry picked from commit a04c44fe34)
 2022-10-28 08:54:44 +00:00
Deepesh Garg
797512ca13 fix: Company bank account filter in Bank Clearance 
(cherry picked from commit f9f78c1086)
 2022-10-28 07:24:35 +00:00
Deepesh Garg
d39ec5ef5f Merge pull request #32737 from frappe/mergify/bp/version-14-hotfix/pr-32717 
fix: Add condition for discount section collapse (backport #32717)
 2022-10-28 11:55:37 +05:30
Deepesh Garg
2dae93c0a1 Merge pull request #32736 from frappe/mergify/bp/version-14-hotfix/pr-32724 
fix: Filter fixes in Accounts Payable report (backport #32724)
 2022-10-28 11:55:24 +05:30
Deepesh Garg
953f78d6a9 fix: Add condition for discount section collapse 
(cherry picked from commit 4cd65027c4)
 2022-10-28 05:55:06 +00:00
Deepesh Garg
29197dcd7f fix: Filter fixes in Accounts Payable report 
(cherry picked from commit a5a73ba857)
 2022-10-28 05:54:25 +00:00
rohitwaghchaure
753b2edebf Merge pull request #32698 from frappe/mergify/bp/version-14-hotfix/pr-32693 
fix: Search field not working for customer, supplier (backport #32693)
 2022-10-24 23:14:37 +05:30
Rohit Waghchaure
f50b485225 test: added test case to validate seachfields for customer, supplier 
(cherry picked from commit 5f84993bae)
 2022-10-24 11:42:16 +00:00
Rohit Waghchaure
fb1c30718b fix: searchfield not working for cuctsomer, supplier as per customize form 
(cherry picked from commit 46d148defd)
 2022-10-24 11:42:15 +00:00
Deepesh Garg
2705de084f Merge pull request #32689 from frappe/mergify/bp/version-14-hotfix/pr-32424 
feat: Repayment schedule types for term loans (backport #32424)
 2022-10-23 23:06:58 +05:30
Deepesh Garg
a0ace27f56 chore: resolve conflicts 2022-10-23 19:43:02 +05:30
Deepesh Garg
2348c42c79 chore: Update tests 
(cherry picked from commit e59b147a62)
 2022-10-23 14:08:36 +00:00
Deepesh Garg
1b3a0be0f1 chore: Add repayment date on option 
(cherry picked from commit ef0cb17faf)
 2022-10-23 14:08:35 +00:00
Deepesh Garg
b9bf5666bc chore: label post save 
(cherry picked from commit bf7a51791a)
 2022-10-23 14:08:34 +00:00
Deepesh Garg
25e87641b6 chore: Add patch to update repayment schedule type in loan documents 
(cherry picked from commit 679b5ed551)

# Conflicts:
#	erpnext/patches.txt
 2022-10-23 14:08:34 +00:00
Deepesh Garg
8550bbde27 chore: Update labels as per repayment type 
(cherry picked from commit 2ddee50f27)
 2022-10-23 14:08:32 +00:00
Deepesh Garg
7398cbdf12 chore: Remove print statements 
(cherry picked from commit 3466461eb3)
 2022-10-23 14:08:32 +00:00
Deepesh Garg
6ce32fd5a9 feat: Repayment schedule types for term loans 
(cherry picked from commit 76c6ccab5d)
 2022-10-23 14:08:32 +00:00
Deepesh Garg
18904456f3 Merge pull request #32686 from frappe/mergify/bp/version-14-hotfix/pr-32650 
fix: unset contact details (backport #32650)
 2022-10-23 18:32:04 +05:30
barredterra
d7a65b1d41 fix: unset contact details 
(cherry picked from commit 23f0bb45b0)
 2022-10-23 12:51:49 +00:00
ruthra kumar
eb6db59adf Merge pull request #32679 from frappe/mergify/bp/version-14-hotfix/pr-32635 
fix: Integrity Error on PLE while submitting sales invoice (backport #32635)
 2022-10-21 12:05:46 +05:30
ruthra kumar
fb2b2edf7e Merge pull request #32678 from frappe/mergify/bp/version-14-hotfix/pr-32651 
feat: Payment Ledger report (backport #32651)
 2022-10-21 11:56:09 +05:30
ruthra kumar
c2f8f64d1e test: use payable account in tax and to trigger party validation 
(cherry picked from commit 8f42e7f703)
 2022-10-21 06:07:09 +00:00
ruthra kumar
9a5e238702 fix: party type and party mandatory on updating outstanding 
(cherry picked from commit 43b80683eb)
 2022-10-21 06:07:09 +00:00
ruthra kumar
77f4c666ee test: invoice outstandings and payments 
(cherry picked from commit 6e55b419a6)
 2022-10-21 05:56:17 +00:00
ruthra kumar
5cb9f7b3a4 feat: Basic Payment Ledger report 
(cherry picked from commit 8f60f0a0cf)
 2022-10-21 05:56:17 +00:00
Ankush Menat
e1fc67c730 chore: disable coverage reporting on stable branches 2022-10-20 19:15:50 +05:30
Deepesh Garg
99d410ab75 Merge pull request #32673 from frappe/mergify/bp/version-14-hotfix/pr-32551 
fix: number of months subscription plan (backport #32551)
 2022-10-20 19:06:54 +05:30
Deepesh Garg
54de569251 Merge pull request #32655 from frappe/mergify/bp/version-14-hotfix/pr-32641 
fix: allow to create Sales Order from expired Quotation (backport #32641)
 2022-10-20 17:34:04 +05:30
Deepesh Garg
cab3f39f95 chore: Linting issues 
(cherry picked from commit 1ca472cc8a)
 2022-10-20 11:55:04 +00:00
codezart
fff9e76718 fix: number of months subscription plan 
(cherry picked from commit 2d30b36cca)
 2022-10-20 11:55:04 +00:00
Deepesh Garg
dbbebd2a73 Merge pull request #32663 from frappe/mergify/bp/version-14-hotfix/pr-32659 
fix: Billing Address for inter-company purchase docs (backport #32659)
 2022-10-20 17:21:24 +05:30