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
46,832 Commits 399 Branches 1,700 Tags
33efa6960d7f4744e40df0aa567bcd22e008fe31
Commit Graph

46832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
33efa6960d chore: resolve conflicts 2024-03-19 10:14:24 +05:30
ruthra kumar
379616ab4b refactor: toggle between 'http' and 'https' on exchange rate API 
(cherry picked from commit 8b81274769)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
 2024-03-19 04:29:44 +00:00
ruthra kumar
8cb1293ffc Merge pull request #40515 from frappe/mergify/bp/version-14-hotfix/pr-40511 
fix: invalid exchange loss booking on invoice against base accounts (backport #40511)
 2024-03-18 21:05:51 +05:30
ruthra kumar
fe78214ea4 refactor(test): ensure Exchange gain/loss journals aren't created 
(cherry picked from commit e1c2d006ca)
 2024-03-18 15:14:44 +00:00
ruthra kumar
a27f386665 fix: invalid exchange loss booking on invoice againts base accounts 
(cherry picked from commit 3d5dba6976)
 2024-03-18 15:14:44 +00:00
ruthra kumar
c4c0510a1b Merge pull request #40496 from frappe/mergify/bp/version-14-hotfix/pr-40495 
fix: index error on Exchange Rate Revaluation creation (backport #40495)
 2024-03-17 08:10:46 +05:30
ruthra kumar
8813b6b2fd fix: index error on Exchange Rate Revaluation creation 
(cherry picked from commit bb279e368c)
 2024-03-17 02:21:33 +00:00
ruthra kumar
a0e839e31a Merge pull request #40489 from frappe/mergify/bp/version-14-hotfix/pr-40485 
refactor: validate SO and SI references in Delivery Notes (backport #40485)
 2024-03-16 15:28:12 +05:30
ruthra kumar
9d827e84be chore: resolve conflicts 2024-03-16 15:02:23 +05:30
ruthra kumar
f87f284616 test: SO reference validation 
(cherry picked from commit 4f396d3049)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2024-03-16 09:29:07 +00:00
ruthra kumar
5f4a648dd4 refactor: validate SO and SI references 
(cherry picked from commit 4d090bd3b8)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
 2024-03-16 09:29:07 +00:00
ruthra kumar
5f0920ab27 Merge pull request #40475 from frappe/mergify/bp/version-14-hotfix/pr-40473 
refactor: enable no-copy for update_outstanding_for_self (backport #40473)
 2024-03-16 10:09:37 +05:30
ruthra kumar
03cb07f591 Merge pull request #40465 from frappe/mergify/bp/version-14-hotfix/pr-40461 
refactor: disallow '0' qty return invoices with stock effect (backport #40461)
 2024-03-16 10:07:31 +05:30
ruthra kumar
90a5155fc1 refactor: enable no-copy for update_outstanding_for_self 
(cherry picked from commit a1e8caa5c1)
 2024-03-15 11:33:09 +00:00
ruthra kumar
0437274c58 chore: resolve conflict 2024-03-15 11:39:54 +05:30
ruthra kumar
a914eb5d40 test: validation to prevent '0' qty return with stock effect 
(cherry picked from commit 647bba0f00)
 2024-03-15 05:37:23 +00:00
ruthra kumar
b011a68a2a refactor: disallow '0' qty return invoices with stock effect 
(cherry picked from commit 898affbee9)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-15 05:37:22 +00:00
rohitwaghchaure
5a2eaf9092 fix: warehouse issue in pick list (#40453) 2024-03-14 12:17:23 +05:30
rohitwaghchaure
3340463b8e fix: Data too long for column 'stock_queue' (#40450) 2024-03-14 11:39:29 +05:30
ruthra kumar
8500f9dad1 Merge pull request #40446 from frappe/mergify/copy/version-14-hotfix/pr-40445 
fix: flaky Accounts Receivable test case (copy #40445)
 2024-03-14 09:16:33 +05:30
ruthra kumar
5fe200bc4d fix(test): manually filter rows and assert 2024-03-14 08:54:41 +05:30
ruthra kumar
41bda583e8 fix: flaky Accounts Receivable test case 
(cherry picked from commit 40bce240bde508801d07b9c38ededea5b4f297c8)
 2024-03-13 16:33:46 +00:00
mergify[bot]
fe54590af7 fix: incorrect gross profit on the quotation (backport #40438) (#40441) 
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945aee4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-13 21:55:26 +05:30
Nabin Hait
fa55cc68f8 Merge pull request #40263 from nabinhait/pi-optimization 
perf: Performance optmization for Purchase Invoice submission
 2024-03-13 18:17:41 +05:30
ruthra kumar
fa0a60c5d9 Merge pull request #40426 from frappe/mergify/bp/version-14-hotfix/pr-40372 
refactor: checkbox to toggle standalone Credit/Debit note behaviour (backport #40372)
 2024-03-13 16:28:38 +05:30
Nabin Hait
c1428a5655 Merge pull request #40246 from nabinhait/depreciation-asset-sale 
fix: Book depreciation until the asset disposal date and removed unwanted commits
 2024-03-13 13:17:18 +05:30
Nabin Hait
43a6a00912 Merge pull request #40125 from nabinhait/document-modified-error 
fix: Reload document on cancel to avoid document modified error
 2024-03-13 13:17:05 +05:30
ruthra kumar
5d178d2e24 refactor: pass 'name' to get_link_to_form 2024-03-13 13:16:56 +05:30
Nabin Hait
b5f0576a1b Merge pull request #40122 from nabinhait/remove-capitalized-in 
fix: Patch to remove cancelled asset capitalization from asset
 2024-03-13 13:16:29 +05:30
Nabin Hait
b07769d8d7 perf: Caching in gl entry 2024-03-13 13:02:51 +05:30
Nabin Hait
8d682fa884 perf: Caching in checking allowance for qty and amount 2024-03-13 13:00:10 +05:30
Nabin Hait
d279e23623 fix: added index for price_list column in Item Price 2024-03-13 12:58:13 +05:30
Nabin Hait
6ff9e6ee84 perf: Get bin details only for stock items 2024-03-13 12:57:33 +05:30
Nabin Hait
c15b2d5490 perf: validate expense against budget only if budget exists 2024-03-13 12:56:28 +05:30
Nabin Hait
49c74369a5 perf: refactored handling provisional gl entries for non-stock items 2024-03-13 12:54:13 +05:30
ruthra kumar
92ccef0ebc chore: resolve conflicts 2024-03-13 12:14:33 +05:30
ruthra kumar
ae6d1c14cb chore: better popup message 
(cherry picked from commit 445d2acf50)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:45 +00:00
ruthra kumar
b746493830 test: cr note flag to update self 
(cherry picked from commit ce3b1f09f5)
 2024-03-13 06:12:44 +00:00
ruthra kumar
34053ec590 refactor: make AR/AP report aware of always standalone cr/dr notes 
(cherry picked from commit 4d0c2d8e82)
 2024-03-13 06:12:44 +00:00
ruthra kumar
adbc20736e chore: patch for updating flag in Cr/Dr notes 
(cherry picked from commit 849f478894)
 2024-03-13 06:12:44 +00:00
ruthra kumar
d1e3b2ab6e refactor: post ledger entries based on toggle 
(cherry picked from commit 77aac6f571)
 2024-03-13 06:12:44 +00:00
ruthra kumar
6d5e595440 refactor: checkbox in purchase invoice 
(cherry picked from commit 767f2157e6)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
1ddb162ef1 chore: update popup message 
(cherry picked from commit adf13a19c4)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
4d6b56e55b refactor: checkbox to toggle always standalone credit note 
(cherry picked from commit 2cefe2a20e)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2024-03-13 06:12:43 +00:00
mergify[bot]
cd40038b18 fix: conditionally apply is_group filter in accounting dimension query (backport #40414) (#40415) 
fix: conditionally apply `is_group` filter in accounting dimension query (#40414)

(cherry picked from commit daf4ae2a6b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-03-12 20:45:43 +05:30
Raffael Meyer
3dd4514478 Merge pull request #40405 from frappe/mergify/bp/version-14-hotfix/pr-40403 
fix: error message wording (backport #40403)
 2024-03-12 14:33:59 +01:00
mergify[bot]
c413b04539 fix: incorrect work order status (backport #40407) (#40410) 
fix: incorrect work order status (#40407)

(cherry picked from commit 948297692e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:34:35 +05:30
mergify[bot]
21b57d9aef fix: qc created for raw materials during manufacture entry (backport #40408) (#40412) 
fix: qc created for raw materials during manufacture entry (#40408)

(cherry picked from commit f8a1a7f515)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:29:21 +05:30
Raffael Meyer
05e4517094 chore: resolve conflicts 2024-03-12 12:35:17 +01:00
Raffael Meyer
74023035af fix: error message wording (#40403) 
(cherry picked from commit 79a0473705)

# Conflicts:
#	erpnext/accounts/doctype/subscription/subscription.py
 2024-03-12 11:26:23 +00:00