nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,000 Commits 619 Branches 1,804 Tags
886256c86b94aaf2e91e4ca6c6652bd503bb2ca2
Commit Graph

9994 Commits

Author SHA1 Message Date
Nabin Hait
886256c86b fix: Show the rows in AR/AP report where outstanding equals to 0.01 
(cherry picked from commit e1dedc5402)
 2024-07-18 08:15:39 +00:00
ruthra kumar
3f820734b6 test: payment filter should not affect dr/cr notes 
(cherry picked from commit 2d686c06ea)
 2024-07-18 07:12:44 +00:00
ruthra kumar
0a41ccda99 fix: missing cr/dr notes on payment reconciliation 
(cherry picked from commit a30af68e9e)
 2024-07-18 07:12:44 +00:00
ljain112
0d2ef0df7d fix: show total rows credit row in balance sheet 
(cherry picked from commit 327b19cba6)
 2024-07-16 13:58:37 +00:00
ruthra kumar
4968395372 chore: contextual comments 
(cherry picked from commit 794a62aecb)
 2024-07-15 09:41:57 +00:00
ruthra kumar
8e70aeae4a refactor(test): reposting happens implicitly 
(cherry picked from commit c283cda169)
 2024-07-15 09:41:57 +00:00
ruthra kumar
4ac174703c refactor(test): no need to assert repost_required flag 
Reposting happens implicitly upon 'Update After Submit'

(cherry picked from commit 8f135e9859)
 2024-07-15 09:41:57 +00:00
ruthra kumar
804f1d4772 refactor: make reposting implicit 
(cherry picked from commit 722ef92324)
 2024-07-15 09:41:56 +00:00
ruthra kumar
cc09d0d218 chore: resolve conflict 2024-07-15 14:34:30 +05:30
ruthra kumar
43eec001ee test(gross profit): valuation rate from different warehouse 
(cherry picked from commit 577ce5ccd4)

# Conflicts:
#	erpnext/accounts/report/gross_profit/test_gross_profit.py
 2024-07-15 08:50:15 +00:00
ruthra kumar
f161e59cd7 fix(gross profit): incorrect valuation rate on different warehouses 
(cherry picked from commit f9d2dd0a62)
 2024-07-15 08:50:15 +00:00
