nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 18:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,928 Commits 605 Branches 1,802 Tags
22923666459a34f96e6b6fc61201f0f94952d12a
Commit Graph

305 Commits

Author SHA1 Message Date
Mihir Kandoi
2292366645 feat(selling): allow disabling a Product Bundle 
Un-deprecate the `disabled` checkbox: it is now editable (also after
submit) and parks a bundle version without ceding its active slot, so
re-enabling restores it without re-activation.

- `get_active_product_bundle` (the single resolution entry point) skips
  disabled bundles, so every consumer stops treating the item as a bundle
  while it is disabled
- the version pickers on transaction item rows and the buying "Get Items
  from Product Bundle" dialog filter out disabled bundles
- an explicitly selected disabled version blocks the transaction with a
  validation error instead of silently re-packing another version
- Product Bundle Balance report excludes disabled bundles
- list view indicator: Disabled (grey) / Active (green), falling back to
  docstatus for drafts, cancelled and inactive submitted versions

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
(cherry picked from commit cf37478870)

# Conflicts:
#	erpnext/controllers/selling_controller.py
#	erpnext/public/js/controllers/transaction.js
#	erpnext/selling/doctype/product_bundle/product_bundle.json
#	erpnext/selling/doctype/product_bundle/product_bundle.py
#	erpnext/stock/doctype/packed_item/packed_item.py
#	erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
 2026-06-10 06:12:50 +00:00
