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,857 Commits 399 Branches 1,700 Tags
97ed9056274957b055025267fbb040ae09d7974b
Commit Graph

46857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
97ed905627 refactor: reset all flags and remove unwanted code 
(cherry picked from commit 2dbe68a09d)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c38cfd14f3 chore: show correct status in list view 
(cherry picked from commit 1014940953)
 2024-03-20 14:13:14 +00:00
ruthra kumar
341e467056 refactor: validate status before running events 
(cherry picked from commit 86b5e2e277)
 2024-03-20 14:13:14 +00:00
ruthra kumar
833df2c76b refactor: make Excluded doctype table read only 
(cherry picked from commit 7c4cff2649)
 2024-03-20 14:13:13 +00:00
ruthra kumar
a303788c71 chore: remove unwanted UI code 
(cherry picked from commit b98a5e4edc)
 2024-03-20 14:13:13 +00:00
ruthra kumar
0d791f594f refactor: use separate child table for summary 
(cherry picked from commit 49d3bcbc8d)
 2024-03-20 14:13:13 +00:00
ruthra kumar
b1367e839c refactor: chained callback 
(cherry picked from commit b12ca65fcc)
 2024-03-20 14:13:12 +00:00
ruthra kumar
e56138ddb0 refactor: reorder flags in Tasks section 
(cherry picked from commit cccb2d5141)
 2024-03-20 14:13:12 +00:00
ruthra kumar
c9d77044b0 refactor: use flags to decide on current stage 
(cherry picked from commit 6a77d86a53)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.py
 2024-03-20 14:13:12 +00:00
ruthra kumar
5542985e25 refactor: UI trigger 
(cherry picked from commit 8944ab8b6a)
 2024-03-20 14:13:11 +00:00
ruthra kumar
52d22d8b55 refactor: tasks section and UI niceties 
(cherry picked from commit d0dc2c6e77)
 2024-03-20 14:13:11 +00:00
ruthra kumar
7280a76f73 refactor: set status and trigger job on submit 
(cherry picked from commit 6fbb67b1d2)
 2024-03-20 14:13:10 +00:00
ruthra kumar
07c98146c5 refactor: more options for 'status' and move it to top 
(cherry picked from commit 0d65d878de)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
 2024-03-20 14:13:10 +00:00
mergify[bot]
785131121d fix: currency symbol for Landed Cost Voucher Amount (backport #40550) (#40553) 
* fix: currency symbol for Landed Cost Voucher Amount (#40550)

(cherry picked from commit 0725707cb1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 23:37:32 +05:30
Nabin Hait
419f2a5192 Merge pull request #40519 from nabinhait/provisional-entry-fix 
fix: provisional entry for non-stock item
 2024-03-19 21:58:56 +05:30
Nabin Hait
39d958c507 fix: get unique provisional accounts 2024-03-19 21:06:16 +05:30
Nabin Hait
a1c8b93e99 fix: added index for voucher_detail_no in gl entry 2024-03-19 18:35:11 +05:30
Nabin Hait
0aef7f9671 fix: provisional entry for non-stock item 2024-03-19 18:29:37 +05:30
mergify[bot]
64f1844bc8 fix: Update Existing Price List Rate not working (backport #40333) (#40526) 
* fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/setup/demo_data/item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 18:11:50 +05:30
ruthra kumar
b197c1926f fix: flaky ecommerce test case (#40534) 
* refactor(test): make use of fixtures

* refactor(test): rating are now restricted with [0..1]

* refactor(test): remove superfluous setup override
 2024-03-19 17:54:35 +05:30
Raffael Meyer
76f27d99bb Merge pull request #40547 from frappe/mergify/bp/version-14-hotfix/pr-40546 
fix(Supplier Quotation Comparison): group by options (backport #40546)
 2024-03-19 13:07:40 +01:00
barredterra
cfed706c15 fix(Supplier Quotation Comparison): group by options 
(cherry picked from commit 87e36d290e)
 2024-03-19 11:51:37 +00:00
Gursheen Kaur Anand
93fe136386 Merge pull request #40530 from frappe/mergify/bp/version-14-hotfix/pr-40528 
fix(minor): missing range for ageing summary in PSOA (backport #40528)
 2024-03-19 12:44:16 +05:30
Gursheen Anand
9f0ad7a4ea fix: missing range for ageing summary 
(cherry picked from commit 643cc022fd)
 2024-03-19 07:11:18 +00:00
ruthra kumar
59a9a41e9d Merge pull request #40522 from frappe/mergify/bp/version-14-hotfix/pr-40502 
refactor: toggle between 'http' and 'https' on exchange rate API (backport #40502)
 2024-03-19 10:37:32 +05:30
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