mergify[bot]
e250dcc7c8 fix: While submitting PCV ensure previous FY is closed (backport #42284) (#42300) 
fix: While submitting PCV ensure previous FY is closed (#42284)

(cherry picked from commit d0bbc8ca70)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-07-12 20:05:03 +05:30
Khushi Rawat
ad228d80d5 Merge pull request #42301 from frappe/mergify/bp/version-15-hotfix/pr-42276 
feat: configurable depreciation calculation via accounts settings (backport #42276)
 2024-07-12 18:32:37 +05:30
mergify[bot]
6d098b7302 fix: not able to submit LCV entry (backport #42303) (#42304) 
fix: not able to submit LCV entry (#42303)

(cherry picked from commit 9cf92eaeab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-12 17:27:18 +05:30
Khushi Rawat
ddd1ca7f7c feat: configurable depreciation calculation via accounts settings (#42276) 
* feat: configurable depreciation calculation via accounts settings

* refactor: code optimization

* style: changes in description and label

(cherry picked from commit b04da63aad)
 2024-07-12 08:57:11 +00:00
ruthra kumar
84a8bb3ce5 refactor(test): clear old records 2024-07-11 21:04:34 +05:30
ruthra kumar
61852bd3f6 refactor(test): use each instance UOM for assertion 
(cherry picked from commit cf4fbfb601)
 2024-07-11 12:34:12 +00:00
ruthra kumar
cd79d33db2 refactor: test suite for item-wise sales register 
(cherry picked from commit 3aaa22e672)
 2024-07-11 12:34:12 +00:00
ruthra kumar
4f7e0d2955 chore: rename test suite for payable report 
(cherry picked from commit 9474f72776)
 2024-07-11 12:34:12 +00:00
ruthra kumar
4055ef92b5 fix: missing discount on POS Credit Notes 
(cherry picked from commit 1049550951)
 2024-07-11 11:59:38 +00:00
Smit Vora
23053f45de chore: resolve conflicts 2024-07-10 12:26:35 +05:30
Smit Vora
8264e3bc77 fix(tds): use doctype reference when mapping keys across multiple doctypes (#42258) 
* fix(tds): use doctype reference when mapping keys across multiple doctypes

* fix: changes as per review

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
(cherry picked from commit 5c0d52f783)

# Conflicts:
#	erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
 2024-07-10 06:27:29 +00:00
ljain112
3fb5c7a3a6 fix: updated logic for calculating tax_withholding_net_total in payment entry 
(cherry picked from commit c8a34cde7f)
 2024-07-10 05:11:35 +00:00
ruthra kumar
7d0d1cfd18 Merge pull request #41739 from frappe/mergify/bp/version-15-hotfix/pr-41497 
fix: correcting balance sheet calculation for zero liabilities and equity (backport #41497)
 2024-07-10 10:30:12 +05:30
ruthra kumar
f281e064f2 chore: resolve conflict 2024-07-09 10:39:02 +05:30
ljain112
57896a8f99 fix: changes as per review 
(cherry picked from commit ba08b2e8e8)
 2024-07-09 04:40:37 +00:00
ljain112
a04938d5ae fix: field position 
(cherry picked from commit 98ad01c736)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
 2024-07-09 04:40:37 +00:00
ljain112
4eb251b59a fix: download_import_log if rows are greater than 5000 
(cherry picked from commit 2112d8f772)
 2024-07-09 04:40:37 +00:00
ljain112
62aac8bb85 fix: import log preview 
(cherry picked from commit 1ad264de48)
 2024-07-09 04:40:37 +00:00
ljain112
71311ffd62 fix: import status 
(cherry picked from commit 07f68884e0)
 2024-07-09 04:40:37 +00:00
ljain112
2f0b97d91b fix: remove deprecated field "statement_import_log" 
(cherry picked from commit b202409428)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
 2024-07-09 04:40:37 +00:00
ljain112
43ad2fed63 fix: custom delimiters 
(cherry picked from commit 13fb560401)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
 2024-07-09 04:40:37 +00:00
Sagar Vora
ca57fd4255 fix: Multiple fixes for General Ledger Report 
(cherry picked from commit 97f02015c2)
 2024-07-08 04:36:11 +00:00
ruthra kumar
5ac3b34a6f fix: empty item-wise sales/purchase register reports on initial load 
(cherry picked from commit ee862126e4)
 2024-07-04 09:36:58 +00:00
Nihantra C. Patel
a967d59844 fix: group by in item-wise purchase register 
(cherry picked from commit 3fab00135b)
 2024-07-04 09:09:09 +00:00
ruthra kumar
12bec3be9d test: validation on mixed condition and recursion on pricing rule 
(cherry picked from commit eb4af58bf0)
 2024-07-03 15:27:43 +00:00
ruthra kumar
0774607f52 test: validation on mixed condition with recursion 
(cherry picked from commit 9bd4e7b709)
 2024-07-03 15:27:43 +00:00
ruthra kumar
cfda5f6d0b fix: use standard method to get _doc_before_save 
(cherry picked from commit 9d7be293ae)
 2024-07-03 15:27:43 +00:00
ruthra kumar
4ecb02cb41 refactor: validation to prevent recursion with mixed conditions 
(cherry picked from commit 406dfd528f)
 2024-07-03 15:27:43 +00:00
Nabin Hait
d61dab8569 fix: provisional entry for non stock items 2024-07-02 16:10:03 +05:30
mergify[bot]
58e18e2b1f fix: resolve gl entries duplication in asset purchase workflow (backport #41845) (#42120) 
* fix: resolve gl entries duplication in asset purchase workflow (#41845)

* fix: resolve gl entries duplication in asset purchase workflow

* fix: prevent duplicate entry when creating purchase receipt from purchase invoice

* chore: test case added

* fix: fixed missing asset category issue

(cherry picked from commit 55a4bd469b)

* fix: use f-string instead of format call

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-07-01 16:54:14 +05:30
mergify[bot]
97c49b93b6 fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (backport #41919) (#42058) 
* fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (#41919)

* fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues

* chore: added missing patch to patches.txt

* chore: fixing previous changes

* chore: fixing minor issues

* fix: code changes to enhance efficiency

* chore: replaced frappe.qb with db.sql because of conflict

* fix: minor changes

(cherry picked from commit ba79e68190)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
#	erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#	erpnext/patches.txt
#	erpnext/stock/doctype/stock_entry/stock_entry.json

* chore: fixed conflicts

* fix: removed unmerged patches

* fix: use f-string instead of format call

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-07-01 16:53:29 +05:30
mergify[bot]
a0e06a4ba5 fix: timeout error while submitting JV (backport #42040) (#42099) 
* fix: timeout error while submitting JV (#42040)

(cherry picked from commit 32bdcdb08f)

# Conflicts:
#	erpnext/accounts/doctype/account/account.json
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
#	erpnext/accounts/utils.py
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-01 14:15:13 +05:30
ruthra kumar
3c58e0af50 refactor: handle purchase invoice as reference 
(cherry picked from commit 9ec6aef95d)
 2024-06-30 00:08:42 +00:00
ruthra kumar
cb703ff17c chore: better test name 
(cherry picked from commit ad7efd5939)
 2024-06-30 00:08:41 +00:00
ruthra kumar
6a0111c7db test: advance payment entry against journal - supplier type 
(cherry picked from commit 1b384b9942)
 2024-06-30 00:08:41 +00:00
ruthra kumar
e00348fd52 test: advance payment against journal entry - customer type 
(cherry picked from commit 5e84272cf9)
 2024-06-30 00:08:41 +00:00
ruthra kumar
4e74257ba9 fix: incorrect dr/cr on Adv Payment against Journals 
(cherry picked from commit f6c1dffb35)
 2024-06-30 00:08:41 +00:00
mergify[bot]
d396c18689 perf: Performance optmization for Purchase Invoice submission (backport #40263) (#41946) 
* perf: Optimization for providional gl entries

(cherry picked from commit d7b738ff61)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

* perf: Performance optimization for validating budget

(cherry picked from commit f204d810bb)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.py

* perf: Cached accounting dimensions details

(cherry picked from commit 8cd8b8f885)

* perf: Optimzed code for merging similar gl entries

(cherry picked from commit aa75a60142)

* fix: linter issues

(cherry picked from commit acc0b2faf8)

* perf: Cache accounting dimension filter map

(cherry picked from commit e4bd173875)

# Conflicts:
#	erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

* fix: minor fixes

(cherry picked from commit 5cd9bf3bda)

* perf: skip unnecessary validation while transaction  cancellation

(cherry picked from commit 05385e4acb)

* perf: refactored handling provisional gl entries for non-stock items

(cherry picked from commit 49c74369a5)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

* perf: validate expense against budget only if budget exists

(cherry picked from commit c15b2d5490)

* perf: Get bin details only for stock items

(cherry picked from commit 6ff9e6ee84)

# Conflicts:
#	erpnext/stock/get_item_details.py

* fix: added index for price_list column in Item Price

(cherry picked from commit d279e23623)

# Conflicts:
#	erpnext/stock/doctype/item_price/item_price.json

* perf: Caching in checking allowance for qty and amount

(cherry picked from commit 8d682fa884)

* perf: Caching in gl entry

(cherry picked from commit b07769d8d7)

# Conflicts:
#	erpnext/accounts/doctype/gl_entry/gl_entry.py

* chore: resolve conflicts

* chore: resolve conflict in purchase_invoice.py

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-06-27 17:32:43 +05:30
mergify[bot]
b29435744f chore: patch to enable total number of booked depreciations field (backport #41940) (#42042) 
* chore: patch to enable total number of booked depreciations field (#41940)

* chore: patch to enable total number of booked depreciations field

* fix: conflict resolved

* refactor: replaced fb_row.db_set with set_value

(cherry picked from commit 5fdd1d3278)

# Conflicts:
#	erpnext/patches.txt

* fix: resolved conflicts

* fix: removed unmerged patches

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-06-26 17:43:57 +05:30