nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,764 Commits 402 Branches 1,700 Tags
6a7549d4b2ede2b87dc85bb85b4dd709f8b7398e
Commit Graph

40764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Rucha Mahabal
28e4e4320e Merge pull request #31521 from ruchamahabal/fix-salary-calc-pd 
fix: components in the same table don't get updated value of prev payment-days based component
 2022-07-12 12:06:21 +05:30
Rucha Mahabal
1133062bfc Merge branch 'version-13-hotfix' into fix-salary-calc-pd 2022-07-12 11:42:07 +05:30
Rucha Mahabal
a28c7cf094 fix: Validate payment-days-based dependent component 2022-07-12 11:39:00 +05:30
Deepesh Garg
1c686c732e chore: fix query 
(cherry picked from commit e04e67c6bf)
 2022-07-11 15:44:49 +00:00
Deepesh Garg
66c5290dee chore: Ignore validation 
(cherry picked from commit 3cf609fab1)
 2022-07-11 15:44:49 +00:00
Deepesh Garg
9ac9c46dab fix: Allow multi currency invoice against single party account 
(cherry picked from commit c83fbd5c50)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2022-07-11 15:44:48 +00:00
Marica
7d36bdf292 Merge pull request #31565 from frappe/mergify/bp/version-13-hotfix/pr-31550 
fix: Use Contact Name instead of Supplier in RFQ Email (backport #31550)
 2022-07-11 12:35:18 +05:30
marination
b331c462ef chore: Instantiate variable unconditionally 
(cherry picked from commit 300e812a1f)
 2022-07-11 05:52:08 +00:00
marination
b0e17dea2a fix: Use Contact Name instead of Supplier in RFQ Email 
(cherry picked from commit 88ac519b24)
 2022-07-11 05:52:07 +00:00
Deepesh Garg
6d04bafb04 Merge pull request #31518 from frappe/mergify/bp/version-13-hotfix/pr-31516 
fix: Incorrect provisional expense booking while reposting (backport #31516)
 2022-07-07 11:53:58 +05:30
rohitwaghchaure
c4f39c7b8b Merge pull request #31538 from frappe/mergify/bp/version-13-hotfix/pr-31519 
fix: timeout error while reposting (backport #31519)
 2022-07-06 14:33:26 +05:30