CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,078 Commits 425 Branches 1,723 Tags
cb266cd1c65e1b24b52c05952bb18a332de15e36
Commit Graph

44078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
cb266cd1c6 chore(release): Bumped to Version 14.17.1 
## [14.17.1](https://github.com/frappe/erpnext/compare/v14.17.0...v14.17.1) (2023-02-24)

### Reverts

* Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) ([3c2e21e](3c2e21e2ae)), closes [#34202](https://github.com/frappe/erpnext/issues/34202) [#34019](https://github.com/frappe/erpnext/issues/34019)
v14.17.1 		2023-02-24 10:07:56 +00:00
Deepesh Garg
d6d1238974 Merge pull request #34204 from frappe/mergify/bp/version-14/pr-34203 
Revert "fix: Concurrency issues in Sales and Purchase returns" (backport #34202) (backport #34203)
 2023-02-24 15:36:02 +05:30
Deepesh Garg
3c2e21e2ae 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)
(cherry picked from commit 9341d3e60e)
 2023-02-24 10:03:47 +00:00
Frappe PR Bot
0d986a2ac4 chore(release): Bumped to Version 14.17.0 
# [14.17.0](https://github.com/frappe/erpnext/compare/v14.16.1...v14.17.0) (2023-02-21)

### Bug Fixes

* asset repair status after deletion and asset status after manual depr entry ([03f07a2](03f07a20e7))
* asset_depreciation_and_balances report doesn't reflect manual depr entries ([1535c3d](1535c3d856))
* change parameter name for letter head ([4f37ba9](4f37ba9cfe))
* check for duplicate in pos closing and pos merge log entry ([05d6490](05d649087b))
* consider rounded total amount while making payment request ([#34110](https://github.com/frappe/erpnext/issues/34110)) ([7879564](78795643cc))
* create `Delivery Trip` from `Delivery Note` list ([ba5ea88](ba5ea886cf))
* differency entry journal debit/credit missing ([#34104](https://github.com/frappe/erpnext/issues/34104)) ([7556739](75567391a7))
* Filters in item-wise sales history report ([#34145](https://github.com/frappe/erpnext/issues/34145)) ([44c837f](44c837f862))
* fiscal year error for existing assets in fixed asset register ([7074c2b](7074c2b161))
* forced delete linked desktop_icons (backport [#34107](https://github.com/frappe/erpnext/issues/34107)) ([#34130](https://github.com/frappe/erpnext/issues/34130)) ([53ab4d9](53ab4d92e8))
* ignore repost payment ledger on basic documents cancellation ([#34054](https://github.com/frappe/erpnext/issues/34054)) ([9890cce](9890cce680))
* incorrect consumed qty in subcontracting receipt ([d5f6a5d](d5f6a5d193))
* inventory dimension filter not overriding with existing filter for stock ledger report ([6959283](6959283893))
* linters issue ([f65e471](f65e471a75))
* opening_accumulated_depreciation and precision in charts ([47cc8ab](47cc8ab6c6))
* purchase invoice performance issue ([8d98599](8d98599a6c))
* rename duplicate field name with same type into a DocType to avoid import Error ([#34053](https://github.com/frappe/erpnext/issues/34053)) ([d783168](d7831685af))
* show Purchase Order Portal `Pay` button based on configuration ([84da0c6](84da0c6f1e))
* update `reserved_qty` when `Sales Order` marked as `Hold` ([15898cc](15898cc2ec))
* Use normal rounding for Tax Withholding Category ([#34114](https://github.com/frappe/erpnext/issues/34114)) ([65aec3e](65aec3e4ff))
* **ux:** `ReferenceError: me is not defined` Delivery Note ([7bd04c2](7bd04c27c8))

### Features

* allow to make in transit transfer entry from material request ([a7b682e](a7b682e26b))
* Editable Sales Invoice ([#32625](https://github.com/frappe/erpnext/issues/32625)) ([00eb632](00eb6329a7))
* provision to convert transaction based reposting to item warehouse based reposting ([72c0b22](72c0b2208f))
* translate fixtures during runtime, not installation ([#33996](https://github.com/frappe/erpnext/issues/33996)) ([d117de7](d117de7813))
v14.17.0 		2023-02-21 17:17:32 +00:00
Deepesh Garg
9aa25c4373 Merge pull request #34161 from frappe/version-14-hotfix 
chore: release v14
 2023-02-21 22:45:54 +05:30
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
Sagar Sharma
1367e09f0f Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34053 2023-02-16 14:28:49 +05:30
Sagar Sharma
7fefad9f5c Merge pull request #34095 from frappe/mergify/bp/version-14-hotfix/pr-34090 
chore: update `CODEOWNERS` (backport #34090)
 2023-02-16 14:27:36 +05:30
Sagar Sharma
f7ea98cf44 chore: update CODEOWNERS 
(cherry picked from commit e8b8c51d82)
 2023-02-16 08:57:04 +00:00
s-aga-r
2fdf6ab164 chore: conflicts 2023-02-16 14:01:17 +05:30
HENRY Florian
d7831685af fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) 
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit 4d79ffe3c6)

# Conflicts:
#	erpnext/stock/doctype/item/item.json
 2023-02-16 08:17:47 +00:00
Sagar Sharma
b01da15ce2 Merge pull request #34087 from frappe/mergify/bp/version-14-hotfix/pr-34086 
fix: create `Delivery Trip` from `Delivery Note` list (backport #34086)
 2023-02-15 22:44:58 +05:30
s-aga-r
ba5ea886cf fix: create Delivery Trip from Delivery Note list 
(cherry picked from commit 6c6195bae6)
 2023-02-15 17:11:41 +00:00
Sagar Sharma
702a3e5ce1 Merge pull request #34085 from frappe/mergify/bp/version-14-hotfix/pr-34080 
chore: copy `item_code` to `Batch` while creating new batch from SCR (backport #34080)
 2023-02-15 21:48:20 +05:30
s-aga-r
72e17e3267 chore: copy item_code to Batch while creating new batch from SCR 
(cherry picked from commit ffa9c6e4d9)
 2023-02-15 16:10:57 +00:00
Frappe PR Bot
e82c101b13 chore(release): Bumped to Version 14.16.1 
## [14.16.1](https://github.com/frappe/erpnext/compare/v14.16.0...v14.16.1) (2023-02-15)

### Bug Fixes

* asset_depreciation_and_balances report doesn't reflect manual depr entries ([7692db2](7692db27bd))
* opening_accumulated_depreciation and precision in charts ([4a209fc](4a209fcb7c))
v14.16.1 		2023-02-15 10:33:52 +00:00
Anand Baburajan
a934cf0d92 Merge pull request #34074 from frappe/mergify/bp/version-14/pr-34058 
fix: manual depr entries in asset_depreciations_and_balances report and some misc bugs [v14] (backport #34058)
 2023-02-15 16:02:16 +05:30
anandbaburajan
7692db27bd fix: asset_depreciation_and_balances report doesn't reflect manual depr entries 
(cherry picked from commit 1535c3d856)
 2023-02-15 08:36:28 +00:00
anandbaburajan
be2ddd1536 chore: break look if je processed 
(cherry picked from commit a220dc0c9c)
 2023-02-15 08:36:28 +00:00
anandbaburajan
4a209fcb7c fix: opening_accumulated_depreciation and precision in charts 
(cherry picked from commit 47cc8ab6c6)
 2023-02-15 08:36:28 +00:00
Anand Baburajan
09f5e290a3 Merge pull request #34058 from AnandBaburajan/more_asset_bug_fixes_v14 
fix: manual depr entries in asset_depreciations_and_balances report and some misc bugs [v14]
 2023-02-15 12:33:30 +05:30