nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,043 Commits 402 Branches 1,700 Tags
b0d670a51da32ebafef0a9eef39083bd2d8fdf43
Commit Graph

44043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anandbaburajan
b0d670a51d chore: handle change in opening_accumulated_depreciation properly 2023-02-24 20:35:29 +05:30
Anand Baburajan
e0ad1a305e Merge branch 'version-14-hotfix' into manual_asset_schedule 2023-02-24 18:14:03 +05:30
rohitwaghchaure
dddbfba6da Merge pull request #34200 from frappe/mergify/bp/version-14-hotfix/pr-34199 
fix: conversion factor not set (backport #34199)
 2023-02-24 17:53:03 +05:30
Anand Baburajan
149043e8d4 Merge branch 'version-14-hotfix' into manual_asset_schedule 2023-02-24 16:48:43 +05:30
anandbaburajan
971c0720e5 fix: manual depr schedule 2023-02-24 16:38:39 +05:30
Deepesh Garg
c6a46bc184 Merge pull request #34203 from frappe/mergify/bp/version-14-hotfix/pr-34202 
Revert "fix: Concurrency issues in Sales and Purchase returns" (backport #34202)
 2023-02-24 15:32:00 +05:30
Deepesh Garg
9341d3e60e Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) 
Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)"

This reverts commit a67284e96d.

(cherry picked from commit e26c6dc76b)
 2023-02-24 09:58:40 +00:00
Rohit Waghchaure
089c7d0a37 fix: conversion factor not set 
(cherry picked from commit 8e46aebc50)
 2023-02-24 09:27:37 +00:00
rohitwaghchaure
230e345732 Merge pull request #34190 from frappe/mergify/bp/version-14-hotfix/pr-34189 
fix: user shouldn't able to make item price for item template (backport #34189)
 2023-02-24 09:23:22 +05:30
Rohit Waghchaure
fb8e45d3d9 fix: user shouldn't able to make item price for item template 
(cherry picked from commit 6417ae0ee8)
 2023-02-23 15:18:43 +00:00
