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
40,734 Commits 399 Branches 1,700 Tags
a36e8a83d8802681caffe2ca853b2df8ab29322b
Commit Graph

40734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
rohitwaghchaure
2045df19f9 fix: conflicts 2022-07-06 12:34:10 +05:30
Rohit Waghchaure
07b80c295d fix: timeout error while reposting 
(cherry picked from commit 78c8bb251e)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2022-07-06 07:02:31 +00:00
Marica
a8c3882400 Merge pull request #31534 from frappe/mergify/bp/version-13-hotfix/pr-31529 
fix: Use fallback conversion factor while setting incoming rate for petty purchase (backport #31529)
 2022-07-06 01:20:51 +05:30
marination
2a432c22d4 fix: Use fallback conversion factor while setting incoming rate for petty purchase 
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there

(cherry picked from commit aa043fe961)
 2022-07-05 19:09:36 +00:00
Deepesh Garg
776e807ade Merge pull request #31530 from vorasmit/warn-remove-india 
chore: deprecation warning for remove-india
 2022-07-05 22:46:33 +05:30
Smit Vora
6bda2a0865 chore: deprecation warning for remove-india 2022-07-05 21:20:51 +05:30
Rucha Mahabal
01beb6f391 fix: components in the same table don't get updated value of prev payment-days based component 2022-07-04 23:14:26 +05:30
Deepesh Garg
d182137ed1 fix: Incorrect provisional expense booking while reposting 
(cherry picked from commit 60aad31162)
 2022-07-04 14:58:41 +00:00
mergify[bot]
31fd263825 fix(UX): dont apply price list when changing batch on mapped docs (backport #31503) (#31504) 
fix(UX): dont apply price list  when changing batch on mapped docs (#31503)

fix(UX): dont apply price list batch change on mapped docs

(cherry picked from commit 7e40c86c56)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-07-04 17:02:11 +05:30
Ankush Menat
5fc93076f4 chore: ignore late binding warnings 
Most are false positives

[skip ci]
 2022-07-04 13:22:01 +05:30
Deepesh Garg
827794b676 Merge pull request #31510 from frappe/mergify/bp/version-13-hotfix/pr-31405 
feat: Cash and Non trade discounts in Sales Invoice (backport #31405)
 2022-07-04 11:58:45 +05:30
Deepesh Garg
c72ae178fa chore: resolve conflicts 2022-07-03 14:05:34 +05:30
Deepesh Garg
4a5d681c77 chore: use get instead of . operator 
(cherry picked from commit e54ec4b9b6)
 2022-07-03 08:05:23 +00:00
Deepesh Garg
57dc1026c8 test: Add test for einvoice discounts 
(cherry picked from commit 38352b3e46)
 2022-07-03 08:05:22 +00:00
Deepesh Garg
9ba7290dc9 fix(India): Discounts in E-Invoicing 
(cherry picked from commit f337213f33)
 2022-07-03 08:05:21 +00:00
Deepesh Garg
fd2ec25588 feat: Cash and Non trade discounts in Sales Invoice 
(cherry picked from commit 169ff5a0dd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2022-07-03 08:05:19 +00:00
Deepesh Garg
eb85ef974a Merge pull request #31508 from frappe/mergify/bp/version-13-hotfix/pr-31493 
fix: Internal PI link in Sales Invoice (backport #31493)
 2022-07-03 10:09:51 +05:30
Deepesh Garg
8727a6c5da fix: Internal PI link in Sales Invoice 
(cherry picked from commit 536e768ba9)
 2022-07-02 17:17:50 +00:00
Ankush Menat
1b9a4483d4 chore(meta): update CODEOWNERS 2022-07-01 15:44:18 +05:30
Ankush Menat
2e130c335a ci: reduce container count on v13 2022-06-30 11:38:12 +05:30
mergify[bot]
b1c6d789a9 fix: offset some scheduled jobs to avoid locks (backport #31466) (#31489) 
fix: offset some scheduled jobs to avoid locks (#31466)

If your site has multiple background workers then there's possibility
that two jobs will execute in parallal, this creates problem when both
are on operating on same data.

This PR adds a separate section for hourly and daily jobs which have
frequency offset from default frequency to avoid such conflicts.

(cherry picked from commit 5d73697c64)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-30 11:35:01 +05:30
mergify[bot]
4d987a9510 fix: Modify opts parameter misspell (backport #31476) (#31477) 
fix: Modify opts parameter misspell (#31476)

Modify opts parameter misspell

closes #31474

(cherry picked from commit 2a619fd789)

Co-authored-by: gn306029 <gn306029@users.noreply.github.com>
 2022-06-29 14:58:03 +05:30
mergify[bot]
815530650c fix: dont update RM items table if not required (backport #31408) (#31457) 
fix: dont update RM items table if not required (#31408)

Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.

(cherry picked from commit dd11f26eba)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-28 10:28:11 +05:30
Deepesh Garg
8ab65bc44e Merge pull request #31453 from frappe/mergify/bp/version-13-hotfix/pr-31446 
fix: Quotation and Sales Order item sync (backport #31446)
 2022-06-28 08:49:21 +05:30
mergify[bot]
5e7cad476f refactor: clean up product bundle client side code (backport #31455) (#31456) 
refactor: clean up product bundle client side code (#31455)

refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema

(cherry picked from commit 20dac08f5f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-27 18:33:17 +05:30
Deepesh Garg
2219132fdb fix: Quotation and Sales Order item sync 
(cherry picked from commit 58fe220479)
 2022-06-27 05:48:39 +00:00
Deepesh Garg
873d1ecdf0 Merge pull request #31447 from frappe/mergify/bp/version-13-hotfix/pr-31439 
fix: General Ledger and TB opening entries mismatch issues (backport #31439)
 2022-06-27 09:47:00 +05:30
Deepesh Garg
a0c5c730f5 fix: General Ledger and TB opening entries mismatch issues 
(cherry picked from commit 6acd0325be)
 2022-06-24 16:15:38 +00:00
Nabin Hait
e7659a10e4 fix: Monthly depreciation using WDV method 2022-06-24 21:12:31 +05:30
Marica
5f8d8c096c Merge pull request #31440 from frappe/mergify/bp/version-13-hotfix/pr-31421 
fix: add UOM validation for planned-qty (backport #31421)
 2022-06-24 13:02:44 +05:30