rohitwaghchaure
51545234d3
Merge pull request #45822 from frappe/mergify/bp/version-15-hotfix/pr-45774
...
fix: AttributeError in `get_item_details` when selecting/scanning batch in Delivery Note (backport #45774 )
2025-02-10 19:02:51 +05:30
mergify[bot]
035758f47d
fix: pos numpad editable action buttons (backport #45823 ) ( #45826 )
...
fix: pos numpad editable action buttons (#45823 )
(cherry picked from commit 0b9c28620fdiptanil@frappe.io >
2025-02-10 16:28:59 +05:30
DaizyModi
6dc99f95c0
fix: Attibute error selling_price_list
...
(cherry picked from commit 820b32eb8a
2025-02-10 10:19:49 +00:00
ruthra kumar
f440795809
Merge pull request #45816 from frappe/mergify/bp/version-15-hotfix/pr-45747
...
fix: Handle Empty JSON in Report Parsing (backport #45747 )
2025-02-10 12:10:43 +05:30
Sanket322
eeb322bd0e
fix: handle response when json is None
...
(cherry picked from commit 133e0417b8
2025-02-10 06:12:45 +00:00
ruthra kumar
9a5aa8eeb9
Merge pull request #45813 from frappe/mergify/bp/version-15-hotfix/pr-45793
...
fix: unable to remove image from employee (backport #45793 )
2025-02-10 11:01:00 +05:30
ruthra kumar
1f967f7e9d
Merge pull request #45814 from frappe/mergify/bp/version-15-hotfix/pr-45762
...
refactor: set received and paid amount based on each other, if unset (backport #45762 )
2025-02-10 11:00:48 +05:30
rohitwaghchaure
3c386c2062
Merge pull request #45811 from frappe/mergify/bp/version-15-hotfix/pr-45810
...
fix: not able to select the item in the sales invoice (backport #45810 )
2025-02-10 10:41:31 +05:30
ruthra kumar
1d6c50c9a1
chore: resolve conflict
2025-02-10 10:38:18 +05:30
ruthra kumar
e589c5b6ef
refactor: set paid amount based on received amount if unset
...
(cherry picked from commit 99e721e622
2025-02-10 05:08:05 +00:00
ruthra kumar
6638b391ff
refactor: set received amount based on paid amount
...
(cherry picked from commit 5ff540bd82
2025-02-10 05:08:05 +00:00
Asmita Hase
e3cceb894b
fix: unable to remove image from employee
...
fix: employee image disappears when newly created user_id is linked to employee
(cherry picked from commit 0207d2d7b6
2025-02-10 05:03:12 +00:00
Rohit Waghchaure
a649001886
fix: not able to select the item in the sales invoice
...
(cherry picked from commit 35388e7a04
2025-02-10 04:39:40 +00:00
rohitwaghchaure
39e3746a62
Merge pull request #45775 from frappe/mergify/bp/version-15-hotfix/pr-45767
...
fix: the project document timed out while opening (backport #45767 )
2025-02-10 10:09:38 +05:30
ruthra kumar
9702a192d7
Merge pull request #45770 from Sanket322/update_ctx_to_args
...
Fix: Update `ctx` to `args` for compatibility.
2025-02-07 19:43:53 +05:30
ruthra kumar
a051ddee6d
Merge pull request #45788 from frappe/mergify/bp/version-15-hotfix/pr-45640
...
feat: add repost accounting ledger entry for payment entry (backport #45640 )
2025-02-07 17:15:33 +05:30
ruthra kumar
be09700d8b
Merge pull request #45789 from frappe/mergify/bp/version-15-hotfix/pr-45644
...
fix: add allow_on_submit for party_balance, paid_from_account_balance and paid_to_account_balance (backport #45644 )
2025-02-07 17:15:22 +05:30
l0gesh29
757dd3f0b6
feat: add repost accounting ledger entry for payment entry
...
(cherry picked from commit 5676d60ed3
2025-02-07 10:41:54 +00:00
Sugesh393
086c36fca6
fix: add allow_on_submit for party_balance, paid_from_account_balance and paid_to_account_balance
...
(cherry picked from commit 707c01487e
2025-02-07 10:41:54 +00:00
ruthra kumar
a7d32b580f
Merge pull request #45784 from frappe/mergify/bp/version-15-hotfix/pr-45639
...
fix: '0' rate LDC's Invoice net totals should be ignored (backport #45639 )
2025-02-07 13:43:58 +05:30
ruthra kumar
43d75b96c6
chore: resolve conflict
2025-02-07 13:18:42 +05:30
ruthra kumar
3734289983
test: ldc @ 0 rate
...
(cherry picked from commit 0cdd346f8f
2025-02-07 07:44:11 +00:00
ruthra kumar
96c19cd990
fix: '0' rate LDC's Invoice net totals should be ignored
...
(cherry picked from commit 325c4e3536
2025-02-07 07:44:11 +00:00
rohitwaghchaure
08a6f4e6d3
chore: fix conflicts
2025-02-06 22:09:44 +05:30
Rohit Waghchaure
28cbce4356
fix: the project document timed out while opening
...
(cherry picked from commit 33d03b1542
2025-02-06 16:38:46 +00:00
Sanket322
d4bc3d182f
fix: update ctx to args
2025-02-06 17:55:37 +05:30
ruthra kumar
e422ae16e5
Merge pull request #45743 from frappe/mergify/bp/version-15-hotfix/pr-45604
...
fix: filter the item tax template using the input text (backport #45604 )
2025-02-05 17:13:07 +05:30
rohitwaghchaure
dcdd8e9824
Merge pull request #45742 from frappe/mergify/bp/version-15-hotfix/pr-45734
...
fix: added correct options for incoming_rate field of delivery note item (backport #45734 )
2025-02-05 17:08:16 +05:30
rohitwaghchaure
9d98d0efc8
Merge pull request #45744 from frappe/mergify/bp/version-15-hotfix/pr-45741
...
fix: removed unused field (backport #45741 )
2025-02-05 17:07:46 +05:30
rohitwaghchaure
af60368e54
Merge pull request #45740 from frappe/mergify/bp/version-15-hotfix/pr-45692
...
fix: fetch rate from item price list when document is saved (backport #45692 )
2025-02-05 16:42:00 +05:30
rohitwaghchaure
ab37e5754b
chore: fix conflicts
2025-02-05 16:40:20 +05:30
Rohit Waghchaure
9a27d3cedc
fix: removed unused field
...
(cherry picked from commit 2d7a576da5
2025-02-05 11:09:40 +00:00
ruthra kumar
0b591ba7eb
chore: resolve conflicts
2025-02-05 16:37:09 +05:30
Bhavan23
8ea9a9e467
fix: filter the item tax template using the input text
...
(cherry picked from commit 4dd37ba033
2025-02-05 11:01:21 +00:00
Mihir Kandoi
cfc50073ed
fix: added correct options for incoming_rate field of delivery note item
...
(cherry picked from commit 417bf49a8d
2025-02-05 10:48:01 +00:00
Mihir Kandoi
25075e5981
test: added test
...
(cherry picked from commit 07adfadd58
2025-02-05 10:23:26 +00:00
Mihir Kandoi
6a03f99546
fix: logical error failing tests
...
(cherry picked from commit fee318a275
2025-02-05 10:23:26 +00:00
Mihir Kandoi
b140ce71d7
fix: fetch rate from item price list when document is saved
...
(cherry picked from commit 1e4b9fbdf0
2025-02-05 10:23:26 +00:00
Khushi Rawat
f72d4b6984
Merge pull request #45738 from frappe/mergify/bp/version-15-hotfix/pr-45735
...
fix: set asset value correctly after cancelling value adjustment (backport #45735 )
2025-02-05 15:51:11 +05:30
ruthra kumar
d86f7839ab
Merge pull request #45737 from frappe/mergify/bp/version-15-hotfix/pr-45717
...
fix(Purchase Invoice): default payment terms template selected while duplicating (backport #45717 )
2025-02-05 15:30:48 +05:30
Khushi Rawat
7f7f403f5b
fix: set asset value correctly after cancelling value adjustment
...
(cherry picked from commit fee3846144
2025-02-05 09:56:11 +00:00
Ejaaz Khan
df0ca2d198
refactor: remove log
...
(cherry picked from commit bfc01441a0
2025-02-05 09:47:59 +00:00
Ejaaz Khan
c52362531c
fix: payment schedule table is empty while duplicating record
...
(cherry picked from commit fb3f08a441
2025-02-05 09:47:59 +00:00
Ejaaz Khan
ca4bb96fb4
fix: default payment terms template selected while duplicating
...
(cherry picked from commit 18127603fe
2025-02-05 09:47:59 +00:00
Khushi Rawat
50d10d5c8d
Merge pull request #45733 from frappe/mergify/bp/version-15-hotfix/pr-42845
...
feat: account heads changed along with journal entry type and descrip… (backport #42845 )
2025-02-05 15:03:27 +05:30
Khushi Rawat
4aa072a8eb
fix: conflicts
2025-02-05 14:44:39 +05:30
Khushi Rawat
223fe62638
fix: resolved conflicts
2025-02-05 14:43:24 +05:30
rahulgupta8848
bbecd36a5d
feat: account heads changed along with journal entry type and descrip… ( #42845 )
...
* feat: account heads changed along with journal entry type and description
* feat: added patch for difference_amount for asset value adjustment and refactor
---------
Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com ”>
(cherry picked from commit d4fdada83c
2025-02-05 09:09:49 +00:00
ruthra kumar
9f28993575
Merge pull request #45732 from frappe/mergify/bp/version-15-hotfix/pr-45590
...
fix: remove tds account in taxes table on change of Tax Withholding C… (backport #45590 )
2025-02-05 14:28:07 +05:30
l0gesh29
1ad16c368e
fix: remove tds account in taxes table on change of Tax Withholding Category
...
(cherry picked from commit 79b5a3e1dd
2025-02-05 08:39:21 +00:00
