nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,643 Commits 459 Branches 1,746 Tags
c8691b65166ca1f34fedfef4a571db15e147683a
Commit Graph

51643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
86853224c3 refactor(Payment Entry): reduce indentation (backport #46864) (#46867) 
refactor(Payment Entry): reduce indentation (#46864)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:39:42 +02:00
mergify[bot]
d7bb4a288c fix: make message translatable (backport #46863) (#46866) 
fix: make message translatable (#46863)

(cherry picked from commit 7d12e9afd4)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:37:36 +02:00
mergify[bot]
fcade5d8cd fix: Translate UnReconcile dialog title (backport #46818) (#46861) 
fix: Translate UnReconcile dialog title

(cherry picked from commit f2cfb03c2c)

Co-authored-by: Corentin Forler <corentin@dokos.io>
 2025-04-05 17:37:08 +02:00
mergify[bot]
f63595cf0c fix(Dunning): undefined variable (backport #46868) (#46869) 
fix(Dunning): undefined variable (#46868)

(cherry picked from commit 04df09cfca)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:36:43 +02:00
ruthra kumar
e8efa6d331 Merge pull request #46857 from frappe/mergify/bp/version-15-hotfix/pr-46625 
refactor: Update Bank Transaction `set_query` implemetation (backport #46625)
 2025-04-05 07:36:37 +05:30
ruthra kumar
a6834f3875 chore: resolve conflict 2025-04-05 07:32:15 +05:30
Abdeali Chharchhoda
3dc29cbec8 chore: formatting 
(cherry picked from commit 4ae11d4384)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.js
 2025-04-05 01:35:11 +00:00
Abdeali Chharchhoda
5d47db78e6 fix: add Not Cancelled filter for payment_entry in Bank Transaction 
(cherry picked from commit 85dd1dd4c7)
 2025-04-05 01:35:11 +00:00
Abdeali Chharchhoda
a19eece881 refactor: move payment_document query to setup 
(cherry picked from commit 257802aeda)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.js
 2025-04-05 01:35:11 +00:00
Md Hussain Nagaria
2dfe13e183 chore: update links to Frappe School (#46823) 
(cherry picked from commit ef4f662c31)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/buying/workspace/buying/buying.json
#	erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#	erpnext/projects/workspace/projects/projects.json
#	erpnext/selling/workspace/selling/selling.json
#	erpnext/stock/workspace/stock/stock.json
 2025-04-02 06:46:29 +00:00
Rohit Waghchaure
54159b9e5e fix: set draft QC in purchase document on creation of qc 
(cherry picked from commit 2553dea78e)
 2025-04-01 14:17:39 +00:00
ljain112
bde55d2a07 fix: resolved conflicts 2025-04-01 18:51:10 +05:30
Sagar Vora
36aa308bce Merge pull request #46834 from frappe/mergify/bp/version-15-hotfix/pr-46829 
fix: use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals` (backport #46829)
 2025-04-01 14:47:03 +05:30
Mihir Kandoi
c6979ab260 fix: use work_order bom_no if no bom present in operation 2025-04-01 14:45:24 +05:30
mergify[bot]
80f144ac22 fix: pos checking opened entry closed or not (backport #46726) (#46830) 
fix: pos checking opened entry closed or not (#46726)

* fix: pos checking opened entry closed or not

* fix: linter issue

* fix: linter issue

(cherry picked from commit 5d5b6acc79)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-01 13:54:29 +05:30
vishakhdesai
55b17b918f fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals 
(cherry picked from commit fd252da6b1)
 2025-04-01 13:34:30 +05:30
rohitwaghchaure
27ea95236f Merge pull request #46817 from frappe/mergify/bp/version-15-hotfix/pr-46815 
feat: allow UOMs to select for which conversion rate defined in item (backport #46815)
 2025-04-01 08:31:52 +05:30
rohitwaghchaure
c762a8903b Merge pull request #46824 from frappe/mergify/bp/version-15-hotfix/pr-46808 
fix: condition to update the last purchase rate (backport #46808)
 2025-04-01 08:31:30 +05:30
barredterra
db647a4e42 fix: wording 2025-03-31 21:38:34 +02:00
barredterra
79ed02bb2c fix: translatability 
(cherry picked from commit 6d43d46fbc)
 2025-03-31 19:23:41 +00:00
Rohit Waghchaure
353fa0cbc3 fix: condition to update the last puurchase rate 
(cherry picked from commit bad901e7da)
 2025-03-31 15:15:20 +00:00
rohitwaghchaure
2b854377b1 chore: fix conflicts 2025-03-31 20:43:34 +05:30
Rohit Waghchaure
288aad6f5d feat: allow UOMs to select for which converstion rate defined in item master 
(cherry picked from commit b1dfbbe85e)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-03-31 10:53:11 +00:00
rohitwaghchaure
a60acbc592 Merge pull request #46807 from frappe/mergify/bp/version-15-hotfix/pr-46806 
feat: option to recreate Stock Ledger Entries against stock transactions (backport #46806)
 2025-03-31 16:06:42 +05:30
Marc Ramser
42479d9a7f feat(regional): Address Template for Germany & Add Switzerland Template (#46737) 
* Add Address template for Switzerland

* Fix address template for germany

If an ERPNext instance is set to German and used by a business outside Germany (e.g., in Switzerland or Austria), customer addresses in Germany are displayed in their national format. However, for postal services, the international format (including the country) is required.".

This is just a workaround. IMHO the correct fix would be to check where the company is located and based on that use the national or the international template.

(cherry picked from commit 21b8ad6aa5)
 2025-03-31 10:34:00 +00:00
Sagar Vora
62275d09da Merge pull request #46814 from frappe/mergify/bp/version-15-hotfix/pr-46812 
fix: revert resetting `rounding_adjustment` (backport #46812)
 2025-03-31 15:56:08 +05:30
Vishakh Desai
96af1ccffb Merge pull request #46812 from vishakhdesai/fix-taxes-and-totals 
fix: revert resetting `rounding_adjustment`
(cherry picked from commit 3a9dca0563)
 2025-03-31 10:25:00 +00:00
mergify[bot]
7b864bece8 fix: improved rounding adjustment when applying discount (backport #46720) 
* fix: improved rounding adjustment when applying discount (#46720)

* fix: rounding adjustment in apply_discount_amount taxes_and_totals

* refactor: minor changes

* fix: set the rounding difference while calculating tax total in the last tax row and add test case

* fix: failing test case

* fix: made changes in get_total_for_discount_amount in taxes_and_totals

* fix: failing test cases

* fix: changes as per review

* refactor: remove unnecessary use of flt

* refactor: improve logic

* refactor: minor change

* refactor: minor changes

* fix: add a test case for applying discount with previous row total in taxes

* fix: failing test case

* refactor: flatter code, remove `flt` usage for accuracy

---------

Co-authored-by: Vishakh Desai <78500008+vishakhdesai@users.noreply.github.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2025-03-31 15:54:42 +05:30
rohitwaghchaure
604b185bd3 chore: fix conflicts 2025-03-31 15:05:10 +05:30
Rohit Waghchaure
64fdcb752d feat: option to recreate Stock Ledger Entries against stock transactions 
(cherry picked from commit 218dbd6911)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
 2025-03-31 08:44:38 +00:00
Sagar Vora
37adb9187f Merge pull request #46803 from frappe/mergify/bp/version-15-hotfix/pr-46644 
fix: multiple Bank Reconciliation Tool issues (backport #46644)
 2025-03-31 11:37:36 +05:30
Vishakh Desai
e168483a58 fix: multiple Bank Reconciliation Tool issues (#46644) 
* fix: bank reconciliation tool issue

* refactor: separate Bank Transaction linking from other logic

* fix: delink old pe on update_after_submit in bank transaction

* fix: failing test case fixed

* fix: changes as per review

* refactor: rename `gles` to `gl_entries`

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 646cf54679)
 2025-03-31 05:57:08 +00:00
rohitwaghchaure
5315769b1f Merge pull request #46781 from frappe/mergify/bp/version-15-hotfix/pr-46777 
fix: incorrect condition (backport #46777)
 2025-03-29 12:17:09 +05:30
rohitwaghchaure
9fa5afd215 Merge pull request #46779 from frappe/mergify/bp/version-15-hotfix/pr-46775 
fix: for deadlock issue keep status as In Progress (backport #46775)
 2025-03-29 12:16:55 +05:30
rohitwaghchaure
88ff17f467 Merge pull request #46778 from frappe/mergify/bp/version-15-hotfix/pr-46760 
fix: valuation rate not updating for raw materials (backport #46760)
 2025-03-29 12:16:35 +05:30
Rohit Waghchaure
502b8f25b3 fix: incorrect condition 
(cherry picked from commit 0c1a8e9c58)
 2025-03-28 18:19:53 +00:00
rohitwaghchaure
5079519863 chore: fix conflicts 2025-03-28 23:47:43 +05:30
Rohit Waghchaure
34e66b1b27 fix: for deadlock issue keep status as In Progress 
(cherry picked from commit e6ff7f0e9f)
 2025-03-28 18:16:41 +00:00
Rohit Waghchaure
454dd3a2f1 fix: valuation rate not updating for raw materials 
(cherry picked from commit 5af8378471)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2025-03-28 18:15:42 +00:00
Abdeali Chharchhodawala
6f94ba599b Merge pull request #46683 from Abdeali099/set-employee-contact-details 
fix: Set complete contact details for `Employee` in PE
(cherry picked from commit 8c9d630ee4)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
 2025-03-28 12:49:20 +00:00
rohitwaghchaure
f3cff68713 Merge pull request #46749 from frappe/revert-46647-mergify/bp/version-15-hotfix/pr-46641 
Revert "perf: timeout while renaming cost center (backport #46641)"
 2025-03-27 12:23:13 +05:30
rohitwaghchaure
326126e741 Revert "perf: timeout while renaming cost center (backport #46641)" 2025-03-27 11:58:02 +05:30
ruthra kumar
b22d0a5804 Merge pull request #46746 from frappe/mergify/bp/version-15-hotfix/pr-46719 
fix: do not use self object for setting party and party type  (backport #46719)
 2025-03-27 11:34:17 +05:30
ljain112
d1311e619d fix: do not use self object for setting party and party type 
(cherry picked from commit 80b746d4dd)
 2025-03-27 05:38:38 +00:00
rohitwaghchaure
8b5ed20225 Merge pull request #46740 from frappe/mergify/bp/version-15-hotfix/pr-46739 
fix: slow query (backport #46739)
 2025-03-26 22:38:38 +05:30
rohitwaghchaure
af3b871989 Merge pull request #46734 from frappe/mergify/bp/version-15-hotfix/pr-46733 
fix: decimal values causing incorrect batch picking (backport #46733)
 2025-03-26 22:12:07 +05:30
rohitwaghchaure
41f20a9c64 chore: fix conflicts 2025-03-26 22:11:43 +05:30
Rohit Waghchaure
af0fb131a2 fix: slow query 
(cherry picked from commit 5ddb36af87)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 2025-03-26 16:40:32 +00:00
Rohit Waghchaure
c5efddae16 fix: decimal values causing incorrect batch picking 
(cherry picked from commit 7bfe703b04)
 2025-03-26 10:13:40 +00:00
rohitwaghchaure
2ed29d06d3 Merge pull request #46730 from frappe/mergify/bp/version-15-hotfix/pr-46710 
fix: expense account in the stock entry (backport #46710)
 2025-03-26 12:16:59 +05:30