nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,631 Commits 400 Branches 1,700 Tags
4586f03bdcd17bd14e42b2f4cee9cef6447ef4f0
Commit Graph

47631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ljain112
4586f03bdc fix: add parenttype condition for item table in Purchase Register Report 
(cherry picked from commit 28abf191fc)
 2024-10-07 15:55:42 +00:00
mergify[bot]
31ecdb2104 fix(Dunning): logic for fetching text (backport #43160) (#43489) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Dunning): logic for fetching text (#43160)
 2024-10-03 20:28:59 +01:00
Sagar Vora
3b550ca419 Merge pull request #43484 from frappe/mergify/bp/version-14-hotfix/pr-43475 
fix: set margin fields for purchase documents when updating items (backport #43475)
 2024-10-02 15:24:03 +05:30
Sagar Vora
97edadfc4b fix: set margin fields for purchase documents when updating items 
(cherry picked from commit 7be4d56be2)
 2024-10-02 09:51:45 +00:00
Sagar Vora
824ccfb10c Merge pull request #43482 from frappe/mergify/bp/version-14-hotfix/pr-43481 
fix: patch to update Currency Exchange Settings for `frankfurter.app` (backport #43481)
 2024-10-02 15:14:46 +05:30
Sagar Vora
02ce528501 fix: conflicts 2024-10-02 15:14:16 +05:30
Sagar Vora
b4706db816 fix: patch to update Currency Exchange Settings for frankfurter.app 
(cherry picked from commit c5889c5d2e)

# Conflicts:
#	erpnext/patches.txt
 2024-10-02 09:43:14 +00:00
Sagar Vora
f608ba55ab Merge pull request #43477 from frappe/mergify/bp/version-14-hotfix/pr-43476 
fix: Fix API endpoint for Frankfurter (backport #43476)
 2024-10-02 14:43:07 +05:30
Sagar Vora
b18b4c1e35 test: update test for API change 
(cherry picked from commit c444de017a)
 2024-10-02 09:11:47 +00:00
Corentin Forler
1c0843caee fix: Fix API endpoint for Frankfurter 
(cherry picked from commit 33e72111c7)
 2024-10-02 09:11:47 +00:00
Nihantra C. Patel
7b158accec Merge pull request #43458 from frappe/mergify/bp/version-14-hotfix/pr-43455 
fix: add company filter in Warehouse wise Item Balance Age and Value (backport #43455)
 2024-10-01 11:46:54 +05:30
Nihantra Patel
3cb85028d0 fix: add company filter in Warehouse wise Item Balance Age and Value 
(cherry picked from commit 75950f86cf)
 2024-10-01 05:47:33 +00:00
rohitwaghchaure
619550942f Merge pull request #43439 from frappe/mergify/bp/version-14-hotfix/pr-43437 
fix: adjustment entry for stock reco (backport #43437)
 2024-09-30 15:38:09 +05:30
Rohit Waghchaure
57925a1315 fix: adjustmen entry for stock reco 
(cherry picked from commit 4e463b7d6d)
 2024-09-30 08:57:50 +00:00
rohitwaghchaure
a201c56b38 Merge pull request #43432 from frappe/mergify/bp/version-14-hotfix/pr-43420 
fix: Stock Ledger Invariant Check report (backport #43420)
 2024-09-30 13:39:47 +05:30
Rohit Waghchaure
44263842f5 fix: Stock Ledger Invariant Check report 
(cherry picked from commit d7daedc5b2)
 2024-09-29 17:07:35 +00:00
mergify[bot]
4146bdf324 fix(Bank Account): dashboard connections (backport #43365) (#43366) 
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:05 +02:00
ruthra kumar
c36b40ad8c Merge pull request #43363 from frappe/mergify/bp/version-14-hotfix/pr-43356 
fix: AR / AP report to ignore 0.0 outstanding (backport #43356)
 2024-09-24 16:58:26 +05:30
ruthra kumar
79f95ba507 fix: AR / AP report to ignore 0.0 outstanding 
(cherry picked from commit 6e2cf79e2c)
 2024-09-24 10:14:49 +00:00
Nihantra C. Patel
5ba9fb73bb Merge pull request #43342 from frappe/mergify/bp/version-14-hotfix/pr-43253 
fix: partial return on POS invoice (backport #43253)
 2024-09-23 23:36:25 +05:30
ruthra kumar
43ba79f0e5 Merge pull request #43299 from barredterra/de-payment-reco 
fix(Payment Reconciliation): German translations
 2024-09-23 20:03:02 +05:30
ruthra kumar
5ce4dae204 chore: resolve conflict 2024-09-23 20:02:10 +05:30
Nihantra C. Patel
50e0f56d18 fix: partial return on POS invoice 
(cherry picked from commit 18bdd06652)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2024-09-23 14:26:05 +00:00
Nihantra C. Patel
ef7d4fe84a fix: partial return on POS invoice 
(cherry picked from commit 76289fa8dc)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2024-09-23 14:26:05 +00:00
ruthra kumar
8f81fdba4f Merge pull request #43335 from frappe/mergify/bp/version-14-hotfix/pr-43316 
fix: incorrect outstanding on non-pos invoice with write_off_account (backport #43316)
 2024-09-23 18:22:39 +05:30
ruthra kumar
5434d4bb1c Merge pull request #43337 from frappe/mergify/bp/version-14-hotfix/pr-43308 
fix: show chart tool tip in report currency (backport #43308)
 2024-09-23 18:22:17 +05:30
ruthra kumar
54d0162fef Merge pull request #43339 from frappe/mergify/bp/version-14-hotfix/pr-43307 
fix: change dynamic link doctype fieldtype to data (backport #43307)
 2024-09-23 18:21:57 +05:30
venkat102
c0dfda6ccc fix: change dynamic link doctype fieldtype to data 
(cherry picked from commit 1e46f7344a)
 2024-09-23 12:23:01 +00:00
venkat102
6becaba672 fix: add currency in financial statement 
(cherry picked from commit 91a27bda84)
 2024-09-23 12:11:47 +00:00
venkat102
92438f8dba fix: show chart tool tip in report currency 
(cherry picked from commit 827b3f4542)
 2024-09-23 12:11:46 +00:00
ruthra kumar
79235cd688 fix: incorrect outstanding on non-pos invoice with write_off_account 
(cherry picked from commit d5e2906e59)
 2024-09-23 12:09:50 +00:00
barredterra
32d4f96e02 fix(Payment Reconciliation): German translations 2024-09-19 13:57:55 +02:00
mergify[bot]
1bdbcc6703 fix: incorrect stock balance for inventory dimension (backport #43284) (#43289) 
* fix: incorrect stock balance for inventory dimension (#43284)

(cherry picked from commit 3e7a7a54bf)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.js

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-19 10:20:58 +05:30
rohitwaghchaure
8abc1f4da9 fix: Serial No reserved against historical sales order - unable to sell again (#43294) 2024-09-19 09:37:08 +05:30
ruthra kumar
2e2a4d9c70 Merge pull request #43292 from frappe/mergify/bp/version-14-hotfix/pr-43274 
fix: translate in js (backport #43274)
 2024-09-19 09:01:04 +05:30
Doğancan
e43c357c08 fix: translate in js 
(cherry picked from commit 25faec5662)
 2024-09-19 03:27:14 +00:00
ruthra kumar
66349d0877 Merge pull request #43288 from frappe/mergify/bp/version-14-hotfix/pr-43213 
fix: Payment Ledger Report currency fieldtype fix (backport #43213)
 2024-09-19 08:50:19 +05:30
sameer Chauhan
7ac39dc233 fix: Payment Ledger Report currency fieldtype fix 
(cherry picked from commit ad2d6a1625)
 2024-09-19 01:36:31 +00:00
Nihantra C. Patel
02f414e0aa Merge pull request #43277 from frappe/mergify/bp/version-14-hotfix/pr-43276 
fix: Translation for button SO to PO (backport #43276)
 2024-09-18 21:49:31 +05:30
Nihantra C. Patel
b6ce9222aa fix: Translation for button SO to PO --conflicts 2024-09-18 21:47:30 +05:30
Nihantra C. Patel
a8b5bcfe02 fix: Translation for button SO to PO 
(cherry picked from commit a5275e9f28)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2024-09-18 16:14:06 +00:00
ruthra kumar
c442dc6b8e Merge pull request #43267 from frappe/mergify/bp/version-14-hotfix/pr-43239 
fix: add currency in options for rate field in pricing rule (backport #43239)
 2024-09-18 12:39:25 +05:30
ruthra kumar
fff8f8b83f chore: resolve conflict 2024-09-18 12:12:06 +05:30
krishna
c9467f4c1f fix: add currency in options for rate field in pricing rule 
(cherry picked from commit 636c0131fa)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
 2024-09-18 06:29:34 +00:00
ruthra kumar
eed7eba695 Merge pull request #43265 from frappe/mergify/bp/version-14-hotfix/pr-43216 
fix: get cost center allocation percentage only from the applicable allocation (backport #43216)
 2024-09-18 11:40:10 +05:30
venkat102
4646f11829 fix: cancel cost center allocation and journal entry after test 
(cherry picked from commit 3c65b98b49)
 2024-09-18 05:49:31 +00:00
venkat102
872c150ea7 test: add unit test for validating multiple cost center allocation with different child cost center 
(cherry picked from commit 4d5d6150e1)
 2024-09-18 05:49:30 +00:00
venkat102
a26f0e9973 fix: fetch cost center allocation percentage only from the applicable allocation 
(cherry picked from commit 36e5945c66)
 2024-09-18 05:49:30 +00:00
ruthra kumar
dc6d3cca70 Merge pull request #43248 from frappe/mergify/bp/version-14-hotfix/pr-43188 
fix: invalid gp calculation (backport #43188)
 2024-09-17 14:35:06 +05:30
Dany Robert
9af2df3810 fix: invalid gp calculation 
(cherry picked from commit c79851239c)
 2024-09-17 06:33:14 +00:00