nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,485 Commits 399 Branches 1,700 Tags
2984bad2c09061c949a55d8d62f0fa39bbbbdfd2
Commit Graph

49485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
2984bad2c0 fix: Stock Ledger Invariant Check report 
(cherry picked from commit d7daedc5b2)
 2024-09-29 17:07:33 +00:00
mergify[bot]
86b10ce9bb fix: tests for work order consumption (backport #41814) (#43430) 
fix: tests for work order consumption (#41814)

* fix: tests for work order automatic SABB creation

* fix: qty

* chore: show created sabb

* chore: fix syntax

* fix: check SABB qty

* fix: add batched consumable to manufacture

* fix: missing fg qty field

* fix: improve test debug

* chore: linting

* chore: removed extra hash icons

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit ca3c680909)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2024-09-29 22:06:50 +05:30
mergify[bot]
4b3f143f83 fix: Data missing in table: None, MandatoryError (backport #43422) (#43429) 
fix: Data missing in table: None, MandatoryError (#43422)

(cherry picked from commit 8e33e0e1d2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-29 21:18:25 +05:30
mergify[bot]
d495d93840 fix: use serial and batch fields (backport #43421) (#43423) 
fix: use serial and batch fields (#43421)

(cherry picked from commit ca16089d9d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-29 11:09:32 +05:30
mergify[bot]
a1b6628c41 fix: quality inspection creation (backport #43416) (#43417) 
fix: quality inspection creation (#43416)

(cherry picked from commit a594c05296)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-29 09:46:14 +05:30
Deepesh Garg
6d66002374 Merge pull request #43411 from frappe/mergify/bp/version-15-hotfix/pr-43410 
fix: Ignore transaction deletion check on ledger entry insertion (#43410)
 2024-09-27 23:54:54 +05:30
Deepesh Garg
1d6f97ad94 fix: Ignore transaction deletion check on ledger entry insertion 
(cherry picked from commit 998f6a92a4)
 2024-09-27 18:22:41 +00:00
mergify[bot]
74c880c232 fix: serial and batch no selector (backport #43387) (#43390) 
fix: serial and batch no selector (#43387)

(cherry picked from commit e4e96d2a44)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-26 12:06:27 +05:30
mergify[bot]
47f06dc180 fix: Cannot read properties of undefined (reading 'price_list_rate') (backport #43376) (#43377) 
fix: Cannot read properties of undefined (reading 'price_list_rate') (#43376)

(cherry picked from commit a63dca0984)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-25 10:09:17 +05:30
mergify[bot]
40fbb1d6ff fix: not able to cancel Quality Inspection (backport #43374) (#43375) 
fix: not able to cancel Quality Inspection (#43374)

(cherry picked from commit 8c32ebee68)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-25 00:02:24 +05:30
mergify[bot]
0722aa5a3f fix: closing amount reset to expected amount on save (backport #43358) (#43368) 
fix: closing amount reset to expected amount on save (#43358)

(cherry picked from commit 9974b7c4ae)

Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
 2024-09-24 20:49:42 +05:30
mergify[bot]
cfea2de131 fix(Bank Account): dashboard connections (backport #43365) (#43367) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix(Bank Account): dashboard connections (#43365)
 2024-09-24 16:20:50 +02:00
Khushi Rawat
fe206b0d77 Merge pull request #43370 from khushi8112/manual-backport-for-asset-depreciation-and-balances-report-fix 
fix: Manual backport for asset depreciation and balances report fix
 2024-09-24 18:49:01 +05:30
Khushi Rawat
4e621b09ba style: added comment 2024-09-24 18:18:04 +05:30
Khushi Rawat
1f42302997 fix(minor): include condition to check docstatus 2024-09-24 18:17:25 +05:30
Khushi Rawat
0e1884539e fix: added date condition 2024-09-24 18:16:37 +05:30
ruthra kumar
b17a811abf Merge pull request #43364 from frappe/mergify/bp/version-15-hotfix/pr-43356 
fix: AR / AP report to ignore 0.0 outstanding (backport #43356)
 2024-09-24 16:58:35 +05:30
ruthra kumar
979d801de5 fix: AR / AP report to ignore 0.0 outstanding 
(cherry picked from commit 6e2cf79e2c)
 2024-09-24 10:14:53 +00:00
ruthra kumar
49d5b7c4d3 Merge pull request #43360 from frappe/mergify/bp/version-15-hotfix/pr-43235 
fix: set group_by condition to "Group by Voucher (Consolidated)" if `None` and voucher_no is set (backport #43235)
 2024-09-24 15:41:15 +05:30
mergify[bot]
176feb20ad fix: stock dashboard (backport #43347) (#43349) 
fix: stock dashboard (#43347)

(cherry picked from commit 9e8be8db51)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-24 15:25:42 +05:30
Vishakh Desai
ec27077d9c fix: set group_by condition if empty and voucher_no is set 
(cherry picked from commit a6b0cb6cac)
 2024-09-24 09:24:28 +00:00
ruthra kumar
7db135dab5 Merge pull request #43353 from frappe/mergify/bp/version-15-hotfix/pr-43310 
fix: update clearance date in invoice payment table (backport #43310)
 2024-09-24 11:20:43 +05:30
Kavin
8bc76bae9c refactor: update clearance date in payment entry 
(cherry picked from commit c218f7527f)
 2024-09-24 05:29:49 +00:00
Kavin
9d2cbccff2 test: add test case for updating clearance date on pos invoice 
(cherry picked from commit ce8600520f)
 2024-09-24 05:29:49 +00:00
Kavin
10ecdb99fe fix: update clearance date in invoice payment table 
(cherry picked from commit 487c2a29a6)
 2024-09-24 05:29:49 +00:00
ruthra kumar
2aa1380c81 Merge pull request #43351 from frappe/mergify/bp/version-15-hotfix/pr-43257 
fix: item_query in pos_invoice (backport #43257)
 2024-09-24 10:27:33 +05:30
ljain112
99e004b619 fix: item_query in pos_invoice 
(cherry picked from commit 7f82a06e65)
 2024-09-24 02:56:24 +00:00
ruthra kumar
b415e858e7 Merge pull request #43346 from frappe/mergify/bp/version-15-hotfix/pr-43283 
fix: shipping rule must match the company (backport #43283)
 2024-09-24 08:25:18 +05:30
Nihantra C. Patel
4cec68c7ad Merge pull request #43343 from frappe/mergify/bp/version-15-hotfix/pr-43253 
fix: partial return on POS invoice (backport #43253)
 2024-09-23 23:36:04 +05:30
barredterra
085a4c61ac fix: shipping rule must match the company 
(cherry picked from commit df8f4086f6)
 2024-09-23 14:41:18 +00:00
ruthra kumar
5f08ef5cd1 Merge pull request #43344 from frappe/mergify/bp/version-15-hotfix/pr-43299 
fix(Payment Reconciliation): German translations (backport #43299)
 2024-09-23 20:07:53 +05:30
barredterra
e06a01fae5 fix(Payment Reconciliation): German translations 
(cherry picked from commit 32d4f96e02)
 2024-09-23 14:35:49 +00:00
Nihantra C. Patel
998fef779b fix: partial return on POS invoice 
(cherry picked from commit 18bdd06652)
 2024-09-23 14:26:21 +00:00
Nihantra C. Patel
b99ca7d9e9 fix: partial return on POS invoice 
(cherry picked from commit 76289fa8dc)
 2024-09-23 14:26:21 +00:00
ruthra kumar
0fd2964032 Merge pull request #43336 from frappe/mergify/bp/version-15-hotfix/pr-43316 
fix: incorrect outstanding on non-pos invoice with write_off_account (backport #43316)
 2024-09-23 18:22:30 +05:30
ruthra kumar
15baa3f305 Merge pull request #43338 from frappe/mergify/bp/version-15-hotfix/pr-43308 
fix: show chart tool tip in report currency (backport #43308)
 2024-09-23 18:22:06 +05:30
ruthra kumar
5920525369 Merge pull request #43340 from frappe/mergify/bp/version-15-hotfix/pr-43307 
fix: change dynamic link doctype fieldtype to data (backport #43307)
 2024-09-23 18:21:48 +05:30
venkat102
05c92cce71 fix: change dynamic link doctype fieldtype to data 
(cherry picked from commit 1e46f7344a)
 2024-09-23 12:23:52 +00:00
ruthra kumar
a0f01dac1a Merge pull request #43334 from frappe/mergify/bp/version-15-hotfix/pr-43331 
fix: transaction exchange rate on GL's for Multi currency Journals (backport #43331)
 2024-09-23 17:52:51 +05:30
ruthra kumar
e8c174c12b Merge pull request #43333 from frappe/mergify/bp/version-15-hotfix/pr-43321 
fix: handle missing liability account scenario in `set_liability_account` (backport #43321)
 2024-09-23 17:50:06 +05:30
venkat102
927f80035d fix: add currency in financial statement 
(cherry picked from commit 91a27bda84)
 2024-09-23 12:11:54 +00:00
venkat102
e5ae828580 fix: show chart tool tip in report currency 
(cherry picked from commit 827b3f4542)
 2024-09-23 12:11:53 +00:00
ruthra kumar
f89a3dbb65 fix: incorrect outstanding on non-pos invoice with write_off_account 
(cherry picked from commit d5e2906e59)
 2024-09-23 12:09:50 +00:00
ruthra kumar
2d9142832d test: transaction exchange rate on multi-currency journals 
(cherry picked from commit c524825d2d)
 2024-09-23 12:03:59 +00:00
ruthra kumar
a7ccc9420b fix: transaction exchange rate on GL's for Multi currency Journals 
(cherry picked from commit 8cd9ad5361)
 2024-09-23 12:03:59 +00:00
ljain112
40459288f6 fix: handle missing liability account scenario in set_liability_account 
(cherry picked from commit ee7ab4b065)
 2024-09-23 12:00:39 +00:00
ruthra kumar
250a1c9341 Merge pull request #43332 from frappe/mergify/bp/version-15-hotfix/pr-43328 
fix: allow tax rule filter on tax category name with % (backport #43328)
 2024-09-23 17:26:06 +05:30
venkat102
63d4fddb49 fix: make to tax category on tax rule to filter with percent 
(cherry picked from commit 3aaa13cb29)
 2024-09-23 11:47:22 +00:00
mergify[bot]
7e6d6f08a2 fix: ui clean-up (backport #43305) (#43312) 
* fix: ui clean-up (#43305)

fix: ui cleanup
(cherry picked from commit b127a0c8b7)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
#	erpnext/public/js/templates/visual_plant_floor_template.html

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-22 11:18:42 +05:30
Smit Vora
d1c72dc27b Merge pull request #43314 from frappe/mergify/bp/version-15-hotfix/pr-42842 
refactor: use common functionality to validate account number (backport #42842)
 2024-09-21 07:06:49 +05:30