CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 06:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,775 Commits 410 Branches 1,717 Tags
feffc3af27ef91a2f9742abfc9a986f4077cfe91
Commit Graph

40775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
feffc3af27 Merge pull request #31627 from frappe/mergify/bp/version-13-hotfix/pr-31515 
fix: LCV updates wrong future qty/Bin qty (backport #31515)
 2022-07-19 14:21:33 +05:30
marination
ca9c6e1651 test: LCV impact on future stock balancees 
(cherry picked from commit de9ea70ce3)
 2022-07-19 08:10:22 +00:00
marination
f0ecdbef5a fix: LCV updates wrong future qty/Bin qty 
- As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated
- This just doubly shifts all future qty which is then fixed by a repost
- Until the repost balance values are wrong
- Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin

(cherry picked from commit 7a5fd71a6c)
 2022-07-19 08:10:21 +00:00
Marica
31930a16fa Merge pull request #31624 from marination/sub-contract-amount 
fix: Set `amount` in Raw Supplied Items table
 2022-07-19 12:55:20 +05:30
Deepesh Garg
4f55fef782 Merge pull request #31623 from frappe/mergify/bp/version-13-hotfix/pr-31599 
fix: Supplier details in TDS monthly report (backport #31599)
 2022-07-19 12:20:29 +05:30
marination
72e8c02ae0 fix: Set Amount in Supplied Item table 2022-07-19 11:47:25 +05:30
Deepesh Garg
f02596242c Merge pull request #31609 from deepeshgarg007/gstr_3b_gst_category 
fix(India): Inward supplies from Composition Supplier in GST 3B report
 2022-07-19 10:23:44 +05:30
Deepesh Garg
431d79f516 fix: Supplier details in TDS monthly report (#31599) 
(cherry picked from commit a6ff4db2ec)
 2022-07-19 04:45:28 +00:00
mergify[bot]
12d3d6ab49 fix: added Section translation in German for Salary Slip (backport #31608) (#31616) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-18 13:41:42 +05:30
Rucha Mahabal
26497f9c0e Merge pull request #31614 from ruchamahabal/fix-claim-payment 
fix: Tax amount not considered in Expense Claim Journal Entry
 2022-07-18 13:24:12 +05:30
Rucha Mahabal
6a7549d4b2 test: Journal Entry against Expense Claim 2022-07-18 12:57:50 +05:30
Rucha Mahabal
90c751f648 fix: Tax amount not considered in Expense Claim Journal Entry 
- add a helper function `get_outstanding_amount_for_claim` for uniformity in usages
 2022-07-18 12:39:09 +05:30
Deepesh Garg
144057f7e3 Merge pull request #31583 from maharshivpatel/fix-e_invoice-cn-dn-qty-0-error 
fix: (india) (e-invoice) CN / DN with 0 qty and discount issues
 2022-07-18 09:09:19 +05:30
Maharshi Patel
9631ffd215 fix: test 
change setting to run test with correct use case.
 2022-07-17 15:40:55 +05:30
Maharshi Patel
9a3c84663f fix: linter 2022-07-17 15:22:37 +05:30
Maharshi Patel
2066e5a53a discount settings for e-invoice added and test cases 2022-07-17 15:08:40 +05:30
Deepesh Garg
b147ce4206 fix(India): Inward supplies from Composition Supplier in 3B report 2022-07-17 00:43:25 +05:30
Deepesh Garg
0d6beed546 test: Update test case 2022-07-16 14:06:01 +05:30
Maharshi Patel
844758a27c fix: (india)(einvoice) discount for CN DN 2022-07-15 16:54:10 +05:30
Maharshi Patel
1f4d434675 fix: (india) (e-invoice) discount calculation 
I have added fixes for discount in e-inovice.
 2022-07-15 16:03:42 +05:30
Deepesh Garg
8c7b836de8 Merge pull request #31595 from maharshivpatel/fix-uin-e_invoice 
fix: (india) (e-invoice) allow generation for UIN Holders
 2022-07-14 21:25:45 +05:30
Deepesh Garg
9fd1fad259 Merge pull request #31572 from frappe/mergify/bp/version-13-hotfix/pr-31566 
fix: Allow multi currency invoice against single party account (backport #31566)
 2022-07-14 21:25:17 +05:30
Deepesh Garg
dfa0638baf Merge pull request #31577 from frappe/mergify/bp/version-13-hotfix/pr-31543 
feat: Loan balance adjustment doctypes (backport #31543)
 2022-07-14 21:24:49 +05:30
Deepesh Garg
0a5bc86d1b chore: resolve conflicts 2022-07-14 17:20:32 +05:30
Deepesh Garg
bdd15895ff chore: resolve conflicts 2022-07-14 17:06:01 +05:30
Maharshi Patel
82539fc18a fix: (india) (e-invoice) allow generation for UIN Holders 
e-invoice is required for UIN Holders and they should be treated as Registered Regular. there was incorrect if hasattr check that prevented UIN number validation.
 2022-07-14 15:12:51 +05:30
Maharshi Patel
84f260e1d8 fix: (india) (e-invoice) CN / DN with 0 qty 
Qty 0 is allowed when creating Credit or Debit Note this caused ZeroDivisionError during unit_rate calculation.
fixed the issue by adding required conditionals.
 2022-07-13 01:39:36 +05:30
Deepesh Garg
0b3958d692 chore: Linting Issues 
(cherry picked from commit 0bac030ca7)
 2022-07-12 12:56:46 +00:00
Deepesh Garg
c2a7dc7754 chore: Linting Issues 
(cherry picked from commit d933ff5cf6)
 2022-07-12 12:56:46 +00:00
Abhinav Raut
8237d94b11 fix: on cancel for loan refund 
(cherry picked from commit 13b7ed1e2c)
 2022-07-12 12:56:45 +00:00
Labeeb Mattra
0713a240a7 Consider refund_amount in pending principal amount 
(cherry picked from commit 35f2717ad2)
 2022-07-12 12:56:45 +00:00
Labeeb Mattra
61b2a1c3cb fix excess amount calculation in loan refund 
(cherry picked from commit 9df1413adb)
 2022-07-12 12:56:44 +00:00
Labeeb Mattra
94be7a95f7 Update adjustment_type field options 
(cherry picked from commit 245b0c7818)
 2022-07-12 12:56:44 +00:00
Labeeb Mattra
7ba0326bdd fix adjustment amount field name 
(cherry picked from commit 6cc09ef3a2)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
86af1ef6ed fix indent and imports 
(cherry picked from commit 0ed6382ab6)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
b995338d0c fix lint 
(cherry picked from commit 8434ec09c3)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
0856e14c13 Use adjustment amounts in pending principal amnt 
(cherry picked from commit 1b5b2138ee)
 2022-07-12 12:56:42 +00:00
Labeeb Mattra
ff5ee2bbac Add ref no to balance adjustment remarks 
(cherry picked from commit a1a51ce1a6)
 2022-07-12 12:56:42 +00:00
Labeeb Mattra
a36e8a83d8 Add reference number to repayment remarks 
(cherry picked from commit 74dbf8c5d9)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-07-12 12:56:41 +00:00
Labeeb Mattra
d81e7e2421 Add NPA checkbox in Loan 
(cherry picked from commit 27a8e16b28)
 2022-07-12 12:56:41 +00:00
Labeeb Mattra
8181d61293 Update list view for Accrual and Shortfall 
(cherry picked from commit 7d6e4898c4)
 2022-07-12 12:56:40 +00:00
Labeeb Mattra
548aac5b11 Remove loan account field from doctype 
(cherry picked from commit 6febcd529b)
 2022-07-12 12:56:40 +00:00
Labeeb Mattra
de69fee6aa Use new adjustment amount fields 
(cherry picked from commit 7d468a8778)
 2022-07-12 12:56:39 +00:00
Labeeb Mattra
c3e6d7ba29 Seperate credit and debit adjust amount fields in Loan 
(cherry picked from commit d6f632a770)
 2022-07-12 12:56:38 +00:00
Abhinav Raut
d5ce780e87 feat: add adjustment amount to loan 
- fix: bugs in loan balance adjustment

(cherry picked from commit 5c0a25012c)
 2022-07-12 12:56:38 +00:00
Labeeb Mattra
a2125e694d Add Loan Balance Adjustment doctype 
(cherry picked from commit 2e8f056514)
 2022-07-12 12:56:37 +00:00
Labeeb Mattra
0d94653c5b Add Loan Refund doctype 
(cherry picked from commit e1682965c5)
 2022-07-12 12:56:36 +00:00
Labeeb Mattra
d9723a12c4 Add refund amount to loan 
(cherry picked from commit 88cd780ca1)
 2022-07-12 12:56:36 +00:00
Labeeb Mattra
d24cb01a9d Add more loan interest accrual types 
(cherry picked from commit a81da2ea85)
 2022-07-12 12:56:35 +00:00
Labeeb Mattra
ab214bcdfc update loan interest accrual types 
(cherry picked from commit 900c878e03)
 2022-07-12 12:56:35 +00:00