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

43272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
rohitwaghchaure
9bf101a234 Merge pull request #32669 from frappe/mergify/bp/version-14-hotfix/pr-32667 
fix: BOM cost update message (backport #32667)
 2022-10-20 16:53:09 +05:30
Ankush Menat
887690449d fix: dont update item info twice 
[skip ci]
 2022-10-20 16:19:40 +05:30
mergify[bot]
3300856fb4 perf: cache barcode scan result (backport #32629) (#32672) 
perf: cache barcode scan result (#32629)

* perf: cache barcode scan result

* feat: BarcodeScanResult type

* fix: use safe `get_value` `set_value`

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit b88e850d55)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2022-10-20 15:57:21 +05:30
Rohit Waghchaure
e539579fb4 fix: BOM cost update message 
(cherry picked from commit 9cfe527492)
 2022-10-20 09:08:31 +00:00
Deepesh Garg
f8934faa73 fix: Billing Address for inter-company purchase docs 
(cherry picked from commit 796f2d3c09)
 2022-10-20 06:29:32 +00:00
rohitwaghchaure
2c9845f8cb Merge pull request #32660 from frappe/mergify/bp/version-14-hotfix/pr-32654 
fix: incorrect qty in material request created from PP (backport #32654)
 2022-10-20 11:58:57 +05:30
Rohit Waghchaure
92b9d3dc6d test: validate qty and purchase uom in material request which is created from PP 
(cherry picked from commit 4d5ef721f7)
 2022-10-20 04:30:08 +00:00
Rohit Waghchaure
da538a37ad fix: incorrect qty in material request 
(cherry picked from commit ad278b2007)
 2022-10-20 04:30:08 +00:00
rohitwaghchaure
d6bf85f8bb Merge pull request #32652 from frappe/mergify/bp/version-14-hotfix/pr-32645 
fix: overlap error not raised for job card in case of workstation with production capacity (backport #32645)
 2022-10-20 09:58:25 +05:30
mergify[bot]
c3024af296 feat(report):added account wise redirection (backport #32529) (#32657) 
feat(report): added account wise redirection

* feat(report):added account wise redirection

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit c52b41d311)

Co-authored-by: FinByz Tech Pvt. Ltd <info@finbyz.tech>
 2022-10-20 09:39:11 +05:30
Raffael Meyer
ccc58f48e3 fix: allow to create Sales Order from expired Quotation (#32641) 
(cherry picked from commit 4ad3002861)
 2022-10-19 16:37:53 +00:00
Rohit Waghchaure
ed2a093e49 fix: overlap error not raised for job card in case of workstation with production capacity 
(cherry picked from commit 8b2165e0d1)
 2022-10-19 11:35:38 +00:00
mergify[bot]
8a88105aed fix: Advance paid amount in orders (backport #32642) (#32648) 
fix: Advance paid amount in orders (#32642)

(cherry picked from commit 430492152f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-10-19 15:41:57 +05:30