Rohit Waghchaure
7de15b74d4
fix: option to pick serial / batch for asset repair
...
(cherry picked from commit ae77c609ff )
# Conflicts:
# erpnext/assets/doctype/asset_repair/asset_repair.py
# erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
2025-06-27 09:59:22 +00:00
mergify[bot]
af55ce0f6c
fix: use label "State/Province" for translatability (backport #48273 ) ( #48286 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
fix: use label "State/Province" for translatability (#48273 )
2025-06-26 20:49:06 +02:00
mergify[bot]
b6e09531d7
fix: customer section on pos item cart (backport #48284 ) ( #48285 )
...
* fix: customer section on pos item cart (#48284 )
* fix: customer recent transactions
* fix: pos customer section display customer_name instead of customer name
(cherry picked from commit e1d9f863c6 )
# Conflicts:
# erpnext/public/scss/point-of-sale.scss
# erpnext/selling/page/point_of_sale/point_of_sale.py
# erpnext/selling/page/point_of_sale/pos_item_cart.js
* chore: resolve conflict
* chore: resolve conflict
* chore: resolve conflict
---------
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-06-26 23:20:38 +05:30
mergify[bot]
8f47505604
fix: better integration of Pick List with Delivery Note (backport #47831 ) ( #48158 )
...
* fix: better integration of Pick List with Delivery Note (#47831 )
Co-authored-by: priyanshshah2442 <priyanshshah2442@gmail.com >
(cherry picked from commit 527cfe9c7d )
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/pick_list/pick_list.py
# erpnext/stock/doctype/pick_list_item/pick_list_item.json
* chore: resolve conflicts
* fix: setting status correctly as per v15 utility
* fix: get items from Pick List to DN even if not linked to Sales Order
---------
Co-authored-by: Smit Vora <smitvora203@gmail.com >
Co-authored-by: Priyansh Shah <108476017+priyanshshah2442@users.noreply.github.com >
2025-06-26 18:25:53 +05:30
Sugesh G
a6c5738f4b
fix: use currency from opportunity while creating quotation ( #45540 )
...
(cherry picked from commit d748b491ee )
2025-06-24 12:10:24 +00:00
mergify[bot]
6511eb4c7c
refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (backport #47691 ) ( #48223 )
...
* refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (#47691 )
(cherry picked from commit 75b5ba6e67 )
# Conflicts:
# erpnext/hooks.py
# erpnext/setup/install.py
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
* fix: permission issue
* fix: space
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2025-06-24 14:51:15 +05:30
mergify[bot]
f85b08d2f5
fix: setup wizard load chart of accounts and fiscal year on change of country (backport #48125 ) ( #48128 )
...
fix: setup wizard load chart of accounts and fiscal year on change of country (#48125 )
(cherry picked from commit 14f0569a39 )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-06-18 17:26:55 +05:30
ljain112
f2b9e73819
fix: incorrect condition for setting party account on change of company
...
(cherry picked from commit 20565f5f19 )
2025-06-17 11:26:13 +00:00
ljain112
ad5421a413
fix: do not reset party account for return doc
...
(cherry picked from commit 7e758a9d5b )
2025-06-17 09:59:44 +00:00
mergify[bot]
66b0426155
feat: populate Timer dialog project field from Timesheet parent_project (backport #47971 ) ( #48001 )
...
feat: populate Timer dialog project field from Timesheet parent_project (#47971 )
* feat: default parent project in timer dialog > project
* chore: fix formatting
* fix: remove unnecessary or condition
---------
(cherry picked from commit bc87609264 )
Co-authored-by: Rahul Agrawal <12agrawalrahul@gmail.com >
Co-authored-by: Rahul Agrawal <deathstarconsole@Rahuls-MacBook-Air.local >
2025-06-10 18:07:28 +05:30
Diptanil Saha
f88e68230a
fix: fetch correct item tax template on item rate update ( #47973 )
2025-06-09 19:23:33 +05:30
Lakshit Jain
4a1966c680
fix: cash flow report fixes
...
(cherry picked from commit 20b87512d1 )
2025-06-03 05:53:23 +00:00
Sanket322
5a23d7cdca
fix: ensure backend response is awaited before saving
...
(cherry picked from commit c48db0b7c0 )
2025-05-28 03:56:00 +00:00
Sanket322
8623a5650b
fix: check return_against exists before api call
...
(cherry picked from commit 00b6b97197 )
2025-05-28 03:56:00 +00:00
Karuppasamy923
92d5e91e1f
feat: add validation for Item Tax Template on rate change
...
(cherry picked from commit a9a957edc7 )
2025-05-27 11:30:15 +00:00
mergify[bot]
60dfe36195
fix: create Quality Inspection button not showing (backport #47746 ) ( #47750 )
...
fix: create Quality Inspection button not showing (#47746 )
(cherry picked from commit d8cb073eaf )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2025-05-27 13:06:32 +05:30
Marica
890ce4a676
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46214
2025-05-13 17:07:43 +02:00
Yaiphalemba Mangshatabam
67d24e9635
fix: typo in event.js
...
"Sales Partners" -> "Sales Partner"
(cherry picked from commit edee75c757 )
2025-05-08 08:40:56 +00:00
marination
f94a14c06a
fix: Headline rendered twice on first save
...
- `refresh` gets triggered twice and that renders the note twice
- Remove any existing note before rendering
(cherry picked from commit bf62f9ad57 )
2025-05-05 16:59:18 +00:00
marination
f8fa775af3
feat: Unit Price Items in Buying (RFQ, SQ, PO)
...
- chore: Extract `set_unit_price_items_note` into a util
(cherry picked from commit e403d3f153 )
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/selling_settings/selling_settings.json
2025-05-05 16:59:16 +00:00
mergify[bot]
8d1e855dc8
fix: rename unchanged group_by filter related to general ledger report (backport #47366 ) ( #47405 )
...
fix: rename unchanged group_by filter related to general ledger report (#47366 )
(cherry picked from commit 3de249dcba )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-05-05 18:01:51 +05:30
mergify[bot]
21612fc230
fix: 'time to resolve: failed' on issue (backport #47406 ) ( #47407 )
...
fix: 'time to resolve: failed' on issue (#47406 )
* fix: 'time to resolve: failed' on issue
* fix: sla_resolution_date
(cherry picked from commit 45393d51a2 )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-05-05 17:50:36 +05:30
ruthra kumar
feb4038c06
chore: resolve conflicts
2025-04-28 11:36:24 +05:30
Smit Vora
62261a276f
refactor: address field position
...
(cherry picked from commit 8ccd7a3e61 )
# Conflicts:
# erpnext/public/scss/erpnext.scss
2025-04-28 05:28:20 +00:00
Karm Soni
ac3b2ba003
fix: correct query for dispatch_address; remove unnecessary code; increase reusability;
...
(cherry picked from commit 999ffe86a7 )
2025-04-28 05:28:19 +00:00
Karm Soni
93ea2f93b6
feat: add display dispatch address when dispatch address is selected
...
(cherry picked from commit d12998e524 )
2025-04-28 05:28:19 +00:00
Karm Soni
5c300b893b
fix: remove use of cur_frm
...
(cherry picked from commit c4bd3123fb )
2025-04-28 05:28:19 +00:00
Karm Soni
290f0b94e5
fix: enhance dispatch address query logic and add supplier address query
...
(cherry picked from commit 9a859e54b6 )
2025-04-28 05:28:18 +00:00
Karm Soni
1fe1563dab
feat: add dispatch address support in party details and controllers
...
(cherry picked from commit 53d0b7be23 )
2025-04-28 05:28:18 +00:00
Rohit Waghchaure
925cc40efa
fix: enable use serial / batch fields on batch selection
...
(cherry picked from commit a4471865a9 )
2025-04-27 13:06:21 +00:00
mergify[bot]
8050e653ab
fix: get total without rounding off tax amounts for distributing discount (backport #47155 )
...
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com >
2025-04-22 17:53:10 +05:30
ljain112
05d4c1e6ca
fix: set default company address in Sales Doctype on change of company
...
(cherry picked from commit a31075692c )
2025-04-22 08:59:04 +00:00
mergify[bot]
390780d871
fix: update country wise fiscal year (backport #47141 ) ( #47176 )
...
fix: update country wise fiscal year (#47141 )
(cherry picked from commit cb2ad4acdb )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-04-21 14:26:47 +05:30
Sagar Vora
846b24ba52
fix: respect mapped accounting dimensions
...
(cherry picked from commit 7dbe27da19 )
2025-04-19 07:22:45 +00:00
venkat102
aa0b93d0b2
fix: fetch exchange rate while creating inter-company order and invoice
...
(cherry picked from commit 145a6c5e2a )
2025-04-15 12:07:54 +00:00
barredterra
14efeb4acd
chore: add context
...
(cherry picked from commit c00f62d54a )
2025-04-08 19:01:35 +00:00
barredterra
35daf669fe
fix: clarify confirmation message
...
(cherry picked from commit 57be8a85d6 )
2025-04-08 19:01:34 +00:00
barredterra
0c260baacd
fix: use the actual field label
...
(cherry picked from commit 8a4db69581 )
2025-04-08 19:01:34 +00:00
barredterra
cf00d42799
fix: recognize trigger from child table
...
(cherry picked from commit c55c77f4e9 )
2025-04-08 19:01:34 +00:00
barredterra
b06a86541b
refactor: use doc parameter instead of this.frm.doc
...
(cherry picked from commit 87c21a89fe )
2025-04-08 19:01:34 +00:00
barredterra
0b0a6b8cfa
feat: update due date in payment schedule
...
Partial backport of b629356b7c
2025-04-08 20:12:25 +02:00
barredterra
830290c859
feat: clear payment terms and schedule
2025-04-08 20:10:31 +02:00
barredterra
98b75aaa38
Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40050
2025-04-08 19:59:34 +02:00
ruthra kumar
81f061634e
Merge pull request #46926 from frappe/mergify/bp/version-15-hotfix/pr-46819
...
fix: Fix fieldtype in UnReconcile dialog (backport #46819 )
2025-04-08 11:51:56 +05:30
Corentin Forler
7dfff8d3a2
fix: Fix fieldtype in UnReconcile dialog
...
(cherry picked from commit 665645721b )
2025-04-08 05:56:37 +00:00
Rohit Waghchaure
fe0e5c2d48
fix: inventory dimensions columns visibility depends on filter
...
(cherry picked from commit 2b411fb7f5 )
2025-04-08 03:21:15 +00:00
Mihir Kandoi
13f1afa141
fix: remove all serial/batch fields when use button is unselected
...
(cherry picked from commit 22ffdb9e77 )
2025-04-07 04:50:55 +00:00
mergify[bot]
d7bb4a288c
fix: make message translatable (backport #46863 ) ( #46866 )
...
fix: make message translatable (#46863 )
(cherry picked from commit 7d12e9afd4 )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2025-04-05 17:37:36 +02:00
mergify[bot]
fcade5d8cd
fix: Translate UnReconcile dialog title (backport #46818 ) ( #46861 )
...
fix: Translate UnReconcile dialog title
(cherry picked from commit f2cfb03c2c )
Co-authored-by: Corentin Forler <corentin@dokos.io >
2025-04-05 17:37:08 +02:00
vishakhdesai
55b17b918f
fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals
...
(cherry picked from commit fd252da6b1 )
2025-04-01 13:34:30 +05:30