schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,024 Commits 322 Branches 1,581 Tags
ddcf79da1da6dfe5b9cd7f367bf86c7c41992b21
Commit Graph

40141 Commits

Author SHA1 Message Date
mhh008
ddcf79da1d fix: translation DE 2025-03-04 13:56:19 +01:00
Lakshit Jain
b5fcd682a6 Merge pull request #46268 from frappe/mergify/bp/version-15-hotfix/pr-45896 
fix: auto allocation for negative amount outstanding for Customers in Payment Entry (backport #45896)
 2025-03-04 18:17:15 +05:30
Lakshit Jain
29405498bd Merge pull request #46270 from frappe/mergify/bp/version-15-hotfix/pr-46260 
fix: do not include opening invoices in billed items to be received report (backport #46260)
 2025-03-04 18:16:42 +05:30
Smit Vora
6ab7d98681 Merge pull request #46139 from frappe/mergify/bp/version-15-hotfix/pr-46117 
fix(report): Allow `Closed` Purchase Orders to be Visible in Purchase Order Analysis Report (backport #46117)
 2025-03-04 18:03:47 +05:30
ljain112
eee500f20e fix: do not include opening invoices in billed items to be received report 
(cherry picked from commit c1ddf444c6)
 2025-03-04 11:24:24 +00:00
ljain112
78a329e573 fix: auto allocation for negative amount outstanding for Customers in Payment Entry 
(cherry picked from commit 6275b44a0b)
 2025-03-04 11:20:12 +00:00
Smit Vora
83dcbec86a chore: resolve conflicts 2025-03-04 16:43:55 +05:30
Smit Vora
5b6ed1d077 Merge pull request #46253 from frappe/mergify/bp/version-15-hotfix/pr-46062 
fix: Convert tuple of tuples to list of dicts for dot notation access (backport #46062)
 2025-03-04 16:39:16 +05:30
Smit Vora
284c93ecc2 Merge pull request #46246 from frappe/mergify/bp/version-15-hotfix/pr-46192 
fix: Exclude Cancelled GL Entries (backport #46192)
 2025-03-04 16:38:38 +05:30
Smit Vora
33051ec17e Merge pull request #46245 from frappe/mergify/bp/version-15-hotfix/pr-45972 
fix: Set Taxes Before Calculating Taxes and Totals (backport #45972)
 2025-03-04 16:38:24 +05:30
ruthra kumar
9e54e2ea58 Merge pull request #46266 from frappe/mergify/bp/version-15-hotfix/pr-45751 
fix: change voucher_type and voucher_name field type to data (backport #45751)
 2025-03-04 16:12:40 +05:30
ruthra kumar
c09c4cc243 Merge pull request #46252 from frappe/mergify/bp/version-15-hotfix/pr-46070 
fix: Batch Price gets updated only if it is a billed item (backport #46070)
 2025-03-04 15:49:25 +05:30
ruthra kumar
489efda985 chore: resolve conflict 2025-03-04 15:47:03 +05:30
Sugesh393
3a03865a8f fix: change voucher_type and voucher_no field type to data 
(cherry picked from commit f8ab021920)

# Conflicts:
#	erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
 2025-03-04 10:10:54 +00:00
ruthra kumar
854632dd51 chore: resolve conflict 2025-03-04 15:03:03 +05:30
Sanket322
a8b31df65d fix: test case for debit note 
(cherry picked from commit 6719bbeb10)
 2025-03-04 07:58:31 +00:00
Sanket322
9f4311e7fb fix: fixing test case 
(cherry picked from commit 9b2b477ae0)
 2025-03-04 07:58:31 +00:00
Sanket322
0a65217423 fix: if invoice is return then add amount in proper column 
(cherry picked from commit ccb4bdbe4c)
 2025-03-04 07:58:30 +00:00
Sanket Shah
ef195513d0 fix: Convert tuple of tuples to list of dicts for dot notation access (#46062) 
fix: use as_dict to convert tuples into list of dict

Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit e4b0ab6656)
 2025-03-03 16:09:45 +00:00
mergify[bot]
f3cafef6a7 fix(patch): Ensure SLE indexes (backport #46131) (#46135) 
* fix(patch): Ensure SLE indexes (#46131)

Because of the way this change was pushed in parts, some sites don't see
this as "update" and don't have the new indexes.

(cherry picked from commit f62aa8fc57)

# Conflicts:
#	erpnext/patches.txt

* fix: resolved conflict

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2025-03-03 21:37:02 +05:30
ruthra kumar
6762dc3392 chore: linter fix 
(cherry picked from commit 0a2193e458)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Nirmalrajaa K
dbd47dff98 fix: Batch Price gets updated only if it is a billed item 
(cherry picked from commit 1a56b83054)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Nirmalrajaa K
8ed512f6c6 fix: Batch Price gets updated only if it is a billed item 
(cherry picked from commit 9597b1a69e)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Marica
3a6ef2564e Merge pull request #46073 from 0xD0M1M0/fix-discount-accounting-v15 
fix: discount accounting for v15
 2025-03-03 19:46:51 +05:30
Smit Vora
35df539da3 chore: fix linters 2025-03-03 17:02:15 +05:30
Ninad1306
5e083861a4 fix: exclude cancelled gl entries 
(cherry picked from commit 3251a331dd)
 2025-03-03 11:28:57 +00:00
Ninad1306
41e9a10ab4 test: validate fetching of taxes based on taxes and charges template 
(cherry picked from commit 196ef7ac4e)
 2025-03-03 11:27:45 +00:00
Ninad1306
90dea426d8 fix: set taxes before calculating taxes and totals 
(cherry picked from commit 0fd0695bbb)
 2025-03-03 11:27:45 +00:00
rohitwaghchaure
9082ff6aa9 Merge pull request #46242 from frappe/mergify/bp/version-15-hotfix/pr-46239 
fix: incorrectly billed amount in the purchase receipt (backport #46239)
 2025-03-03 16:16:09 +05:30
Rohit Waghchaure
e94f0b1cca fix: incorrect batch picked 
(cherry picked from commit d2564cad68)
 2025-03-03 09:24:24 +00:00
Rohit Waghchaure
c247cf888b fix: incorrectly billed amount in the purchase receipt 
(cherry picked from commit a5271fdb2e)
 2025-03-03 09:15:48 +00:00
venkat102
899e468f6a fix(asset depreciation schedules): enable auto commit 
(cherry picked from commit a4b24f7451)
 2025-03-03 06:42:02 +00:00
mergify[bot]
faee8d6c5e fix: don't allow renaming account while system is actively in use (backport #46176) (#46210) 
fix: don't allow renaming account while system is actively in use (#46176)

(cherry picked from commit 999f1cf96d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2025-03-03 11:16:37 +05:30
rohitwaghchaure
c0f736736e Merge pull request #46217 from frappe/mergify/bp/version-15-hotfix/pr-46202 
fix: rearrange stock settings fields (backport #46202)
 2025-03-03 10:15:36 +05:30
rohitwaghchaure
c48e157a25 Merge pull request #46224 from frappe/mergify/bp/version-15-hotfix/pr-46219 
fix: stock qty not recalculate on changing of the qty (backport #46219)
 2025-03-03 08:24:05 +05:30
mergify[bot]
84ca0ada1b refactor: using function to unset grand total to default mode of payment in pos (backport #46228) (#46229) 
refactor: using function to unset grand total to default mode of payment in pos (#46228)

(cherry picked from commit 62c3915ecb)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-03-03 01:59:13 +05:30
Rohit Waghchaure
331798babc fix: stock qty not recalculate on changing of the qty 
(cherry picked from commit 464e3339fe)
 2025-03-02 06:46:56 +00:00
rohitwaghchaure
93fed0ce86 chore: fix conflicts 2025-03-01 12:53:44 +05:30
Rohit Waghchaure
87703c6511 fix: rearrange stock settings fields 
(cherry picked from commit 93f461c6f3)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-03-01 06:57:35 +00:00
mergify[bot]
de0dfbca9a fix: pos item detail serial no field (backport #46211) (#46212) 
fix: pos item detail serial no field (#46211)

(cherry picked from commit d2fad44e89)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-28 23:24:49 +05:30
mergify[bot]
0f263bcff2 fix: pos item selection using serial no (backport #46200) (#46203) 
fix: pos item selection using serial no (#46200)

(cherry picked from commit 8fb09decd2)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-28 15:43:59 +05:30
Rohit Waghchaure
a94292a69f fix: removed mandatory property for the cost center field 
(cherry picked from commit 079cf772aa)
 2025-02-28 08:03:51 +00:00
vishakhdesai
3fb9033fb7 fix: payment entry exchange gain loss issue 
(cherry picked from commit 2dbef23244)
 2025-02-28 05:13:43 +00:00
venkat102
b8281c34e2 fix: no permission to get project settings in sales invoice 
(cherry picked from commit 221f1468cb)
 2025-02-26 08:22:24 +00:00
rohitwaghchaure
81ff16248e Merge pull request #46143 from frappe/mergify/bp/version-15-hotfix/pr-46097 
fix: valuation rate for batch (backport #46097)
 2025-02-26 10:16:10 +05:30
Rohit Waghchaure
c72dab49f4 fix: valuation rate for batch 
(cherry picked from commit b88305a95f)
 2025-02-25 17:45:05 +00:00
ruthra kumar
feec16b682 chore: resolve conflicts 2025-02-25 22:53:14 +05:30
venkat102
feb64cb9b5 fix: enable fetch_timesheet_in_sales_invoice in test 
(cherry picked from commit 5880f1d5c6)

# Conflicts:
#	erpnext/projects/doctype/timesheet/test_timesheet.py
 2025-02-25 16:56:57 +00:00
venkat102
97d3e8648b fix: check value as int 
(cherry picked from commit 43b13b91be)
 2025-02-25 16:56:56 +00:00
venkat102
b1095bb91b fix(sales invoice): check fetch_timesheet_in_sales_invoice enabled before fetching the timesheet 
(cherry picked from commit 914ad357fd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2025-02-25 16:56:56 +00:00