3331 Commits

Author SHA1 Message Date
mergify[bot]
30daccecc7
fix: do not consider rejected warehouses in pick list (backport #39539) (backport #39804) (#39811)
* fix: do not consider rejected warehouses in pick list (backport #39539) (#39804)

* fix: do not consider rejected warehouses in pick list (#39539)

* fix: do not picked rejected materials

* test: test case for pick list without rejected materials

(cherry picked from commit f6725e43425043eaba7dcdd3cf3768a857a39ee6)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/pick_list/pick_list.json
#	erpnext/stock/doctype/pick_list/pick_list.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fixed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2c8e4c1ab3bde6a9ab37a41d2801c447d76903ef)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py

* chore: fix conflicts

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-08 14:41:58 +05:30
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle
(cherry picked from commit 9fafc83632c4e5c73186bda038b892b7a43d16b8)
2024-02-06 10:18:05 +00:00
mergify[bot]
986273b6d3
feat: copy emails from lead to customer (#38647)
feat: copy emails from lead to customer

(cherry picked from commit 906ac093e37694c4616cffb961b131ce9002315b)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2024-02-05 14:05:44 +05:30
mergify[bot]
aebb0c7979
chore: cleanup doctype descriptions (backport #39637) (#39652)
* chore: cleanup doctype descriptions (#39637)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4cfef201464976f5b4c95dc79f96731)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.json
#	erpnext/stock/doctype/item_price/item_price.json
#	erpnext/stock/doctype/stock_settings/stock_settings.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2024-01-31 12:38:37 +05:30
Gursheen Anand
6b20a7eed1 fix: qtn tests using delivery date
(cherry picked from commit 079cd30b9c80739f6beec910b838b62f077e236b)
2024-01-29 10:22:01 +00:00
Gursheen Anand
5cdc22adf3 fix: do not auto-populate item delivery date
(cherry picked from commit 49cb11c1f357bd73afb0b150a502a418d5560067)
2024-01-29 10:22:00 +00:00
Gursheen Anand
171586db9b fix: make SO item code reqd
(cherry picked from commit 7f8303a493c15a0e32f0b13e464a411c5c4c283b)
2024-01-25 10:50:38 +00:00
Rohit Waghchaure
2905db19e5 fix: Item Tax template is not working for e-commerce
(cherry picked from commit 7d3240ae3a2e8fc761d460793fbddfb2b5cffc09)
2024-01-25 06:07:23 +00:00
Florian HENRY
b2e0d24954 fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template
(cherry picked from commit 6c8f52b26f0601135ec0dd1be94835951936cd11)
2024-01-24 10:43:08 +00:00
Rohit Waghchaure
c7d5857014 fix: UOM needs to be whole number not being checked in quotations
(cherry picked from commit aaf83da3e9a28244c0f57f01a86b98257bdf503b)
2024-01-22 11:55:29 +00:00
ruthra kumar
0acbbefa8b refactor: move 'project' set_query to sales_common.js
(cherry picked from commit 52814724eb3e7d0a350ddeb01214ba3855a1ccc9)
2024-01-22 10:21:28 +00:00
mergify[bot]
53f61f1ad1
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (backport #38322) (#39417)
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322)

* fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item

* fix: evaluate depends_on for fdata visibility in grid

* fix: evaluate depends_on for fdata visibility in grid

* chore: change after review

* chore: change for review

(cherry picked from commit af80d253dbf5d1502f3df4a18b234d392bd96556)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
2024-01-17 10:45:57 +05:30
mergify[bot]
9f793b9b28
fix: incorrect indicator title for portal sales order (backport #39247) (#39255)
fix: incorrect indicator title for portal sales order (#39247)

(cherry picked from commit 2d2ff7cf52a548b8e880cd212cbbe6ef4569ea28)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 17:42:27 +05:30
ruthra kumar
756c062733 fix: total allocated percentage for sales team issue
(cherry picked from commit b498094a9759bb95a3c77c6ec6877aafc6daa0ea)
2024-01-09 07:39:28 +00:00
mergify[bot]
46035ed9ca
fix: remove bad defaults (backport #38986) (#38988)
fix: remove bad defaults (#38986)

Child tables can't have a default.

(cherry picked from commit b71b0d599775cd445acb555f7df6f849056a7a9b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-28 14:22:18 +05:30
ruthra kumar
e0dbb573b1 fix: incorrect price list in customer-wise item price report
(cherry picked from commit 9a00edb03115b72afb4274e6fcf2dc7d5b431657)
2023-12-26 06:17:54 +00:00
mergify[bot]
8c2c90f77a
feat: provision to add items in Stock Reservation dialog (backport #38558) (#38920)
* feat: provision to update items in Stock Reservation dialog

(cherry picked from commit 9471d8fff94f84a627957c5ff2c7f8f1ed53a098)

* fix(ux): show row index and field label while selecting the Sales Order Item

(cherry picked from commit 00261094c8ce0663f953b73ae17a5e7f3f494b59)

* feat: provision to add items in Stock Reservation dialog

(cherry picked from commit 8d5045ef4caf695dbfdc087b78c8f68a79976813)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 15:50:07 +05:30
ruthra kumar
bf98a8f855 fix: typeerror on pos order summary to new order screen
(cherry picked from commit 6a0a08b59c5b1eadbfdc657a131531d0e7461b11)
2023-12-21 06:53:22 +00:00
NIYAZ RAZAK
98fe89a24d fix: incorrect customer outstanding amount (#38475)
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 3df1d75bdd7a34c9fef4c4fe9af9341bc2e6e094)
2023-12-04 08:11:06 +00:00
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209)
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2023-12-04 09:36:52 +05:30
ruthra kumar
602f6ca545 fix: item group filter in sales person wise report
(cherry picked from commit f4d418ea6d28f64d6d1c15c5eea2a75722384c0c)
2023-12-03 11:14:26 +00:00
mergify[bot]
7b363db582
chore: changed sort_order to DESC for customer (backport #38498) (#38501)
chore: changed sort_order to DESC for customer (#38498)

(cherry picked from commit 6bc40373f234af10ce4490529e96c5348d27b7df)

Co-authored-by: Sherin KR <sherinkrply@gmail.com>
2023-12-01 19:09:31 +05:30
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
mergify[bot]
922aef665b
fix: Server Error while creating Product Bundle (backport #38377) (#38380)
* fix: product bundle search input

(cherry picked from commit 729fc738af7d78a6f75cb0f794f4c4451d74cd05)

* fix: don't select all fields

(cherry picked from commit 8c3713b649c7777e35be74b7afe437cec682359e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-28 14:54:05 +05:30
mergify[bot]
14174df862
fix: Negative Qty and Rates in SO/PO (backport #38252) (#38357)
fix: Negative Qty and Rates in SO/PO (#38252)

* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation

(cherry picked from commit b9f5a1c85dc29acc22e704d866178a98f3035c1d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-11-27 09:30:16 +05:30
mergify[bot]
3cbe59902a
fix(ux): Sales Order Stock Reservation Dialog (backport #38261) (#38344)
* fix(ux): no need to select rows to reserve the stock

(cherry picked from commit 9c889b37fb3e6572043c7a28706e43d051e2ff46)

* fix: use field `sales_order_item` instead `name`

(cherry picked from commit 73586fd9b2f9392d18f65a063b14ef2de2629615)

* fix(ux): no need to select rows to unreserve the stock

(cherry picked from commit 2a41da94d443dee51e615b395d18ad161d4e87fc)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-26 22:25:51 +05:30
Raffael Meyer
ea2c3487a3 feat: new Report "Lost Quotations" (#38309)
(cherry picked from commit 477d9fa87e3cd7476f19930d60d23e347e46e658)
2023-11-24 21:28:38 +00:00
Gursheen Anand
e4d9ef1293 fix: condition in other bundle utils
(cherry picked from commit 8bdb61cb87802723a0db1aaa29c30c15c740ec6b)
2023-11-24 04:30:38 +00:00
Gursheen Anand
c0de9c0cef fix: validation for existing bundles
(cherry picked from commit 67f43d37df9e77c3e59562117fa44ea76273a536)
2023-11-24 04:30:38 +00:00
Gursheen Anand
fcd53be188 feat: add disabled field in product bundle
(cherry picked from commit ee76af76812fe04d86653fd1955ad133c8cb5df8)
2023-11-24 04:30:38 +00:00
Gursheen Anand
314a91ac4d fix: skip fixed assets in parent
(cherry picked from commit f9713eeb5690f9e71e01c6c570012f561a633c73)
2023-11-24 04:30:37 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
2023-11-23 10:14:25 +05:30
ruthra kumar
2bec89a5bf chore: fix flakiness test_sales_order_partial_advance_payment
(cherry picked from commit 4dff2c7a0dad1de840a2b1f53d51e9fe1682fa7f)
2023-11-21 07:03:07 +00:00
Deepesh Garg
c29bc8c97f
chore: linting issues 2023-11-19 19:20:06 +05:30
Kunhi
2b9448962f fix: Suppier name was not taken when creating address from supplier
(cherry picked from commit 545ef3c23491e895bf288ddf7666ea80251b41e7)
2023-11-18 14:18:32 +00:00
kunhi
aaccfeb918 fix: issue occured when creating supplier with contact details
(cherry picked from commit 7842c9fba8b521b9ba7f65281c4f2384f62b06e1)
2023-11-18 14:18:31 +00:00
David Arnold
ea43862fcd fix(dn): regression from bulk transaction fix
(cherry picked from commit 426c245032bccc93b79d0505f853bc25ae51f37e)
2023-11-16 07:13:47 +00:00
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099)
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-14 20:11:19 +05:30
bVisible
011cf3d73e
fix: Identical items are added line by line instead of grouped together in POS (#37986)
fix: Identical items are added line by line instead of grouped together in POS (#37986)
2023-11-13 14:01:42 +05:30
barredterra
6f2b34e7d5 fix: deprecate unused create_contact 2023-11-12 20:01:10 +01:00
barredterra
d3d10231b9 test: parse full name 2023-11-12 19:44:01 +01:00
barredterra
f61b476be1 refactor: parse full name 2023-11-12 19:43:51 +01:00
barredterra
0142a9308b chore: resolve conflicts 2023-11-12 19:43:01 +01:00
David Arnold
fc09d757f0 fix(customer): contact creation for companies (#38055)
(cherry picked from commit 9fde7824035580a3d8bd0b48a2e1a3d2ffc46082)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
2023-11-12 18:06:57 +00:00
mergify[bot]
cff56d4e50
fix: close Credit Limit Crossed dialog (backport #38052) (#38059)
fix: close `Credit Limit Crossed` dialog (#38052)

(cherry picked from commit 94faa44697144157940a874090fd1bd02c1eb981)

Co-authored-by: Arjun <arjun99c@gmail.com>
2023-11-12 18:07:16 +05:30
mergify[bot]
02e225845e
fix(customer): quick form and integration fixes (#37386)
fix(customer): quick form and integration fixes (#37386)

(cherry picked from commit ae508144cdce348af11c406f6fd30e73f4dc3879)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
2023-11-11 20:19:22 +05:30
mergify[bot]
40cc3a7610
fix: sales order not assigned to territory orders (backport #37905) (#38025)
fix: sales order not assigned to territory orders (#37905)

filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output

(cherry picked from commit 45b4bfc94783bb0180c0a57a2f3a5bb7086008a3)

Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
2023-11-09 21:52:27 +05:30
Deepesh Garg
964a7a3dbd
Merge pull request #37824 from frappe/mergify/bp/version-15-hotfix/pr-37590
fix: gov compliance for tax withholding report (#37590)
2023-11-01 15:22:10 +05:30
Gursheen Anand
6df125a05f feat: proprietorship & partnership options in entity type
(cherry picked from commit ed2457bddfaedc83301a96f9d77b093b36d15a72)
2023-11-01 08:40:20 +00:00
Gursheen Anand
71538cfab1 fix: validate so item with qtn
(cherry picked from commit 17ebc1ea8096a83e882bedd00f358a4bd799eff4)
2023-11-01 08:34:49 +00:00