rohitwaghchaure
b2582c56b7 Merge pull request #34177 from frappe/mergify/bp/version-14-hotfix/pr-34173 
fix: incorrect color in the BOM Stock Report (backport #34173)
 2023-02-23 20:47:24 +05:30
ruthra kumar
908d2f687e Merge pull request #34184 from frappe/mergify/bp/version-14-hotfix/pr-34022 
perf: Gross Profit report will fetch SLE's on demand and memoize (backport #34022)
 2023-02-23 12:54:25 +05:30
ruthra kumar
204f9a414f refactor: use docstatus from Delivery Note Item 
(cherry picked from commit 88d888d9d0)
 2023-02-23 06:26:15 +00:00
ruthra kumar
db1f17e5bc perf: fetch SLE's on demand and memoize 
(cherry picked from commit 3e5691072a)
 2023-02-23 06:26:15 +00:00
rohitwaghchaure
292f7c57c5 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34173 2023-02-23 11:36:34 +05:30
rohitwaghchaure
b0103b85a0 Merge pull request #34181 from frappe/mergify/bp/version-14-hotfix/pr-34172 
fix: zero division error while making LCV (backport #34172)
 2023-02-23 11:25:03 +05:30
Rohit Waghchaure
1859be6fef fix: zero division error while making LCV 
(cherry picked from commit 80e94a08cf)
 2023-02-23 05:24:58 +00:00
ruthra kumar
b37695f2f3 Merge pull request #34180 from frappe/mergify/bp/version-14-hotfix/pr-34176 
fix: ui freeze upon item selection in sales invoice (backport #34176)
 2023-02-23 10:52:32 +05:30
ruthra kumar
1750ed4fb6 fix: ui freeze on item selection in sales invoice 
(cherry picked from commit 6412583e98)
 2023-02-23 05:06:51 +00:00
Rohit Waghchaure
001ed9e9ff fix: incorrect color in the BOM Stock Report 
(cherry picked from commit a8f03ebf7f)
 2023-02-23 04:25:45 +00:00
ruthra kumar
9c43e3a721 Merge pull request #34164 from frappe/mergify/bp/version-14-hotfix/pr-34102 
fix: check for duplicate pos invoices in closing entry (backport #34102)
 2023-02-21 20:03:08 +05:30
ruthra kumar
05d649087b fix: check for duplicate in pos closing and pos merge log entry 
(cherry picked from commit 47add0b751)
 2023-02-21 13:16:33 +00:00
mergify[bot]
74a3588e04 patch: reorder migration patches (#34071) 
chore: reorder migration patches.

'migrate_gl_to_payment_ledger',
'migrate_remarks_from_gl_to_payment_ledger' should always run last.

(cherry picked from commit 68202639f5)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-21 15:34:24 +05:30
mergify[bot]
0bd765b8ca refactor: clear records in batches in 'Transaction Deletion Record' (#34109) 
refactor: clear records in batches in 'Transaction Deletion Record' (#34109)

refactor: clear records in batches
(cherry picked from commit 4a7b1de2d8)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-21 15:06:45 +05:30
mergify[bot]
44c837f862 fix: Filters in item-wise sales history report (#34145) 
fix: Filters in item-wise sales history report (#34145)

(cherry picked from commit c88444a6c4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 15:06:00 +05:30
mergify[bot]
65aec3e4ff fix: Use normal rounding for Tax Withholding Category (#34114) 
fix: Use normal rounding for Tax Withholding Category (#34114)

(cherry picked from commit 35cdd996a9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 14:22:57 +05:30
mergify[bot]
00eb6329a7 feat: Editable Sales Invoice (#32625) 
* feat: Editable Sales Invoice

(cherry picked from commit 30da6ab2c1)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* chore: Update allow on submit for Sales Invoice fields

(cherry picked from commit e626107d3d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* chore: Break into smaller functions

(cherry picked from commit 42e4c37f15)

* chore: Update allow on submit fields

(cherry picked from commit 1105e52031)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* test: Add unit tests

(cherry picked from commit ed98015a56)

* chore: Update tests

(cherry picked from commit 1a980123a2)

* chore: Reset repost_required_flag on cancel

(cherry picked from commit 0966867c08)

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

* chore: Enable no-copy for repost required field

(cherry picked from commit 5fe55176ec)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* chore: Validate for deferred revenue invoices

(cherry picked from commit e29f756146)

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 14:21:36 +05:30
Anand Baburajan
ce817e97eb Merge pull request #34155 from frappe/mergify/bp/version-14-hotfix/pr-34153 
fix: fiscal year error for existing assets in fixed asset register (backport #34153)
 2023-02-21 14:18:21 +05:30
anandbaburajan
7074c2b161 fix: fiscal year error for existing assets in fixed asset register 
(cherry picked from commit 76861eb332)
 2023-02-21 08:25:46 +00:00
Sagar Sharma
0de0501a48 Merge pull request #34146 from frappe/mergify/bp/version-14-hotfix/pr-34138 
fix(ux): `ReferenceError: me is not defined` Delivery Note (backport #34138)
 2023-02-21 10:31:17 +05:30
s-aga-r
bc86b6977f chore: Linters 
(cherry picked from commit 44ee9f0f19)
 2023-02-21 04:57:41 +00:00
s-aga-r
7bd04c27c8 fix(ux): ReferenceError: me is not defined Delivery Note 
(cherry picked from commit 1b010add26)
 2023-02-21 04:57:40 +00:00
rohitwaghchaure
92dee9e1cf Merge pull request #34141 from frappe/mergify/bp/version-14-hotfix/pr-34139 
fix: inventory dimension filter not overriding with existing filter for stock ledger report (backport #34139)
 2023-02-20 13:38:54 +05:30
rohitwaghchaure
3c0500efb7 Merge pull request #34140 from frappe/mergify/bp/version-14-hotfix/pr-33722 
fix: purchase invoice performance issue (backport #33722)
 2023-02-20 13:17:44 +05:30
Rohit Waghchaure
6959283893 fix: inventory dimension filter not overriding with existing filter for stock ledger report 
(cherry picked from commit 0e388ba872)
 2023-02-20 07:35:16 +00:00
Rohit Waghchaure
8d98599a6c fix: purchase invoice performance issue 
(cherry picked from commit 92d857d49c)
 2023-02-20 07:18:11 +00:00
mergify[bot]
75567391a7 fix: differency entry journal debit/credit missing (#34104) 
fix: differency entry journal debit/credit missing (#34104)

* fix: difference entry journal is wrong

* fix: difference entry journal is wrong

(cherry picked from commit 183e42af1a)

Co-authored-by: Alirio Castro <aliriocastro@gmail.com>
 2023-02-19 20:50:56 +05:30
mergify[bot]
9890cce680 fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on basic documents cancellation (#34054)

fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit c722f2819c)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-19 20:50:37 +05:30
mergify[bot]
78795643cc fix: consider rounded total amount while making payment request (#34110) 
fix: consider rounded total amount while making payment request (#34110)

(cherry picked from commit 9c6466f15b)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-19 13:38:02 +05:30
mergify[bot]
53ab4d92e8 fix: forced delete linked desktop_icons (backport #34107) (#34130) 
fix: forced delete linked desktop_icons (#34107)

* fix: forced delete linked desktop_icons

* fix: black

(cherry picked from commit 5e48e61c66)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2023-02-19 12:08:12 +05:30
rohitwaghchaure
ced7860d1b Merge pull request #34124 from frappe/mergify/bp/version-14-hotfix/pr-34115 
feat: provision to convert transaction based reposting to item wareho… (backport #34115)
 2023-02-18 23:17:55 +05:30
Rohit Waghchaure
72c0b2208f feat: provision to convert transaction based reposting to item warehouse based reposting 
(cherry picked from commit f1383b5ef9)
 2023-02-18 16:02:12 +00:00
Sagar Sharma
529d5f3d05 Merge pull request #34118 from frappe/mergify/bp/version-14-hotfix/pr-34077 
fix: show Purchase Order Portal `Pay` button based on configuration (backport #34077)
 2023-02-18 13:16:43 +05:30
s-aga-r
84da0c6f1e fix: show Purchase Order Portal Pay button based on configuration 
(cherry picked from commit 20bdc63b03)
 2023-02-18 06:51:14 +00:00
s-aga-r
05f7fb8fa1 chore: add field show_pay_button in Buying Settings 
(cherry picked from commit d7ef5ad955)
 2023-02-18 06:51:13 +00:00
Anand Baburajan
dbf39a7ff3 Merge pull request #34112 from AnandBaburajan/asset_fixes_17_feb_v14 
fix: repair status after deletion, asset status after manual depr entry and other misc bugs [v14]
 2023-02-17 16:13:17 +05:30
anandbaburajan
03f07a20e7 fix: asset repair status after deletion and asset status after manual depr entry 2023-02-17 15:32:55 +05:30
Sagar Sharma
48f6cc09c1 Merge pull request #34098 from frappe/mergify/bp/version-14-hotfix/pr-34091 
fix: incorrect consumed qty in subcontracting receipt (backport #34091)
 2023-02-16 17:29:06 +05:30
Rohit Waghchaure
d5f6a5d193 fix: incorrect consumed qty in subcontracting receipt 
(cherry picked from commit 156e45970a)
 2023-02-16 09:41:06 +00:00
Sagar Sharma
bafb976bbd Merge pull request #34093 from frappe/mergify/bp/version-14-hotfix/pr-34053 
fix: rename duplicate field name with same type into a DocType to avoid import Error (backport #34053)
 2023-02-16 14:29:12 +05:30