CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 17:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,747 Commits 396 Branches 1,698 Tags
3e09abc4959ea6301dfdcda333dacb59eb9d30af
Commit Graph

50747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
ruthra kumar
3117052779 Merge pull request #45589 from frappe/mergify/bp/version-15-hotfix/pr-45441 
fix: show payment entries in tax withheld vouchers (backport #45441)
 2025-01-29 15:53:46 +05:30
ruthra kumar
eac5c91c8f Merge pull request #45588 from frappe/mergify/bp/version-15-hotfix/pr-45585 
refactor: auto add taxes from template (backport #45585)
 2025-01-29 15:50:05 +05:30
mergify[bot]
ef2f4118d9 fix: get stock balance filtered by company for validating stock value in jv (backport #45549) (#45578) 
* fix: get stock balance filtered by company for validating stock value in jv (#45549)

* fix: get stock balance filtered by company for validating stock value in jv

* test: error is raised  on validate

(cherry picked from commit 9f20854bd9)

* fix: correct args for test case function

---------

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
 2025-01-29 15:39:30 +05:30
ljain112
8f73978a26 fix: variable names 
(cherry picked from commit d97e78e5d3)
 2025-01-29 10:06:33 +00:00
ljain112
28bb9c39e8 fix: show payment entries in Tax Withheld Vouchers 
(cherry picked from commit 55733d4f18)
 2025-01-29 10:06:33 +00:00
ruthra kumar
aef6b62f7d refactor: auto add taxes from template 
(cherry picked from commit d1086722bf)
 2025-01-29 09:59:20 +00:00
mergify[bot]
a2ffdc7805 fix: return qty error due to precision (backport #45536) (#45581) 
fix: return qty error due to precision

(cherry picked from commit 3078578692)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2025-01-29 12:46:44 +05:30
mergify[bot]
8b0efab13e fix: add multiple item issue in stock entry (backport #45544) (#45580) 
fix: add multiple item issue in stock entry (#45544)

(cherry picked from commit 5a023dc8d4)

Co-authored-by: Ejaaz Khan <67804911+iamejaaz@users.noreply.github.com>
 2025-01-29 12:45:34 +05:30
Mihir Kandoi
6323e641f6 Merge pull request #45542 from frappe/mergify/bp/version-15-hotfix/pr-45282 2025-01-28 18:36:59 +05:30
Mihir Kandoi
6c4655dd72 fix: existing logical error 2025-01-28 16:56:05 +05:30
ruthra kumar
33b5be03a8 Merge pull request #45563 from frappe/mergify/bp/version-15-hotfix/pr-45452 
fix(payment entry): get amount in transaction currency (backport #45452)
 2025-01-28 14:56:51 +05:30
venkat102
b37602c716 fix(payment entry): get amount in transaction currency 
(cherry picked from commit af97f42429)
 2025-01-28 09:04:35 +00:00
ruthra kumar
75a4c31948 Merge pull request #45558 from frappe/mergify/bp/version-15-hotfix/pr-45551 
feat: Add chart of accounts for Switzerland (backport #45551)
 2025-01-28 11:59:40 +05:30
ruthra kumar
eef907a275 chore: rename json to standard name format 2025-01-28 11:41:36 +05:30
eagleautomate
de43c123e2 feat: Add chart of accounts for Switzerland 
240812 Schulkontenrahmen VEB - DE

(cherry picked from commit 2c644ec2ef)
 2025-01-28 06:04:37 +00:00
ruthra kumar
0576c5c37f Merge pull request #45557 from frappe/mergify/bp/version-15-hotfix/pr-45125 
fix: update fields on change of item code In `Update Items` of `Sales Order` (backport #45125)
 2025-01-28 11:32:18 +05:30
Sanket Shah
f60a3bcedf fix: update fields on change of item code In Update Items of Sales Order (#45125) 
* fix: update fields on change of item code

* fix: minor update

* fix: set the new values always

* Revert "fix: set the new values always"

This reverts commit 44daa0a641.

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 9933d3c8ff)
 2025-01-28 05:58:28 +00:00
Mihir Kandoi
1be19819fb fix: removed field not present in v15 2025-01-28 10:09:31 +05:30
Mihir Kandoi
b59d253d93 fix: import 2 2025-01-27 22:55:33 +05:30
Mihir Kandoi
d74c498efe fix: import 2025-01-27 22:17:13 +05:30
Mihir Kandoi
57f79a2240 fix: merge conflict 2025-01-27 22:01:13 +05:30
Raffael Meyer
fb1ea9524b chore: bump actions/cache to v4 (#45541) 2025-01-27 13:29:51 +01:00
ruthra kumar
8d30b4d14e Merge pull request #45539 from frappe/mergify/bp/version-15-hotfix/pr-45345 
fix:  maintain existing discounts in get_pricing_rule_for_item (backport #45345)
 2025-01-27 17:35:27 +05:30
Mihir Kandoi
c102e51eb1 fix: logical error in where condition of qb query 
(cherry picked from commit 47f8a86003)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 2025-01-27 12:03:40 +00:00
Mihir Kandoi
d6e0c6c969 refactor: added condition which checks for corrective operation setting 
(cherry picked from commit 063a205e5a)
 2025-01-27 12:03:39 +00:00