Mihir Kandoi
743afc972d feat: create sales invoice from pick list (backport #55594) (#55635) 2026-06-04 17:17:26 +00:00
mergify[bot]
84d205f553 fix: prevent selling items from sample retention warehouse (backport #55613) (#55634) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: prevent selling items from sample retention warehouse (#55613)
 2026-06-04 16:50:34 +00:00
mergify[bot]
0274afe560 perf: batch status check for on-hold/closed documents, remove N+1 queries (backport #54798) (#55573) 
* perf: batch status check for on-hold/closed documents, remove N+1 queries (#54798)

(cherry picked from commit 5074597d00)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Shubh Doshi <124681920+shubhdoshi21@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 16:00:54 +00:00
mergify[bot]
b11365b8c2 fix: valuation rate missing for standalone credit notes for moving av… (backport #55102) (#55104) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: valuation rate missing for standalone credit notes for moving av… (#55102)
 2026-05-20 11:49:54 +00:00
Rohit Waghchaure
e361afb6bc fix: hardcoded precision causing decimal issues 
(cherry picked from commit 90fd6f2e40)
 2026-04-08 06:50:17 +00:00
Rohit Waghchaure
7af4acab29 fix: do not set valuation rate for invoice without update stock 
(cherry picked from commit bec9e48435)
 2026-03-16 18:03:55 +00:00
kavin-114
c7928a0749 fix(selling): handle selling price validation for FG item 
System checks valuation rate in incoming_rate field, since SO has it in valuation_rate field of item row,
need to handle the field name dynamically based upon the doctype name in Selling Controller.

(cherry picked from commit 4335318482)
 2026-03-03 15:40:48 +00:00
Mihir Kandoi
6e1a8083a5 fix: standalone sales invoice return should not fallback to item master for valuation rate 
(cherry picked from commit a85a0aef52)
 2026-02-23 13:19:55 +00:00
Mihir Kandoi
9997185071 Merge pull request #52246 from mihir-kandoi/st58765 
(cherry picked from commit 135a433018)
 2026-02-02 15:15:38 +00:00
Mihir Kandoi
024e7b01ac fix: reset incoming rate in selling controller if there are changes in item 
(cherry picked from commit 2d6b43fd54)
 2026-02-02 14:18:20 +00:00
kavin-114
0f9bf08685 fix(credit-note): set incoming rate as zero for expired batch 
(cherry picked from commit e78c750b4e)
 2026-01-28 10:43:58 +00:00
Raffael Meyer
b6cb9d4799 fix: don't duplicate default income account to Item (#50413) 
* fix: don't duplicate default income account to Item

Only store _Default Income Account_ in **Item** if it's different from the **Company**'s  _Default Income Account_.

Resolves #48231

* refactor: move db call out of loop

* docs: add docstring
 2025-12-25 10:22:37 +01:00
Mihir Kandoi
074bdd119b fix: check if terms is not set in selling controller 2025-12-10 21:58:16 +05:30
Mihir Kandoi
8cb0632081 fix: make sure buying/selling default terms from company master is default 2025-12-10 14:08:22 +05:30
Raffael Meyer
4d9473f844 feat(Company): allow setting default sales contact, fetch into sales transaction (#50159) 2025-11-18 16:33:21 +05:30
Smit Vora
12008b775f Merge pull request #50439 from ljain112/fix-lead-quotation 2025-11-17 19:08:31 +05:30
Mihir Kandoi
316b6d6867 feat: company wise valuation method 2025-11-17 10:37:11 +05:30
ljain112
0b91338771 fix: add doctype parameter to lead details for correct company details 2025-11-10 17:34:19 +05:30
Rohit Waghchaure
1d57bbca11 test: test case for sales return for product bundle 2025-10-09 13:56:04 +05:30
Rohit Waghchaure
13ce7279a8 fix: sales return for product bundle items 2025-10-09 10:15:42 +05:30
Rohit Waghchaure
99b7a9d15c refactor: posting datetime for SABB 2025-09-24 23:15:55 +05:30
Rohit Waghchaure
4cac80a968 fix: sre status and delivered qty 2025-08-25 21:00:08 +05:30
Mihir Kandoi
dbaa44688e fix: modify all remaining SRE queries to consider new Closed status 2025-08-11 10:21:16 +05:30
Rohit Waghchaure
bb7ddd11f1 fix: added serial no condition 2025-07-15 17:27:00 +05:30
Rohit Waghchaure
e073075834 fix: system was allowing credit notes with serial numbers for any customer 2025-07-15 14:00:04 +05:30
Rohit Waghchaure
b06eca8dcb fix: incoming rate for the stand-alone credit note 2025-06-23 20:47:25 +05:30
Rohit Waghchaure
2f0c0c2b59 fix: test case 2025-06-19 16:55:22 +05:30
Rohit Waghchaure
57429e5d90 fix: Reservation Based On in the reservation entry 2025-06-17 09:14:40 +05:30
Ankush Menat
d16a6d42a5 perf: Use lazy loaded documents (#48017) 
* perf: Use lazy docs for status updaters and similar use cases

* perf: lazy load documents while reposting
 2025-06-11 10:27:08 +00:00
Ankush Menat
765c7c2bcc refactor: rename get_settings -> get_single_value (#47961) 2025-06-09 04:40:02 +00:00
Ankush Menat
73746e2c71 perf: use cached selling settings (#47949) 
* perf: Use cached stock repost settings

* perf: Use cached selling settings
 2025-06-06 14:10:12 +00:00
Ankush Menat
ea5c2c454b perf: use cached stock settings (#47945) 2025-06-06 18:54:49 +05:30
Ankush Menat
4dc2969fa6 perf: avoid duplicate fetching of stock qty 2025-06-05 22:31:35 +05:30
rohitwaghchaure
d8cb073eaf fix: create Quality Inspection button not showing (#47746) 2025-05-27 12:18:39 +05:30
Rohit Waghchaure
229a4cef45 fix: Recreate Stock Ledgers issue 2025-04-09 12:37:02 +05:30
Rohit Waghchaure
3333331a3d fix: serial no status for internal transfer delivery note 2025-02-18 12:59:10 +05:30
Rohit Waghchaure
0c9d0ea1f4 fix: stock reservation not working for sales invoice with update stock 2025-02-06 14:46:19 +05:30
Rohit Waghchaure
f976115a2b fix: validation to prevent submission if the SABB is not linked to a stock transaction 2025-01-31 14:04:27 +05:30
Sanket Shah
2a400dd3f8 perf: optimize DB calls with frappe.get_all (#45289) 
* perf: reduce multiple db queries

* fix: use frappe._dict instread of extra iteration

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
 2025-01-23 11:29:41 +05:30
Sagar Vora
279dcabf38 Merge pull request #44443 from sagarvora/minor-perfs 
perf: reduce queries during transaction save
 2024-11-30 00:45:46 +05:30
Sagar Vora
b6b8a06fda perf: reduce queries during transaction save 2024-11-30 00:20:18 +05:30
Sagar Vora
6de7320ef4 perf: cache product bundle items at document level (#44440) 2024-11-29 17:21:32 +00:00
Rohit Waghchaure
d8b9aef14f feat: available qty at company in sales transactions 2024-11-25 16:27:46 +05:30
ljain112
548dbb33eb fix: validate sales team to ensure all sales person are enabled 2024-11-19 14:32:43 +05:30
rohitwaghchaure
6087a57b0c fix: zero incoming rate for delivery note return (#43642) 2024-10-15 11:57:02 +05:30
Dany Robert
c79851239c fix: invalid gp calculation 2024-09-12 09:18:19 +00:00
barredterra
af0ae930ca fix: translatability of boldened text 2024-08-16 21:38:56 +02:00
rohitwaghchaure
f620ef20ae fix: inter transfer delivery note issue with batch (#42552) 2024-07-31 14:17:22 +05:30
Ninad Parikh
723ac0ffc4 fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (#42050) 
* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2024-07-26 18:22:40 +05:30