nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,630 Commits 402 Branches 1,700 Tags
853ca1fcee8a5176fa700599c0bb34813858d177
Commit Graph

49630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
853ca1fcee chore: resolve conflict 2024-10-22 10:15:28 +05:30
bhaveshkumar.j
50dd8d9df7 fix: remove extra space 
(cherry picked from commit 1561a9e1bf)
 2024-10-22 04:37:49 +00:00
bhaveshkumar.j
aeaadb1e30 fix: coupon code validation logic 
(cherry picked from commit d04257a32d)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/utils.py
 2024-10-22 04:37:49 +00:00
Shariq Ansari
f51c511bcc Merge pull request #43760 from frappe/mergify/bp/version-15-hotfix/pr-43759 
fix: lead create opp from connection not working (backport #43759)
 2024-10-21 20:41:29 +05:30
Shariq Ansari
9e56f213a3 fix: lead create opp from connection not working 
(cherry picked from commit 0dc518b1c3)
 2024-10-21 14:57:43 +00:00
mergify[bot]
1fa9030aee fix: Workspace link for Work Order Consumed Materials report (backport #43753) (#43754) 
fix: Workspace link for Work Order Consumed Materials report (#43753)

(cherry picked from commit e94ffb87cd)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-21 17:15:34 +05:30
ruthra kumar
62226696aa Merge pull request #43742 from frappe/mergify/bp/version-15-hotfix/pr-43726 
fix: "show_remarks" checkbox in Process statement of accounts (backport #43726)
 2024-10-21 13:08:53 +05:30
ruthra kumar
605a30a7e7 Merge pull request #43744 from frappe/mergify/bp/version-15-hotfix/pr-43727 
fix: get period estimate till service end date (backport #43727)
 2024-10-21 13:08:33 +05:30
ruthra kumar
0996aff79d Merge pull request #43746 from frappe/mergify/bp/version-15-hotfix/pr-43720 
fix: party_balance based on company in payment entry (backport #43720)
 2024-10-21 13:08:12 +05:30
ruthra kumar
501c53db05 Merge pull request #43748 from frappe/mergify/bp/version-15-hotfix/pr-42461 
fix: Freeze Screen on load invoices on POS Closing Entry (backport #42461)
 2024-10-21 13:07:54 +05:30
HarryPaulo
f343d5a24d fix: Freeze Screen on load invoices on POS Closing Entry 
(cherry picked from commit 486d396174)
 2024-10-21 06:58:05 +00:00
ljain112
04fbcc64ff fix: party_balance based on company in payment entry 
(cherry picked from commit 97c9adf06b)
 2024-10-21 06:53:44 +00:00
venkat102
148d7e798b fix: get period estimate till service end date 
(cherry picked from commit a7ba7e9c28)
 2024-10-21 06:51:05 +00:00
ljain112
f7717c91bc fix: "show_remarks" checkbox in Process statement of accounts 
(cherry picked from commit f4600df1f7)
 2024-10-21 06:44:29 +00:00
ruthra kumar
c05382fa48 Merge pull request #43740 from frappe/mergify/bp/version-15-hotfix/pr-43728 
fix: get party advance amount based on account (backport #43728)
 2024-10-21 11:53:00 +05:30
venkat102
b673377b70 fix: get party advance amount based on account 
(cherry picked from commit d7fa95dd2f)
 2024-10-21 05:47:54 +00:00
Khushi Rawat
6bbc8e0544 Merge pull request #43733 from frappe/mergify/bp/version-15-hotfix/pr-43723 
fix: do not make new depreciation for fully depreciated asset (backport #43723)
 2024-10-21 02:13:44 +05:30
Khushi Rawat
ddb38db5c4 fix: do not make new depreciation for fully depreciated asset 
(cherry picked from commit 25de412371)
 2024-10-19 16:19:19 +00:00
ruthra kumar
03b5d5a0e0 Merge pull request #43719 from frappe/mergify/bp/version-15-hotfix/pr-43295 
fix: translate Update default_success_action.py (backport #43295)
 2024-10-18 12:05:27 +05:30
Doğancan
f70506fc92 refactor: update default_success_action.py 
The _(doctype) inside get_message is removed from the .format() method. The reason is that _(doctype) would attempt to translate the doctype itself, which is generally not required since the doctypes in doctype_list are system-level terms. The main string "{0} has been submitted successfully" should be translated, and then it should receive the doctype name as an argument.

(cherry picked from commit 804558e5bf)
 2024-10-18 06:18:53 +00:00
ruthra kumar
a58ce52729 Merge pull request #43717 from frappe/mergify/bp/version-15-hotfix/pr-42898 
fix: incorrect amount in bank clearance (backport #42898)
 2024-10-18 10:55:16 +05:30
ruthra kumar
a5d9f5518f Merge pull request #43718 from frappe/mergify/bp/version-15-hotfix/pr-43180 
fix: Call super onload_post_render inside pos_invoice.js (backport #43180)
 2024-10-18 10:54:57 +05:30
devdiogenes
1281d9d21d fix: Call super onload_post_render inside pos_invoice.js 
(cherry picked from commit 4a3eca963c)
 2024-10-18 05:12:33 +00:00
NIYAZ RAZAK
52be45c5df fix: incorrect amount in bank clearance 
(cherry picked from commit 9a11df59fc)
 2024-10-18 05:04:26 +00:00
mergify[bot]
60ffcd0574 fix: added validation for UOM must be whole number (backport #43710) (#43712) 
fix: added validation for UOM must be whole number (#43710)

(cherry picked from commit 4fd4a37dc9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-17 21:34:54 +05:30
ruthra kumar
601ea444ca Merge pull request #43708 from aerele/report-summary-balancesheet 
fix: show total amount on report summary
 2024-10-17 13:32:47 +05:30
venkat102
ab20344141 fix: show total amount on report summary 2024-10-17 12:13:15 +05:30
mergify[bot]
a33d5535a7 fix: list view and form status not same for purchase order (backport #43690) (#43692) 
* fix: list view and form status not same for purchase order (#43690)

(cherry picked from commit a671fe13d4)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/buying/doctype/purchase_order/purchase_order_list.js

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-16 14:57:57 +05:30
mergify[bot]
cd9f949b12 fix(stock): Grab posting date/time from SABB (backport #43493) (#43502) 
fix(stock): Grab posting date/time from SABB (#43493)

(cherry picked from commit ade121dac6)

Co-authored-by: Corentin Forler <10946971+cogk@users.noreply.github.com>
 2024-10-15 17:45:35 +05:30
ruthra kumar
aef544cd53 Merge pull request #43684 from frappe/mergify/bp/version-15-hotfix/pr-43661 
fix: missing child company accounts in consolidated balance sheet (backport #43661)
 2024-10-15 17:37:52 +05:30
ruthra kumar
d34025dc11 Merge pull request #43682 from frappe/mergify/bp/version-15-hotfix/pr-43663 
fix: run gl_entries and closing voucher processes in same function (backport #43663)
 2024-10-15 17:22:39 +05:30
ljain112
4db12fe2da fix: missing child company accounts in consolidated balance sheet 
(cherry picked from commit 7fae9d57d2)
 2024-10-15 11:38:10 +00:00
ljain112
ea12897ce9 fix: run gl_entries and closing voucher processes in same function 
(cherry picked from commit af4daa5b0f)
 2024-10-15 11:35:55 +00:00
ruthra kumar
802d9b2d4a Merge pull request #43680 from frappe/mergify/bp/version-15-hotfix/pr-43602 
fix: added parentheses for correct query formation for logical OR condition (backport #43602)
 2024-10-15 17:03:22 +05:30
mergify[bot]
492ba539e8 fix: refetch items from BOM if 'Use Multi-Level BOM' has changed usin… (backport #43672) (#43676) 
fix: refetch items from BOM if 'Use Multi-Level BOM' has changed usin… (#43672)

fix: refetch items from BOM if 'Use Multi-Level BOM' has changed using api
(cherry picked from commit 05915415de)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:47:40 +05:30
ljain112
21a7dd43a9 fix: added parentheses for correct query formation for logical OR condition 
(cherry picked from commit c0da8f11f7)
 2024-10-15 11:15:59 +00:00
ruthra kumar
50d1fa4665 Merge pull request #43678 from frappe/mergify/bp/version-15-hotfix/pr-43600 
fix: added string for translation in bank reconciliation statement (backport #43600)
 2024-10-15 16:41:06 +05:30
ljain112
e10a58074f fix: added string for translation in bank reconciliation statement 
(cherry picked from commit c99d9f7037)
 2024-10-15 11:02:42 +00:00
mergify[bot]
b2deb89826 fix: conversion factor issue (backport #43645) (#43674) 
fix: conversion factor issue (#43645)

(cherry picked from commit a52756f1d4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:04:48 +05:30
mergify[bot]
c490a66540 fix: incorrect warehouse in the serial no selector for rejection (backport #43671) (#43673) 
fix: incorrect warehouse in the serial no selector for rejection (#43671)

(cherry picked from commit 29ff682eca)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:04:36 +05:30
ruthra kumar
afa0c13587 Merge pull request #43670 from frappe/mergify/bp/version-15-hotfix/pr-43557 
fix: delete invalid pricing rule on change of applicable_for values (backport #43557)
 2024-10-15 15:56:43 +05:30
ljain112
4dbee00b82 test: added test for change in applicable_for_value in promotional scheme 
(cherry picked from commit 2613bdd868)
 2024-10-15 10:00:47 +00:00
ljain112
5d6fc71556 fix: delete invalid pricing rule on change of applicable_for 
(cherry picked from commit 42746fc630)
 2024-10-15 10:00:47 +00:00
ruthra kumar
06dd5e0071 Merge pull request #43666 from frappe/mergify/bp/version-15-hotfix/pr-43662 
fix: removed unused query (backport #43662)
 2024-10-15 13:52:32 +05:30
ruthra kumar
105f9ec2e1 chore: resolve conflict 2024-10-15 13:32:29 +05:30
ruthra kumar
dc6fdbb836 Merge pull request #43660 from frappe/mergify/bp/version-15-hotfix/pr-43642 
fix: zero incoming rate for delivery note return (backport #43642)
 2024-10-15 13:26:32 +05:30
ljain112
8668ae92d8 fix: removed unused query 
(cherry picked from commit 5f590ddfa2)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
 2024-10-15 07:53:44 +00:00
ruthra kumar
ec7e5c48de Merge pull request #43658 from frappe/mergify/bp/version-15-hotfix/pr-43570 
fix: update item details with actual quantity (backport #43570)
 2024-10-15 13:15:39 +05:30
rohitwaghchaure
85088e4aff fix: zero incoming rate for delivery note return (#43642) 
(cherry picked from commit 6087a57b0c)
 2024-10-15 06:28:59 +00:00
Bhavan23
c2c6d27625 fix: update formatings 
(cherry picked from commit 5044297321)
 2024-10-15 06:27:52 +00:00