schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,930 Commits 322 Branches 1,581 Tags
965dbb6d2baedaec3caf2d2b387f530e58a39e47
Commit Graph

50930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Khushi Rawat
965dbb6d2b Merge pull request #46006 from frappe/mergify/bp/version-15-hotfix/pr-45895 
fix: do not reschedule depreciation for fully depreciated asset on scrap (backport #45895)
 2025-02-19 14:24:55 +05:30
ruthra kumar
07d4725810 Merge pull request #46008 from frappe/mergify/bp/version-15-hotfix/pr-45904 
fix: fetch child account data for selected parent (backport #45904)
 2025-02-19 14:21:48 +05:30
Bhavansathru
e36b860a79 fix: fetch child account data for selected parent (#45904) 
* fix: fetch child account data for selected parent

* fix: change reference name

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
(cherry picked from commit 73e82b7afa)
 2025-02-19 08:28:59 +00:00
Khushi Rawat
1e7c5ec0cb fix: do not reschedule depreciation for fully depreciated asset on scrap 
(cherry picked from commit fd4c4f98fa)
 2025-02-19 07:37:42 +00:00
rohitwaghchaure
617a24d61e Merge pull request #45994 from frappe/mergify/bp/version-15-hotfix/pr-45980 
fix: check if employee is currently working on another workstation (backport #45980)
 2025-02-19 11:24:05 +05:30
ruthra kumar
6fad501aa0 Merge pull request #46001 from frappe/mergify/bp/version-15-hotfix/pr-45882 
fix(quotation): fetch exchange rate on currency change (backport #45882)
 2025-02-19 11:13:04 +05:30
venkat102
bd89c19c98 fix(quotation): fetch exchange rate on currency change 
(cherry picked from commit 2f77a8bed1)
 2025-02-19 05:21:57 +00:00
Mihir Kandoi
5bccf9f837 fix: throw correct exception 
(cherry picked from commit 4487edb255)
 2025-02-18 15:13:04 +00:00
Mihir Kandoi
22eaa14179 fix: check if employee is currently working on another workstation 
(cherry picked from commit 8234e659c8)
 2025-02-18 15:13:04 +00:00
rohitwaghchaure
d3d0aacd4c Merge pull request #45993 from frappe/mergify/bp/version-15-hotfix/pr-45977 
fix: millisecond issue for posting datetime (backport #45977)
 2025-02-18 20:31:20 +05:30
rohitwaghchaure
69f5be65f6 Merge pull request #45975 from frappe/mergify/bp/version-15-hotfix/pr-45970 
fix: serial no status for internal transfer delivery note (backport #45970)
 2025-02-18 20:23:20 +05:30
rohitwaghchaure
508efd1322 Merge pull request #45990 from frappe/mergify/bp/version-15-hotfix/pr-45976 
fix: slow query (backport #45976)
 2025-02-18 20:22:51 +05:30
rohitwaghchaure
ecc2de2709 Merge pull request #45992 from frappe/mergify/bp/version-15-hotfix/pr-45971 
fix: set sco_qty field of PO to non negative (backport #45971)
 2025-02-18 20:22:39 +05:30
rohitwaghchaure
2e3b19ebb2 chore: fix conflicts 2025-02-18 20:11:02 +05:30
rohitwaghchaure
050bb1eef5 chore: fix conflicts 2025-02-18 20:10:30 +05:30
Rohit Waghchaure
42923656ee fix: millisecond issue for posting datetime 
(cherry picked from commit ac9e5c0163)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/utils.py
 2025-02-18 14:39:39 +00:00
rohitwaghchaure
0acdae02c1 chore: fix conflicts 2025-02-18 20:00:08 +05:30
Mihir Kandoi
567fb8abd1 fix: set sco_qty field of PO to non negative 
(cherry picked from commit dfc3dc4944)
 2025-02-18 14:29:22 +00:00
Rohit Waghchaure
8306d6fdb6 fix: slow query 
(cherry picked from commit 8cfab57fc8)

# Conflicts:
#	erpnext/stock/doctype/packed_item/packed_item.json
 2025-02-18 14:28:19 +00:00
ruthra kumar
20709f1b3e Merge pull request #45979 from frappe/mergify/bp/version-15-hotfix/pr-45765 
fix: add accounting dimensions section in sales order item (backport #45765)
 2025-02-18 17:48:34 +05:30
ruthra kumar
52860cc566 chore: resolve conflict 2025-02-18 14:27:14 +05:30
Sugesh393
b32e4daf2b fix: add accounting dimensions section in sales order item 
(cherry picked from commit 7d47869f4b)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
 2025-02-18 08:42:56 +00:00
Rohit Waghchaure
2b80c009b3 fix: serial no status for internal transfer delivery note 
(cherry picked from commit 3333331a3d)
 2025-02-18 08:22:03 +00:00
ruthra kumar
8da1348a48 Merge pull request #45973 from frappe/mergify/bp/version-15-hotfix/pr-45723 
fix: validate payment request total of partly paid invoice (backport #45723)
 2025-02-18 13:42:58 +05:30
Sugesh393
9a33b877f5 test: add unit test to validate payment request grand_total for partly paid invoice 
(cherry picked from commit f8472c32d9)
 2025-02-18 07:42:28 +00:00
Sugesh393
c8881a9358 fix: validate payment request total of partly paid invoice 
(cherry picked from commit 899c18df18)
 2025-02-18 07:42:28 +00:00
ruthra kumar
f6047d8491 Merge pull request #45968 from frappe/mergify/bp/version-15-hotfix/pr-45687 
fix: add validation to allow equity account (backport #45687)
 2025-02-18 12:12:09 +05:30
rethik
0d2115197e fix: remove party type from validate 
(cherry picked from commit f82837a4a2)
 2025-02-18 06:16:03 +00:00
rethik
552b5a79ce test: add unit test to validate account type and party type 
(cherry picked from commit 9422ce5aee)
 2025-02-18 06:16:02 +00:00
rethik
bb3eb81170 fix: add validate to allow equity account and party_type shareholder 
(cherry picked from commit 2c8e3f3409)
 2025-02-18 06:16:02 +00:00
rohitwaghchaure
7ab69cfe5f Merge pull request #45956 from frappe/mergify/bp/version-15-hotfix/pr-45946 
fix: provision to enable naming series for SABB (backport #45946)
 2025-02-18 07:44:18 +05:30
rohitwaghchaure
43d32eb10e chore: fix conflicts 2025-02-17 21:32:48 +05:30
rohitwaghchaure
697fdf5bc3 chore: fix conflicts 2025-02-17 21:30:15 +05:30
rohitwaghchaure
2f7f9c0bac chore: fix conflicts 2025-02-17 21:29:22 +05:30
Rohit Waghchaure
8fbfe14c63 fix: provision to enable naming series for SABB 
(cherry picked from commit fe43975cdd)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
#	erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-02-17 11:31:46 +00:00
mergify[bot]
38edc46c46 fix: disable partial payment in pos (backport #45752) (#45945) 
* fix: disable partial payment in pos (#45752)

* fix: disable partial payment in pos

* test: disable partial payment

* test: removed print statement

* test: using save method to auto calculate paid_amount

* test: paid_amount calculation using save method

* test: added save method to calculate paid_amount

* test: outstanding amount

* test: added test for partial payments in pos invoice

* fix: custom validation error for partial payment

* test: using partial payment validation

* fix: validate only on submit

(cherry picked from commit d94802067b)

# Conflicts:
#	erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

* chore: resolve conflict

* chore: resolve conflict

* chore: resolve linter issue

* test: fixed failing test

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-17 17:01:34 +05:30
Diptanil Saha
dd34bbe570 fix: pos return validation on v15 (#45951) 2025-02-17 16:03:19 +05:30
rohitwaghchaure
11622f81f3 Merge pull request #45943 from frappe/mergify/bp/version-15-hotfix/pr-45941 
fix: letter head for quality inspection (backport #45941)
 2025-02-17 14:42:56 +05:30
mergify[bot]
e998f063a9 fix: pos accounting dimension fieldname error (backport #45899) (#45921) 
* fix: pos accounting dimension fieldname error (#45899)

* fix: pos accounting dimension fieldname error

* fix: method to get enabled accounting dimensions

* fix: fetch enabled accounting dimensions

* fix: clear flags for accounting_dimensions_details on_update

* refactor: validation for doctype

* fix: using get_checks_for_pl_and_bs_accounts for accounting dimensions

(cherry picked from commit 60a5f4f30d)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

* chore: resolve conflict

* chore: resolve linter issue

* fix: resolve linter issue

* chore: resolve linter issue

* chore: resolve linter issue

* chore: resolve linter issue

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-17 14:13:34 +05:30
Rohit Waghchaure
c289fef3b5 fix: letter head for quality inspection 
(cherry picked from commit cdd41373b6)
 2025-02-17 08:28:52 +00:00
rohitwaghchaure
f8839957da Merge pull request #45913 from frappe/mergify/bp/version-15-hotfix/pr-45903 
fix: allow scrap item with zero qty (backport #45903)
 2025-02-16 13:28:00 +05:30
mergify[bot]
e271a5cba0 feat: disable auto setting grand total to default mode of payment (backport #45591) (#45917) 
feat: disable auto setting grand total to default mode of payment (#45591)

(cherry picked from commit f0a6399056)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-14 17:34:37 +05:30
ruthra kumar
a486e2962e Merge pull request #45919 from frappe/mergify/bp/version-15-hotfix/pr-45912 
fix: include missing payment_gateway parameter in Payment Request URL (backport #45912)
 2025-02-14 17:13:29 +05:30
Navin-S-R
18f94765f7 fix: include missing payment_gateway parameter in Payment Request URL 
(cherry picked from commit dbac8cfc94)
 2025-02-14 11:20:17 +00:00
Rohit Waghchaure
abe5384449 fix: allow scrap item with zero qty 
(cherry picked from commit 706cb64279)
 2025-02-14 09:47:30 +00:00
rohitwaghchaure
698b7a9d00 Merge pull request #45764 from frappe/mergify/bp/version-15-hotfix/pr-45763 
fix: stock reservation not working for sales invoice with update stock (backport #45763)
 2025-02-14 15:16:11 +05:30
rohitwaghchaure
52761affe2 chore: fix test case 2025-02-13 16:32:56 +05:30
Rohit Waghchaure
1fb5586f56 fix: stock reservation for sales invoice 2025-02-13 16:04:05 +05:30
ruthra kumar
ef2cddd338 Merge pull request #45894 from frappe/mergify/bp/version-15-hotfix/pr-45804 
fix(report): add options to multiselectlist fields (backport #45804)
 2025-02-13 14:26:31 +05:30
ruthra kumar
dbe14d6fe4 chore: resolve conflicts 2025-02-13 14:23:46 +05:30