Mihir Kandoi
|
5319683dbf
|
fix: subcontracting valiation precision issue
(cherry picked from commit 8720d412bd)
|
2025-02-04 09:54:08 +00:00 |
|
mergify[bot]
|
6113cc1e43
|
fix: pos payment cash shortcut decimal (backport #45702) (#45705)
fix: pos payment cash shortcut decimal (#45702)
(cherry picked from commit a20116816e)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-02-04 15:14:08 +05:30 |
|
mergify[bot]
|
b915e7f637
|
fix: point of sale padding (backport #45697) (#45699)
fix: point of sale padding (#45697)
(cherry picked from commit 51a65899ec)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-02-04 14:02:38 +05:30 |
|
Shariq Ansari
|
0d03e03925
|
Merge pull request #45695 from frappe/mergify/bp/version-15-hotfix/pr-45694
fix: only system manager was able to create customer & prospect (backport #45694)
|
2025-02-04 12:48:50 +05:30 |
|
Shariq Ansari
|
6149306b78
|
fix: only system manager was able to create customer & prospect
(cherry picked from commit 716edeb465)
|
2025-02-04 06:41:09 +00:00 |
|
rohitwaghchaure
|
a0523c7956
|
Merge pull request #45690 from frappe/mergify/bp/version-15-hotfix/pr-45680
fix: slow SABB query (backport #45680)
|
2025-02-03 23:10:46 +05:30 |
|
Rohit Waghchaure
|
7931c2d182
|
fix: slow SABB query
(cherry picked from commit 81978a0bd8)
|
2025-02-03 17:02:03 +00:00 |
|
rohitwaghchaure
|
7658053dbd
|
Merge pull request #45665 from frappe/mergify/bp/version-15-hotfix/pr-45648
fix: consider process_loss_qty in work order (backport #45648)
|
2025-02-03 20:57:01 +05:30 |
|
ruthra kumar
|
1b85cdcf48
|
Merge pull request #45677 from frappe/mergify/bp/version-15-hotfix/pr-45674
fix: track employee changes (backport #45674)
|
2025-02-03 15:27:03 +05:30 |
|
ruthra kumar
|
16a80cc04a
|
Merge pull request #45675 from frappe/mergify/bp/version-15-hotfix/pr-45631
fix: Do not check for cancelled invoices (backport #45631)
|
2025-02-03 14:32:00 +05:30 |
|
Ankush Menat
|
cf98ebf7fe
|
fix: track employee changes (#45674)
closes https://github.com/frappe/erpnext/issues/45571
(cherry picked from commit 827afbfa2e)
|
2025-02-03 08:52:45 +00:00 |
|
Deepesh Garg
|
84638f58fd
|
fix: Do not check for cancelled invoices
(cherry picked from commit 2c94867b0e)
|
2025-02-03 08:42:28 +00:00 |
|
Deepesh Garg
|
b612ab5823
|
fix: Do not check for cancelled invoices
(cherry picked from commit 701fc02050)
|
2025-02-03 08:42:27 +00:00 |
|
ruthra kumar
|
0d94eba021
|
Merge pull request #45669 from frappe/mergify/bp/version-15-hotfix/pr-45619
feat: set bank account of company to default company bank account fro… (backport #45619)
|
2025-02-03 14:05:23 +05:30 |
|
Shariq Ansari
|
7d95113499
|
Merge pull request #45673 from frappe/mergify/bp/version-15-hotfix/pr-45637
fix: renamed Comments Tab to Notes tab in Lead doctype (backport #45637)
|
2025-02-03 13:27:26 +05:30 |
|
Shariq Ansari
|
afd2529c2a
|
chore: resolved conflict
|
2025-02-03 13:26:33 +05:30 |
|
Shariq Ansari
|
86edcfc1fd
|
fix: renamed Commments Tab to Notes tab in Lead doctype
(cherry picked from commit 018df3135a)
# Conflicts:
# erpnext/crm/doctype/lead/lead.json
|
2025-02-03 07:53:32 +00:00 |
|
Mihir Kandoi
|
b840271d2a
|
feat: set bank account of company to default company bank account from masters
(cherry picked from commit ce7702cc19)
|
2025-02-03 06:31:55 +00:00 |
|
rohitwaghchaure
|
55ac00a510
|
Merge pull request #45667 from frappe/mergify/bp/version-15-hotfix/pr-45621
fix: delivered button of purchase order (backport #45621)
|
2025-02-03 11:58:35 +05:30 |
|
Mihir Kandoi
|
c0b32c446b
|
fix: bind this to function
(cherry picked from commit 41649cf52d)
|
2025-02-03 06:22:47 +00:00 |
|
Mihir Kandoi
|
1522d76a3b
|
fix: consider process_loss_qty in work order
(cherry picked from commit 95fda47b6c)
|
2025-02-03 06:21:40 +00:00 |
|
rohitwaghchaure
|
83e676f128
|
Merge pull request #45647 from frappe/mergify/bp/version-15-hotfix/pr-45646
fix: not able to make manufacturing entry for alternate items (backport #45646)
|
2025-02-03 11:48:03 +05:30 |
|
Rohit Waghchaure
|
eef2f3c5d4
|
fix: not able to make manufacturing entry for alternate items
(cherry picked from commit 1607aa1a44)
|
2025-01-31 18:18:37 +00:00 |
|
rohitwaghchaure
|
821cc215e3
|
Merge pull request #45645 from frappe/mergify/bp/version-15-hotfix/pr-45642
fix: actual qty showing blank for sub-assembly items (backport #45642)
|
2025-01-31 23:22:09 +05:30 |
|
rohitwaghchaure
|
3e09abc495
|
Merge pull request #45617 from rtdany10/expired-batch-pick
fix: ignore expired batch for pick list
|
2025-01-31 22:49:34 +05:30 |
|
Rohit Waghchaure
|
d0748b1b67
|
fix: actual qty showing blank for sub-assembly items
(cherry picked from commit 5be2e71a35)
|
2025-01-31 17:09:00 +00:00 |
|
rohitwaghchaure
|
7fc70e3f20
|
Merge pull request #45638 from frappe/mergify/bp/version-15-hotfix/pr-45626
fix: validation to prevent submission, if the SABB is not linked to a stock transaction (backport #45626)
|
2025-01-31 15:21:43 +05:30 |
|
Rohit Waghchaure
|
24a6f611d8
|
fix: validation to prevent submission if the SABB is not linked to a stock transaction
(cherry picked from commit f976115a2b)
|
2025-01-31 09:14:53 +00:00 |
|
ruthra kumar
|
4b91b7691a
|
Merge pull request #45636 from frappe/mergify/bp/version-15-hotfix/pr-45615
fix: correct error message in payment entry (backport #45615)
|
2025-01-31 14:18:59 +05:30 |
|
ljain112
|
6ea5307b0e
|
fix: correct error message in payment entry
(cherry picked from commit 592704cfd0)
|
2025-01-31 07:27:37 +00:00 |
|
rohitwaghchaure
|
d65101a5f2
|
Merge pull request #45634 from frappe/mergify/bp/version-15-hotfix/pr-45629
fix: attribute 'msgbox' not found in sales invoice.js (backport #45629)
|
2025-01-31 12:11:28 +05:30 |
|
rohitwaghchaure
|
bd8e4eeddc
|
chore: fix conflicts
|
2025-01-31 12:09:50 +05:30 |
|
Mihir Kandoi
|
f6b49845e2
|
fix: attribute 'msgbox' not found in sales invoice.js
(cherry picked from commit 5643385c22)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2025-01-31 06:34:32 +00:00 |
|
mergify[bot]
|
676dde59c2
|
fix: pos print receipt on submit (backport #45632) (#45633)
fix: pos print receipt on submit (#45632)
(cherry picked from commit fe51535392)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-01-31 12:02:47 +05:30 |
|
mergify[bot]
|
72868eee04
|
fix: loading print receipt only at order complete (backport #45627) (#45628)
fix: loading print receipt only at order complete (#45627)
(cherry picked from commit 5a1851dfe3)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-01-31 11:19:23 +05:30 |
|
rohitwaghchaure
|
04c1fc71dd
|
Merge pull request #45614 from frappe/mergify/bp/version-15-hotfix/pr-45612
fix: posting_date to posting_datetime in stock related queries (backport #45612)
|
2025-01-30 21:19:19 +05:30 |
|
Dany Robert
|
786db3d0fa
|
fix: ignore expired batch for pick list
|
2025-01-30 19:34:06 +05:30 |
|
Rohit Waghchaure
|
cd5174e423
|
fix: posting_date to posting_datetime in stock related queries
(cherry picked from commit e61ab48145)
|
2025-01-30 11:36:10 +00:00 |
|
rohitwaghchaure
|
20d5a79839
|
Merge pull request #45613 from frappe/mergify/bp/version-15-hotfix/pr-45609
fix: reposting issue with s3 backup (backport #45609)
|
2025-01-30 17:05:16 +05:30 |
|
Rohit Waghchaure
|
73c1bf972e
|
fix: reposting issue with s3 backup
(cherry picked from commit 6b454ca9a7)
|
2025-01-30 10:29:54 +00:00 |
|
mergify[bot]
|
6301b321d8
|
fix: Gross Profit Report with Correct Totals and Gross Margin (backport #45548) (#45598)
fix: Gross Profit Report with Correct Totals and Gross Margin (#45548)
Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit aaf720ab61)
Co-authored-by: Sanket Shah <113279972+Sanket322@users.noreply.github.com>
|
2025-01-30 11:21:52 +05:30 |
|
mergify[bot]
|
8b75401db9
|
perf: stock entry with batch (backport #45486) (#45602)
perf: stock entry with batch
(cherry picked from commit 0b1b964b77)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
|
2025-01-30 11:21:20 +05:30 |
|
rohitwaghchaure
|
b5856d4f1f
|
Merge pull request #45601 from frappe/mergify/bp/version-15-hotfix/pr-45600
fix: validation message (backport #45600)
|
2025-01-29 20:48:56 +05:30 |
|
Rohit Waghchaure
|
47422111b4
|
fix: validation message
(cherry picked from commit 4c8dff942d)
|
2025-01-29 15:12:39 +00:00 |
|
rohitwaghchaure
|
cc96145ac9
|
Merge pull request #45595 from rohitwaghchaure/fixed-support-29212
fix: do not allow to manually submit the SABB
|
2025-01-29 16:38:19 +05:30 |
|
Rohit Waghchaure
|
2b16eb5381
|
fix: do not allow to manually submit the SABB
|
2025-01-29 16:36:17 +05:30 |
|
ruthra kumar
|
97d9030f26
|
Merge pull request #45594 from frappe/mergify/bp/version-15-hotfix/pr-45569
fix: update voucher outstanding from payment ledger (backport #45569)
|
2025-01-29 16:30:52 +05:30 |
|
ruthra kumar
|
156dcf535d
|
Merge pull request #45592 from frappe/mergify/bp/version-15-hotfix/pr-45586
fix(query): remove duplicate docstatus condition (backport #45586)
|
2025-01-29 16:19:25 +05:30 |
|
ljain112
|
e3855949e1
|
fix: update voucher outstanding from payment ledger
(cherry picked from commit dd77070351)
|
2025-01-29 10:42:27 +00:00 |
|
Safvan Huzain
|
2d2f30e6cf
|
fix(query): remove duplicate docstatus condition (#45586)
fix: remove duplicate docstatus condition in query
(cherry picked from commit 3f2e93dcb6)
|
2025-01-29 10:29:11 +00:00 |
|