nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 07:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,901 Commits 621 Branches 1,804 Tags
a8cd49112d90eb93310bff00fce5286648317b46
Commit Graph

9955 Commits

Author SHA1 Message Date
ruthra kumar
8baef24541 fix: blank item-wise sales/purchase register reports on first load 2024-07-05 07:43:13 +05:30
Nihantra C. Patel
20d481de5e fix: group by in item-wise purchase register 
(cherry picked from commit 3fab00135b)
 2024-07-05 02:05:29 +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
mergify[bot]
63b26e679b feat: Turkish Chart Of Accounts (backport #41756) (#42028) 
* feat: Create Turkish Chart Of Accounts

(cherry picked from commit 5c8ea86a3f)

* feat: Create Turkish Chart Of Accounts

(cherry picked from commit b401ba2c26)

---------

Co-authored-by: fzozyurt <fzozyurt@outlook.com>
 2024-06-26 16:50:41 +05:30
Dany Robert
068ae87b8d feat(gp): group by cost center 
(cherry picked from commit e26bc17c75)
 2024-06-24 05:22:39 +00:00
Dany Robert
fe9dffb271 feat: accounting dimension filters in gp report 
(cherry picked from commit d165638bbb)
 2024-06-24 05:22:39 +00:00
ruthra kumar
521cfb3d4e Merge pull request #41998 from frappe/mergify/bp/version-15-hotfix/pr-41976 
fix: pricing rule with and without 'apply multiple' and priority (backport #41976)
 2024-06-23 05:49:07 +05:30
ruthra kumar
f52f726e06 test: priority takes effect on with and without apply multiple 
(cherry picked from commit efebc3662e)
 2024-06-23 00:02:10 +00:00
ruthra kumar
f3aa885488 fix: pricing rule with and without 'apply multiple' and priority 
Either all of the pricing rules identified for an item should have
'apply multiple' enabled. If not, Priority is applied and only the
highest priority is applied

(cherry picked from commit 5e875b238c)
 2024-06-23 00:02:10 +00:00
ruthra kumar
c45ce75f57 refactor(test): make and use a different party for subscription 
(cherry picked from commit 3fabf4aaa4)
 2024-06-22 23:58:11 +00:00
ruthra kumar
3b15708f18 fix(test): incorrect field for customer default billing currency 
(cherry picked from commit c696d13a5e)
 2024-06-22 23:58:10 +00:00
ruthra kumar
a1ebd16284 chore: remove dead code 
(cherry picked from commit 7e318c0132)
 2024-06-22 23:58:10 +00:00
ruthra kumar
5d2f296ca8 refactor: convert amount to base currency for advances 
(cherry picked from commit c9ede1ffbe)
 2024-06-22 23:58:09 +00:00
ruthra kumar
199a64937b chore: remove validation on payment entry 
(cherry picked from commit e7740033ca)
 2024-06-22 23:58:09 +00:00
Khushi Rawat
8d299d1495 Merge pull request #41989 from khushi8112/rename-number-of-depreciation-v15-hotfix 
refactor: renamed number of depreciations booked to opening booked depreciations
 2024-06-22 01:19:16 +05:30
Khushi Rawat
ca343f12d8 refactor: renamed number of depreciations booked to opening booked de… (#41515) 
* refactor: renamed number of depreciations booked to opening booked depreciations

* feat: introduced new field for showing total number of booked depreciations
 2024-06-21 19:53:46 +05:30
ruthra kumar
a41577a1cd fix: incorrect against_account upon reposting 
(cherry picked from commit 20c4098399)
 2024-06-21 12:30:39 +00:00
ruthra kumar
e3608f285f Merge branch 'version-15' into version-15-hotfix 2024-06-19 11:02:14 +05:30
rohitwaghchaure
db7fb7d7b1 Merge pull request #41928 from frappe/mergify/bp/version-15-hotfix/pr-41927 
fix: consistent query field name in item wise purchase register with item wise sales register (backport #41927)
 2024-06-17 16:53:28 +05:30
ljain112
ceafa0ce28 fix: handle NoneType error where customer details are not available in sales register 
(cherry picked from commit f876fec6f5)
 2024-06-17 09:29:38 +00:00
ljain112
a43c181673 fix: consistent query field name in item wise purchase register with item wise sales register 
(cherry picked from commit 6d539e0fc0)
 2024-06-17 09:28:27 +00:00
Nihantra Patel
98c8feded0 fix: item_code filter in item-wise sales-purchase register 
(cherry picked from commit 757aef3972)
 2024-06-17 08:32:26 +00:00
Nihantra C. Patel
7e9f6aee58 fix: update received qty in MR on purchase invoice submit with update stock 2024-06-17 11:39:42 +05:30
Nihantra Patel
084658e8ff fix: add test case for update received qty in MR - import sorter 
(cherry picked from commit 77959596db)
 2024-06-17 06:06:35 +00:00
Nihantra Patel
21596c6c23 fix: add test case for update received qty in MR - import sorter 
(cherry picked from commit 73f22ba9a0)
 2024-06-17 06:06:35 +00:00
Nihantra Patel
858058c9e1 fix: add test case for update received qty in MR 
(cherry picked from commit 62e4e88f1d)
 2024-06-17 06:06:34 +00:00
Nihantra Patel
aaee02835b fix: add test case for update received qty in MR 
(cherry picked from commit cff1050159)
 2024-06-17 06:06:34 +00:00
Nihantra Patel
125d97a182 fix: add test case for update received qty in MR 
(cherry picked from commit ebb0cef601)
 2024-06-17 06:06:34 +00:00
Nihantra Patel
4551b4b638 fix: update received qty in MR on purchase invoice submit with update stock 
(cherry picked from commit 13cb53fa89)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 2024-06-17 06:06:34 +00:00
ruthra kumar
a89b4f49fe fix: use invoice outstanding on Dunning (#41817) 
(cherry picked from commit cf0a29b05f)
 2024-06-12 11:13:34 +00:00
ruthra kumar
04f0c96af7 fix: use invoice outstanding on Dunning (#41817) 
(cherry picked from commit cf0a29b05f)
 2024-06-12 10:54:57 +00:00
rohitwaghchaure
b87b438881 Merge pull request #41854 from frappe/version-15-hotfix 
chore: release v15
 2024-06-11 18:47:08 +05:30
mergify[bot]
28b7fad579 fix: asset depreciations and balances report correction (backport #41824) (#41851) 
fix: asset depreciations and balances report correction (#41824)

* fix: asset depreciations and balances report correction

* chore: suppress linter warnings with # nosemgrep

(cherry picked from commit 857c689405)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-06-11 18:18:11 +05:30
Deepesh Garg
439ef109f3 fix: Add timestamp to key for immutable views 
(cherry picked from commit 6bded59f1c)
(cherry picked from commit 9e9bc8b59c)
 2024-06-11 09:41:12 +00:00
Deepesh Garg
9e9bc8b59c fix: Add timestamp to key for immutable views 
(cherry picked from commit 6bded59f1c)
 2024-06-11 09:36:07 +00:00
ruthra kumar
75f3b47424 Merge pull request #41847 from frappe/mergify/bp/version-15-hotfix/pr-41707 
refactor: add `Is opening` flag for payment entry (backport #41707)
 2024-06-11 11:02:57 +05:30
ruthra kumar
818a553668 test: is_opening flag for advance in separate party account 
(cherry picked from commit 17f968e1e1)
 2024-06-11 04:57:07 +00:00
ruthra kumar
1fc802da6f refactor: restrict to 'Advance in Separate Party Account' type 
(cherry picked from commit c36f0e4a33)
 2024-06-11 04:57:07 +00:00
ruthra kumar
c664a27b1e refactor: is_opening in payment entry 
(cherry picked from commit 05d17d0d73)
 2024-06-11 04:57:07 +00:00
ruthra kumar
c0668373c7 refactor: enabling partial TDS application on partial invoice 
(cherry picked from commit 091c5496b2)
 2024-06-11 10:23:53 +05:30