CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-14 02:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,723 Commits 396 Branches 1,698 Tags
2d2f30e6cf4aacabe46f827f66dd67f0e6dfd1b6
Commit Graph

50723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mihir Kandoi
5c9ac27478 test: Added test for new feature 
(cherry picked from commit 4fb48b7f22)
 2025-01-27 12:03:39 +00:00
Mihir Kandoi
efc7b9ac56 feat: Add corrective job card operating cost as additional costs in stock entry 
(cherry picked from commit 2bf10f68a8)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
 2025-01-27 12:03:38 +00:00
ruthra kumar
2c3e765896 Merge pull request #45534 from frappe/mergify/bp/version-15-hotfix/pr-45302 
feat: add company level validation for accounting dimension (backport #45302)
 2025-01-27 16:09:32 +05:30
Sanket322
4e347d835e fix: remove applied pricing rule 
(cherry picked from commit 50223c6bec)
 2025-01-27 10:32:53 +00:00
Sanket322
e73aab0df5 fix: use user defined discount amount or default 
(cherry picked from commit e2a32b7257)
 2025-01-27 10:32:53 +00:00
ruthra kumar
bcd3351999 refactor(test): update test data 2025-01-27 15:46:39 +05:30
Sugesh393
67e45cf002 chore: update variable names for improved readability 
(cherry picked from commit 36bae55299)
 2025-01-27 15:18:24 +05:30
Sugesh393
149827562b fix: set company related values 
(cherry picked from commit 454067198e)
 2025-01-27 15:18:19 +05:30
Sugesh393
fac4e99b0e test: add new unit test for company validation in accounting dimension 
(cherry picked from commit c94091d68f)
 2025-01-27 09:25:02 +00:00
Sugesh393
8f0d270746 feat: add company level validation for accounting dimension 
(cherry picked from commit 60efd3e219)
 2025-01-27 09:25:01 +00:00
ruthra kumar
a718737931 Merge pull request #45530 from frappe/mergify/bp/version-15-hotfix/pr-45284 
fix: set party_account_currency for pos_invoice returns (backport #45284)
 2025-01-27 14:54:11 +05:30
Nabin Hait
b004855e7c Revert "feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295)" (#45531) 
Revert "feat(Sales Invoice): allow linking to project without adding timeshee…"

This reverts commit 2c2a25ab16.
 2025-01-27 14:31:44 +05:30
Sugesh393
6a382f1430 test: add new unit test to check payments amount of pos_invoice returns 
(cherry picked from commit 484ecf2479)
 2025-01-27 08:58:58 +00:00
Sugesh393
172fdad244 fix: set party_account_currency for pos_invoice returns 
(cherry picked from commit 2af6fca7fa)
 2025-01-27 08:58:58 +00:00
mergify[bot]
2c2a25ab16 feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295) (#45528) 
feat(Sales Invoice): allow linking to project without adding timesheets (#44295)

* feat(Sales Invoice): allow linking to project without adding timesheets

* test: add timesheet data

(cherry picked from commit 11f65f20a0)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-27 14:26:19 +05:30
mergify[bot]
ff46ae5bc1 fix: currency decimal on POS Past Order List (backport #45524) (#45527) 
fix: currency decimal on POS Past Order List (#45524)

* fix: currency decimal on POS

* fix: removed precision

(cherry picked from commit 2ac8c92e7f)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-01-27 13:21:40 +05:30
mergify[bot]
692a44816f feat(UX): scroll to required field (backport #44367) (#45433) 
feat(UX): scroll to required field (#44367)

(cherry picked from commit 4008ca5ddd)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-26 12:14:44 +05:30
rohitwaghchaure
f3b8d6867b Merge pull request #45448 from frappe/mergify/bp/version-15-hotfix/pr-45443 
fix: allow to fix negative stock for batch using stock reco (backport #45443)
 2025-01-25 15:21:16 +05:30
Rohit Waghchaure
69c5695f6e fix: allow to fix negative stock for batch using stock reco 
(cherry picked from commit 2e8cde3378)
 2025-01-25 09:34:11 +00:00
mergify[bot]
f9d96726f0 fix: secure bulk transaction (backport #45386) (#45426) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: secure bulk transaction (#45386)
 2025-01-24 17:18:50 +01:00
rohitwaghchaure
4aa92572ef Merge pull request #45438 from frappe/mergify/bp/version-15-hotfix/pr-45432 
fix: do not check budget during reposting (backport #45432)
 2025-01-24 20:09:22 +05:30
rohitwaghchaure
f2b946d325 fix: do not check budget during reposting (#45432) 
(cherry picked from commit 53704b98b5)
 2025-01-24 12:02:13 +00:00
rohitwaghchaure
13c7fceb91 Merge pull request #45435 from frappe/mergify/bp/version-15-hotfix/pr-45423 
fix: precision issue in stock entry (backport #45423)
 2025-01-24 17:25:43 +05:30
Rohit Waghchaure
fe5e42d2dc fix: precision issue in stock entry 
(cherry picked from commit 9f3b8520fe)
 2025-01-24 11:38:02 +00:00